PLUGIN<> to half-automatically calculate the dll's g_hInstance and pass it inside

1 files changed, 3 insertions, 15 deletions

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 8aeffc1391..bec809277c 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -39,7 +39,7 @@ PLUGININFOEX pluginInfo = {
 

 // Other variables

 CMPlugin g_plugin;

-HINSTANCE hInstance;

+HINSTANCE g_hInstance;

 

 SSL_API sslApi;

 CLIST_INTERFACE *pcli;

@@ -47,6 +47,8 @@ int hLangpack;
 

 static unsigned long crc_table[256];

 

+extern "C" _pfnCrtInit _pRawDllMain = &CMPlugin::RawDllMain;

+

 //////////////////////////////////////////////////////////

 // Extra winsock function for error description

 //

@@ -407,17 +409,3 @@ void gg_debughandler(int level, const char *format, va_list ap)
 	free(szFormat);

 }

 #endif

-

-//////////////////////////////////////////////////////////

-// main DLL function

-//

-BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD, LPVOID)

-{

-	crc_gentable();

-	hInstance = hInst;

-#ifdef DEBUGMODE

-	gg_debug_level = GG_DEBUG_FUNCTION;

-	gg_debug_handler = gg_debughandler;

-#endif

-	return TRUE;

-}