Grow Windows License Dialog

- Merge upstream change that fixes an issue where the license dialog / about box was being truncated depending on system configuration and compiler information.  This was evident with PuTTY CAC.

windows/pageant.rc

@@ -34,14 +34,14 @@ FONT 8, "MS Shell Dlg"
 #ifdef PUTTY_CAC
 BEGIN
     LISTBOX         100,10,10,310,153,
-        LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_EXTENDEDSEL | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_VSCROLL | WS_TABSTOP
+    LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_EXTENDEDSEL | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "&Add PuTTY Key",101,10,160,64,14
     PUSHBUTTON      "&Remove",102,270,160,50,14
     PUSHBUTTON      "&Help",103,10,180,50,14
     DEFPUSHBUTTON   "&Close",IDOK,270,180,50,14
     PUSHBUTTON      "Add &PKCS Cert", IDC_PAGEANT_ADD_PKCS,142,160,60,14
     PUSHBUTTON      "&Add CAPI Cert", IDC_PAGEANT_ADD_CAPI,78,160,60,14
-	PUSHBUTTON      "Copy &To Clipboard", IDC_PAGEANT_CLIP_KEY,68,180,80,14
+    PUSHBUTTON      "Copy &To Clipboard", IDC_PAGEANT_CLIP_KEY,68,180,80,14
 END
 #else
 BEGIN
@@ -55,26 +55,26 @@ END
 #endif // PUTTY_CAC
 
 /* Accelerators used: cl */
-213 DIALOG DISCARDABLE 140, 40, 270, 106
+213 DIALOG DISCARDABLE 140, 40, 270, 136
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Pageant"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 88, 48, 14
-    PUSHBUTTON "View &Licence", 101, 6, 88, 70, 14
-    PUSHBUTTON "Visit &Web Site", 102, 140, 88, 70, 14
-    EDITTEXT 1000, 10, 6, 250, 80, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
+    PUSHBUTTON "View &Licence", 101, 6, 118, 70, 14
+    PUSHBUTTON "Visit &Web Site", 102, 140, 118, 70, 14
+    EDITTEXT 1000, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
 END
 
 /* No accelerators used */
-214 DIALOG DISCARDABLE 50, 50, 326, 231
+214 DIALOG DISCARDABLE 50, 50, 326, 239
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 148, 211, 44, 14
+    DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
 
-    EDITTEXT 1000, 10, 10, 306, 192, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT 1000, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
 END
 
 #include "version.rc2"

windows/puttygen.rc

@@ -31,26 +31,26 @@ BEGIN
 END
 
 /* Accelerators used: cl */
-213 DIALOG DISCARDABLE 140, 40, 270, 106
+213 DIALOG DISCARDABLE 140, 40, 270, 136
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTYgen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 88, 48, 14
-    PUSHBUTTON "View &Licence", 101, 6, 88, 70, 14
-    PUSHBUTTON "Visit &Web Site", 102, 140, 88, 70, 14
-    EDITTEXT 1000, 10, 6, 250, 80, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
+    PUSHBUTTON "View &Licence", 101, 6, 118, 70, 14
+    PUSHBUTTON "Visit &Web Site", 102, 140, 118, 70, 14
+    EDITTEXT 1000, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
 END
 
 /* No accelerators used */
-214 DIALOG DISCARDABLE 50, 50, 326, 231
+214 DIALOG DISCARDABLE 50, 50, 326, 239
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 148, 211, 44, 14
+    DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
 
-    EDITTEXT 1000, 10, 10, 306, 192, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT 1000, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
 END
 
 #include "version.rc2"

windows/win_res.rc2

@@ -52,14 +52,14 @@ BEGIN
 END
 
 /* No accelerators used */
-IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 326, 231
+IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 326, 239
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 148, 211, 44, 14
+    DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
 
-    EDITTEXT IDA_TEXT, 10, 10, 306, 192, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT IDA_TEXT, 10, 10, 306, 200, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
 END
 
 #include "version.rc2"