Fix Jacob's fix for mingw32 resource compiler so that it _only_ happens

when using the mingw32 resource compiler!

git-svn-id: svn://svn.tartarus.org/sgt/putty@600 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mkfiles.pl b/mkfiles.pl
index a9e60e1..d46bb82 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -72,7 +72,7 @@ print
 "\n".
 "CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT -D_NO_OLDNAMES -I.\n".
 "LDFLAGS = -mno-cygwin -s\n".
-"RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400\n".
+"RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 --define MINGW32_FIX=1\n".
 "LIBS = -ladvapi32 -luser32 -lgdi32 -lwsock32 -lcomctl32 -lcomdlg32\n".
 "OBJ=o\n".
 "RES=res.o\n".

diff --git a/win_res.inp b/win_res.inp
index ed90496..bc7b405 100644 (file)
--- a/win_res.inp
+++ b/win_res.inp
@@ -8,6 +8,10 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+#ifdef MINGW32_FIX
+#define EDITTEXT     EDITTEXT "",
+#endif
+
 #include "win_res.h"
 
 IDI_MAINICON ICON "putty.ico"
@@ -69,9 +73,9 @@ INIT(0,176,4,162) SPOS(3,3)
 BEGIN
     GRID(4,4,24)
     LTEXT "Host &Name", IDC0_HOSTSTATIC, COL(1), SS(3,2)
-    EDITTEXT "", IDC0_HOST, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    EDITTEXT IDC0_HOST, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
     LTEXT "&Port", IDC0_PORTSTATIC, COL(4), SS(1,2)
-    EDITTEXT "", IDC0_PORT, ADJ(8) COL(4), SS(1,3)
+    EDITTEXT IDC0_PORT, ADJ(8) COL(4), SS(1,3)
     NEXT
     GRID(4,8,10)
 #ifdef FWHACK
@@ -91,7 +95,7 @@ BEGIN
     GRID(1,8,8)
     LTEXT "Stor&ed Sessions", IDC0_SESSSTATIC, SCOL
     GRID(4,12,14)
-    EDITTEXT "", IDC0_SESSEDIT, COL(1), SS(3), ES_AUTOHSCROLL
+    EDITTEXT IDC0_SESSEDIT, COL(1), SS(3), ES_AUTOHSCROLL
     NEXT
     GRID(4,71,0)
     LISTBOX IDC0_SESSLIST, COL(1), SS(3),
@@ -151,12 +155,12 @@ BEGIN
     LTEXT "Terminal screen dimensions:", IDC2_DIMSTATIC, SCOL
     GRID(4,4,15)
     RTEXT "&Rows", IDC2_ROWSSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC2_ROWSEDIT, COL(2), SS(1,3)
+    EDITTEXT IDC2_ROWSEDIT, COL(2), SS(1,3)
     RTEXT "Colu&mns", IDC2_COLSSTATIC, ADJ(2) COL(3), SS(1,2) 
-    EDITTEXT "", IDC2_COLSEDIT, COL(4), SS(1,3)
+    EDITTEXT IDC2_COLSEDIT, COL(4), SS(1,3)
     NEXT
     RTEXT "&Saved lines of scrollback", IDC2_SAVESTATIC, ADJ(2) COL(1), SS(3,2)
-    EDITTEXT "", IDC2_SAVEEDIT, COL(4), SS(1,3)
+    EDITTEXT IDC2_SAVEEDIT, COL(4), SS(1,3)
     NEXT(2)
     GRID(3,8,0)
     RTEXT "Font:", IDC2_FONTSTATIC, ADJ(3) COL(1), SS(2)
@@ -187,22 +191,22 @@ INIT(10,176,8,162) SPOS(3,3)
 BEGIN
     GRID(2,4,14)
     LTEXT "Terminal-&type string", IDC3_TTSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     LTEXT "Terminal-&speed string", IDC3_TSSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TSEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TSEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     LTEXT "Auto-login &username", IDC3_LOGSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GAP(8)
     GRID(1,8,10)
     LTEXT "Environment variables:", IDC3_ENVSTATIC, SCOL
     GRID(5,4,14)
     LTEXT "&Variable", IDC3_VARSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_VAREDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_VAREDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     LTEXT "Va&lue", IDC3_VALSTATIC, ADJ(2) COL(3), SS(1,2)
-    EDITTEXT "", IDC3_VALEDIT, COL(4), SS(2,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_VALEDIT, COL(4), SS(2,3), ES_AUTOHSCROLL
     NEXT
     GAP(4)
     GRID(4,55,0)
@@ -228,13 +232,13 @@ INIT(10,176,8,162) SPOS(3,3)
 BEGIN
     GRID(2,4,16)
     LTEXT "Terminal-&type string", IDC3_TTSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GRID(1,8,10)
     AUTOCHECKBOX "Don't allocate a &pseudo-terminal", IDC3_NOPTY, SCOL
     GRID(2,4,16)
     LTEXT "Auto-login &username", IDC3_LOGSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GRID(11,8,10)
     LTEXT "Cipher:", IDC3_CIPHERSTATIC, COL(1), SS(2)
@@ -252,7 +256,7 @@ BEGIN
     NEXT
     GRID(4,4,24)
     LTEXT "Public &key file:", IDC3_PKSTATIC, COL(1), SS(3,2)
-    EDITTEXT "", IDC3_PKEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_PKEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
     GRID(4,12,24)
     PUSHBUTTON "C&hange...", IDC3_PKBUTTON, ADJ(8) COL(4), SS(1)
     NEXT
@@ -280,7 +284,7 @@ BEGIN
     GRID(1,14,17)
     PUSHBUTTON "&Set", IDC4_CCSET, 33, CURY, 34, 14
     LTEXT "&to class", IDC4_CCSTATIC2, 73, CURY+3, 26, 8
-    EDITTEXT "", IDC4_CCEDIT, 105, CURY+1, 36, 12
+    EDITTEXT IDC4_CCEDIT, 105, CURY+1, 36, 12
     NEXT
 END
 

diff --git a/win_res.rc b/win_res.rc
index d181ed7..b374041 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -8,6 +8,10 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+#ifdef MINGW32_FIX
+#define EDITTEXT     EDITTEXT "",
+#endif
+
 #include "win_res.h"
 
 IDI_MAINICON ICON "putty.ico"
@@ -69,9 +73,9 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Host &Name", IDC0_HOSTSTATIC, 3, 3, 119, 8
-    EDITTEXT "", IDC0_HOST,  3, 11, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC0_HOST,  3, 11, 119, 12, ES_AUTOHSCROLL
     LTEXT "&Port", IDC0_PORTSTATIC, 129, 3, 35, 8
-    EDITTEXT "", IDC0_PORT,  129, 11, 35, 12
+    EDITTEXT IDC0_PORT,  129, 11, 35, 12
     
     
 #ifdef FWHACK
@@ -91,7 +95,7 @@ BEGIN
     
     LTEXT "Stor&ed Sessions", IDC0_SESSSTATIC, 3, 37, 162, 8
     
-    EDITTEXT "", IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL
     
     
     LISTBOX IDC0_SESSLIST, 3, 59, 119, 71,
@@ -151,12 +155,12 @@ BEGIN
     LTEXT "Terminal screen dimensions:", IDC2_DIMSTATIC, 3, 3, 162, 8
     
     RTEXT "&Rows", IDC2_ROWSSTATIC,  3, 15, 35, 8
-    EDITTEXT "", IDC2_ROWSEDIT, 45, 13, 35, 12
+    EDITTEXT IDC2_ROWSEDIT, 45, 13, 35, 12
     RTEXT "Colu&mns", IDC2_COLSSTATIC,  87, 15, 35, 8 
-    EDITTEXT "", IDC2_COLSEDIT, 129, 13, 35, 12
+    EDITTEXT IDC2_COLSEDIT, 129, 13, 35, 12
     
     RTEXT "&Saved lines of scrollback", IDC2_SAVESTATIC,  3, 30, 119, 8
-    EDITTEXT "", IDC2_SAVEEDIT, 129, 28, 35, 12
+    EDITTEXT IDC2_SAVEEDIT, 129, 28, 35, 12
     
     
     RTEXT "Font:", IDC2_FONTSTATIC,  3, 48, 105, 8
@@ -187,22 +191,22 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Terminal-&type string", IDC3_TTSTATIC,  3, 5, 77, 8
-    EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
     
     LTEXT "Terminal-&speed string", IDC3_TSSTATIC,  3, 19, 77, 8
-    EDITTEXT "", IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL
     
     LTEXT "Auto-login &username", IDC3_LOGSTATIC,  3, 33, 77, 8
-    EDITTEXT "", IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL
     
     
     
     LTEXT "Environment variables:", IDC3_ENVSTATIC, 3, 53, 162, 8
     
     LTEXT "&Variable", IDC3_VARSTATIC,  3, 65, 26, 8
-    EDITTEXT "", IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL
     LTEXT "Va&lue", IDC3_VALSTATIC,  70, 65, 26, 8
-    EDITTEXT "", IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL
     
     
     
@@ -228,13 +232,13 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Terminal-&type string", IDC3_TTSTATIC,  3, 5, 77, 8
-    EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
     
     
     AUTOCHECKBOX "Don't allocate a &pseudo-terminal", IDC3_NOPTY, 3, 19, 162, 8
     
     LTEXT "Auto-login &username", IDC3_LOGSTATIC,  3, 31, 77, 8
-    EDITTEXT "", IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL
     
     
     LTEXT "Cipher:", IDC3_CIPHERSTATIC, 3, 45, 23, 8
@@ -252,7 +256,7 @@ BEGIN
     
     
     LTEXT "Public &key file:", IDC3_PKSTATIC, 3, 85, 119, 8
-    EDITTEXT "", IDC3_PKEDIT,  3, 93, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_PKEDIT,  3, 93, 119, 12, ES_AUTOHSCROLL
     
     PUSHBUTTON "C&hange...", IDC3_PKBUTTON,  129, 93, 35, 12
     
@@ -280,7 +284,7 @@ BEGIN
     
     PUSHBUTTON "&Set", IDC4_CCSET, 33, 147, 34, 14
     LTEXT "&to class", IDC4_CCSTATIC2, 73, 147+3, 26, 8
-    EDITTEXT "", IDC4_CCEDIT, 105, 147+1, 36, 12
+    EDITTEXT IDC4_CCEDIT, 105, 147+1, 36, 12
     
 END