From 2b0f8bbcfc18f18de2970401dcdf5410300aa635 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Sun, 13 Apr 2014 18:26:32 +0400
Subject: [PATCH] Add icon, resolve MinGW compilation issues

---
 .gitignore                                      |   1 -
 3proxy.ico                                      | Bin 0 -> 32988 bytes
 3proxy.rc                                       |   9 ++++-----
 3proxy.res                                      | Bin 0 -> 25272 bytes
 Makefile.msvc                                   |   3 ++-
 Makefile.msvc64                                 |   3 ++-
 src/plugins/LdapPlugin/ldapauth.c               |   7 -------
 src/plugins/StringsPlugin/StringsPlugin.c       |   2 +-
 src/plugins/TrafficPlugin/TrafficPlugin.c       |   2 +-
 .../WindowsAuthentication.c                     |   8 --------
 src/plugins/utf8tocp1251/utf8tocp1251.c         |   9 ---------
 11 files changed, 10 insertions(+), 34 deletions(-)
 create mode 100644 3proxy.ico
 create mode 100644 3proxy.res

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.ico b/3proxy.ico
new file mode 100644
index 0000000000000000000000000000000000000000..44dc48143d48dcf29b781f062f63da9359954b73
GIT binary patch
literal 32988
zcmeI4J&znk5QZCM@gWEtS|Zu(j6{I=1t%d9Lk1Cnb0o_#vSkZ7wuDT0h{S@7Kj46f
zfQX22QvV8g-@Sd#<zi-TKW6sscB`ej>FKV|x4L_3_Ey{4TkTdmJ#D%!+Ff10Xss<4
ztNYuneW$TIcUJfBxAy$Y)^2Nj$$zW0m*2E@S2AL2k3=4?RtOXVg+L)t2owT^Kp{{F
z6as}nAy5bu0);>!PzV$Pg+L)t2=pNEKx3~&Cp~jlHT1R&|0McX)QLV2&DE}Z{Knu{
z(K|B%a2?~1q1r!V@Od1Zuz%g-|46a^BYHYv%uyBbf2=|Fobm3n_m##k%LVx|U!R^K
z9iOfE@9CPGb#|gT&H>{8P5SYfYqmM$yF~Smz1IE|Aserq#_=7#xTiVqBA-N-jr?2R
z9D9I##b*Hi*k)V@WAUS>FRrX7=Xy*pb6LkZI=lbH?~E;Z>STi4;mbO_c-E%}e63sm
z-CeGmh#Ru-dG2db%n>}hULAiYBF3oCbJ6Bd{H)QqR>t&r4jJb)+K6)S_)LiX$g^vI
zEdCsCzQ;DcZ4$p_S$pfq#kDYHEie}UocU*8IR9SXIVR@gobex8E1KG>k%PRa!Ml@I
z_6GU)dW;QUI}O6i{Lmb_z89l0$U5^GX??7-%<H*r8}ZwRhymkqZQ^rZ4&aaZ0z>PL
zdWgfk?}=P@bfSoz^<_Kg%e-RUy4g-AdLpu)k+OZq--#kG@sj5#Pv0_Qv4IB|<$H-=
zG;$Dgbuqa`hxqLuIkexMDEh41M*KXph%fpQb$FhbEbqp;&f_tz*guzg{dWwT*Id;r
z1PXydpb#ho3IQWP?Zh*?@7a8)NR8EI)Nh9xyW^rJyO)Bb&dRk|V!P3|<i0P@%yo(|
z*Sa@4=nb5Y_5TK92f@mj*eRN0%>Oa$|GZF%nde~NxsYWJ=|0APY_Z2Y@;SsYW58O7
zpWj4`4xvAG#veoc&LMHeI*-rMUTOa15E4BS19cu}e!S+Ictp*Oo?;)w*bjN%-{@qO
z^MybmPzdaTfPW`oAvzV+?*s^hYK6cs0<IDN5Y15wyZ*kc&Ysi0qjtUj(4B#X{YRR2
zjTrs4>|dhz8Ck5UyVV>uCUvFXv3bAt+_M#*F8^!j;~gc+_SyI6melT<_e^vCUdfLl
z@@XA^hkJG3Xv7b{{Y5_8H}6Xkcw|}o=I`|oi@M8qFpuH0$70JmJZC+|GTYDh(O1jm
zSegGsbI(QjyH=L5eSd$I+#zE;vc1dV=Y5k{&5zyt>VvVm7Y+NY7w5DS8Drb`ccAf2
z-6b~YkNL+pe@BHJc|P*ew;mdD-)f+5{r{rzpGBR>KH;x<8B_NSzl_7v)fm1z7O&5~
z9B8=O6(Zm@AHM_7THJ?A*k+yBW?a{E`w;gVwpioQC+7BXy=wb?n9LnF>%iyAKG$E4
z>#DK0KR!SAg+YF1?%TfY`FZc>g&X+yJ*&<+rvDq)p4Z<#ZBHLfX<Q2de@>vE9BiM8
z*7%$t)>3QfA7HW`uQAp;Y*XpCKGt)5ep&wuk!^P(*K*M&GMvBfYTh*gdm*1mu4f;M
zsOPMUn9$2rQ_C|g>T=&U{jOm@&qV0*ne<R(8z&;SsEheH7I~SsT;KT?-!E*(&AK>q
z(d#QQIsWXwhL&eneCP4`Mg2{D=CiIJM6TyM5%|AY-G8VnH5h)xbCJHU_@VAnudme#
zf$NTd*RIbO6Z>i^pV_nMi~E(aDX(+s2cx*hr}W#p;u$rS?s!(tq2GRjjn|K#8P)cH
zfa@fGsI(BRQ74IO^2R%X^WKU4?A)})nqX5|^IP7}Zq6@1qc>@mKMMkzo*%i6*+d@v
zewTe>81g^Yfz)Kd_0g{VVsGX%c~r1xa$9-g-Q^i$9G;0bU2D<j`;tHDiEC^q;=hak
zV>W885GVu+fkL1VC<F?DLZA>R1PXydpb#ho3V}kP5GVu+fkL1VC<F?DLZA>R1PXyd
Spb#ho3V}kP5GVwe2>b_IV3_Ct

literal 0
HcmV?d00001

diff --git a/3proxy.rc b/3proxy.rc
index 3317196..5a9b43c 100644
--- a/3proxy.rc
+++ b/3proxy.rc
@@ -1,7 +1,6 @@
 #include "src/version.h"
-#include "afxres.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE 0x09, 0x01
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 0,7,0,0
@@ -18,9 +17,9 @@ BEGIN
             VALUE "FileDescription", "3proxy - tiny proxy server"
             VALUE "FileVersion", VERSION "-" BUILDDATE
             VALUE "InternalName", "3proxy"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2009 Vladimir Dubrovin"
+            VALUE "LegalCopyright", "Copyright (C) 2002-2014 Vladimir Dubrovin"
             VALUE "OriginalFilename", "3proxy.exe"
-            VALUE "ProductName", "3proxy"
+            VALUE "ProductName", "3proxy - tiny proxy server"
             VALUE "ProductVersion", VERSION
         END
     END
@@ -29,4 +28,4 @@ BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
-
+0 ICON    DISCARDABLE     "3proxy.ico"
diff --git a/3proxy.res b/3proxy.res
new file mode 100644
index 0000000000000000000000000000000000000000..115b2b77dbc53fbcc26bf9ca6cd55f7926afbd86
GIT binary patch
literal 25272
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
EKiS_-g#Z8m

literal 0
HcmV?d00001

diff --git a/Makefile.msvc b/Makefile.msvc
index 75d4d7f..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 libeay32MT.lib ssleay32MT.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 d21f9de..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 libeay32MT.lib ssleay32MT.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 a745112..ed461c9 100644
--- a/src/plugins/TrafficPlugin/TrafficPlugin.c
+++ b/src/plugins/TrafficPlugin/TrafficPlugin.c
@@ -229,7 +229,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;