diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 0f519997..9caa3425 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -432,17 +432,20 @@ bool SaveSettings(void) { } #define BROWSE_WIDTH 15 -static char szResult[4096]; + +#define BUFFER_SIZE 8192 // 8kb of mem is max char count in multiedit +static char szResult[BUFFER_SIZE]; DWORD WINAPI myGetProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName) { *szResult = '\0'; - return GetPrivateProfileString(lpAppName, lpKeyName, "", szResult, sizeof(szResult), pszFilename); + return GetPrivateProfileString(lpAppName, lpKeyName, "", szResult, BUFFER_SIZE, pszFilename); } char * WINAPI myGetProfileStringDup(LPCTSTR lpAppName, LPCTSTR lpKeyName) { - if (myGetProfileString(lpAppName, lpKeyName)) + int nSize = myGetProfileString(lpAppName, lpKeyName); + if ( nSize ) return strdup(szResult); else return NULL; @@ -543,7 +546,8 @@ bool ReadSettings(void) { // pszState cannot be NULL (?) myGetProfileString(szField, "STATE"); - pFields[nIdx].pszState = STRDUP(szResult); + pFields[nIdx].pszState = myGetProfileStringDup(szField, "STATE"); + //pFields[nIdx].pszState = STRDUP(szResult); pFields[nIdx].pszRoot = myGetProfileStringDup(szField, "ROOT"); @@ -901,7 +905,7 @@ int createCfgDlg() DWORD dwExStyle; } ClassTable[] = { { "STATIC", // FIELD_LABEL - DEFAULT_STYLES /*| WS_TABSTOP*/, + DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_NOPREFIX, WS_EX_TRANSPARENT }, { "STATIC", // FIELD_ICON DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON, @@ -1033,15 +1037,16 @@ int createCfgDlg() // Sets the font of IO window to be the same as the main window SendMessage(hwCtrl, WM_SETFONT, (WPARAM)hFont, TRUE); // make sure we created the window, then set additional attributes - if (pFields[nIdx].nMaxLength > 0) { + //if (pFields[nIdx].nMaxLength > 0) { switch (nType) { case FIELD_TEXT: + SendMessage(hwCtrl, WM_SETTEXT, 0, (LPARAM)title); case FIELD_DIRREQUEST: case FIELD_FILEREQUEST: SendMessage(hwCtrl, EM_LIMITTEXT, (WPARAM)pFields[nIdx].nMaxLength, (LPARAM)0); break; } - } + //} if ((nType == FIELD_CHECKBOX) || (nType == FIELD_RADIOBUTTON)) { if (pFields[nIdx].pszState[0] == '1') { diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc index ba18d09e..a9ca4251 100644 --- a/Contrib/UIs/UI Holder/resource.rc +++ b/Contrib/UIs/UI Holder/resource.rc @@ -8,6 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -25,92 +26,100 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23 + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END -IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, - 0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 + ICON 103,IDC_ULICON,0,0,20,20 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END -IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP | NOT WS_VISIBLE - ICON IDI_ICON2,IDC_ULICON,0,0,21,20 - LTEXT "",IDC_TEXT2,0,40,108,65 - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,111,8 - LTEXT "",IDC_INTROTEXT,25,0,241,25 + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, + 27,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,111,111,8 + LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 END -IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 -STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER +IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE + PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, - 7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, + 267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED END -IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 - CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, - 24,0,241,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, + 11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + ICON 103,IDC_ULICON,0,0,20,20 PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP END -IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ICON2,IDC_ULICON,0,1,20,20 + ICON 103,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END -IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 -STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE +IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8 + CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -134,4 +143,7 @@ END #endif // APSTUDIO_INVOKED -#endif \ No newline at end of file +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe index 3c5d0626..4c99f3b3 100755 Binary files a/Contrib/UIs/default.exe and b/Contrib/UIs/default.exe differ diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index 9296c8e5..e2351a64 100644 Binary files a/Contrib/UIs/modern.exe and b/Contrib/UIs/modern.exe differ diff --git a/Contrib/UIs/modern_headerbmp.exe b/Contrib/UIs/modern_headerbmp.exe index 19a77e52..35390283 100644 Binary files a/Contrib/UIs/modern_headerbmp.exe and b/Contrib/UIs/modern_headerbmp.exe differ diff --git a/Contrib/UIs/modern_headerbmpr.exe b/Contrib/UIs/modern_headerbmpr.exe index 4a8570e7..58566ab8 100644 Binary files a/Contrib/UIs/modern_headerbmpr.exe and b/Contrib/UIs/modern_headerbmpr.exe differ diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe index d9d99ab9..e0c0bae4 100644 Binary files a/Contrib/UIs/modern_nodesc.exe and b/Contrib/UIs/modern_nodesc.exe differ diff --git a/Contrib/UIs/modern_smalldesc.exe b/Contrib/UIs/modern_smalldesc.exe index 9b20bce9..f69f18ba 100644 Binary files a/Contrib/UIs/modern_smalldesc.exe and b/Contrib/UIs/modern_smalldesc.exe differ diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe index c2eb8ee4..d96c337a 100644 Binary files a/Contrib/UIs/sdbarker_tiny.exe and b/Contrib/UIs/sdbarker_tiny.exe differ diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index cc206d57..31e87e6a 100644 Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc index e4807741..e1ffc104 100644 --- a/Source/exehead/resource.rc +++ b/Source/exehead/resource.rc @@ -28,15 +28,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_LICENSEPAGE) #if defined(APSTUDIO_INVOKED) -IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23 + LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END @@ -44,42 +44,46 @@ END #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, - 0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END #endif #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_COMPONENTPAGE) #if defined(APSTUDIO_INVOKED) -IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP | NOT WS_VISIBLE - ICON IDI_ICON2,IDC_ULICON,0,0,21,20 - LTEXT "",IDC_TEXT2,0,40,108,65 - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFT,0,111,111,18 - LTEXT "",IDC_INTROTEXT,25,0,241,25 + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT + WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, + 27,108,8 + LTEXT "",IDC_SPACEREQUIRED,0,111,111,18,SS_NOPREFIX | NOT + WS_GROUP + LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 @@ -88,35 +92,38 @@ END #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 280, 162 +IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 280, 162 #else -IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 +IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 #endif -STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE + PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, - 7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, + 267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | + WS_GROUP,7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED END #endif #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 - CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, - 24,0,241,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, + 11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 @@ -127,30 +134,30 @@ END #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_UNINSTDLG) #if defined(APSTUDIO_INVOKED) -IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END #endif #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_VERIFYDIALOG) #if defined(APSTUDIO_INVOKED) -IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOGEX DISCARDABLE 0, 0, 162, 22 +IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOG DISCARDABLE 0, 0, 162, 22 #else -IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 +IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 #endif -STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8 + CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX END #endif