diff --git a/.gitignore b/.gitignore index 142ad95..05e2ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ tmp/ *.bat *.swp *.o -3proxy.res *.idb src/version.h src/res diff --git a/3proxy.res b/3proxy.res new file mode 100644 index 0000000..115b2b7 Binary files /dev/null and b/3proxy.res differ diff --git a/Makefile.msvc b/Makefile.msvc index 4e4640a..0ee2858 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -15,7 +15,8 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib +LIBSOLD = libeay32MT.lib ssleay32MT.lib LIBEXT = .lib LNOUT = /out: EXESUFFICS = .exe diff --git a/Makefile.msvc64 b/Makefile.msvc64 index 4ce8745..6ee3eda 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -15,7 +15,8 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib +LIBSOLD = libeay32MT.lib ssleay32MT.lib LIBEXT = .lib LNOUT = /out: EXESUFFICS = .exe diff --git a/src/plugins/LdapPlugin/ldapauth.c b/src/plugins/LdapPlugin/ldapauth.c index ad5da1a..bc69f68 100644 --- a/src/plugins/LdapPlugin/ldapauth.c +++ b/src/plugins/LdapPlugin/ldapauth.c @@ -105,13 +105,6 @@ int savecouters(void) #ifdef _WIN32 __declspec(dllexport) int start(struct pluginlink * pluginlink, int argc, char** argv); -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - return TRUE; -} #else int start(struct pluginlink * pluginlink, diff --git a/src/plugins/StringsPlugin/StringsPlugin.c b/src/plugins/StringsPlugin/StringsPlugin.c index 0aa938b..c6c7eb6 100644 --- a/src/plugins/StringsPlugin/StringsPlugin.c +++ b/src/plugins/StringsPlugin/StringsPlugin.c @@ -153,7 +153,7 @@ static int restore_old_table(void * v) #ifdef _WIN32 __declspec(dllexport) int start(struct pluginlink * pluginlink, int argc, char** argv); -BOOL APIENTRY DllMain( HMODULE hModule, +BOOL WINAPI DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) diff --git a/src/plugins/TrafficPlugin/TrafficPlugin.c b/src/plugins/TrafficPlugin/TrafficPlugin.c index 1347fe4..d4da35d 100644 --- a/src/plugins/TrafficPlugin/TrafficPlugin.c +++ b/src/plugins/TrafficPlugin/TrafficPlugin.c @@ -257,7 +257,7 @@ void mylogfunc(struct clientparam * param, const unsigned char * pz) { #ifdef _WIN32 -BOOL APIENTRY DllMain( HANDLE hModule, +BOOL WINAPI DllMain( HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) diff --git a/src/plugins/WindowsAuthentication/WindowsAuthentication.c b/src/plugins/WindowsAuthentication/WindowsAuthentication.c index 07da9a5..e530e75 100644 --- a/src/plugins/WindowsAuthentication/WindowsAuthentication.c +++ b/src/plugins/WindowsAuthentication/WindowsAuthentication.c @@ -20,14 +20,6 @@ extern "C" { int argc, char** argv); -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - return TRUE; -} - static struct auth alwaysauth; static char sidbuf[4096]; diff --git a/src/plugins/utf8tocp1251/utf8tocp1251.c b/src/plugins/utf8tocp1251/utf8tocp1251.c index 7f2b013..3bdb7d2 100644 --- a/src/plugins/utf8tocp1251/utf8tocp1251.c +++ b/src/plugins/utf8tocp1251/utf8tocp1251.c @@ -18,15 +18,6 @@ extern "C" { __declspec(dllexport) int utf8tocp1251(struct pluginlink * pluginlink, int argc, char** argv); - -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - return TRUE; -} - static struct auth alwaysauth;