Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[hbelusca] 69637: [MSCONFIG_NEW] Reduce indentation level in code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 21 23:36:17 2015 New Revision: 69637 URL: http://svn.reactos.org/svn/reactos?rev=69637&view=rev Log: [MSCONFIG_NEW] Reduce indentation level in code. Modified: trunk/reactos/base/applications/msconfig_new/stringutils.c trunk/reactos/base/applications/msconfig_new/utils.c Modified: trunk/reactos/base/applications/msconfig_new/stringutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/stringutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/stringutils.c [iso-8859-1] Wed Oct 21 23:36:17 2015 @@ -15,15 +15,17 @@ // LPTSTR FormatStringV(LPCTSTR str, va_list args) { - LPTSTR lpszString = NULL; - - if (str) - { - size_t strLenPlusNull = _vsctprintf(str, args) + 1; - lpszString = (LPTSTR)MemAlloc(0, strLenPlusNull * sizeof(TCHAR)); - if (lpszString) - StringCchVPrintf(lpszString, strLenPlusNull, str, args); - } + LPTSTR lpszString; + size_t strLenPlusNull; + + if (!str) return NULL; + + strLenPlusNull = _vsctprintf(str, args) + 1; + + lpszString = (LPTSTR)MemAlloc(0, strLenPlusNull * sizeof(TCHAR)); + if (!lpszString) return NULL; + + StringCchVPrintf(lpszString, strLenPlusNull, str, args); return lpszString; } @@ -45,114 +47,112 @@ // LPSTR UnicodeToAnsi(LPCWSTR strW) { - LPSTR strA = NULL; - - if (strW) - { - int iNeededChars = WideCharToMultiByte(CP_ACP, - WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, - strW, -1, NULL, 0, NULL, NULL); - - strA = (LPSTR)MemAlloc(0, iNeededChars * sizeof(CHAR)); - if (strA) - { - WideCharToMultiByte(CP_ACP, - WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, - strW, -1, strA, iNeededChars, NULL, NULL); - } - } + LPSTR strA; + int iNeededChars; + + if (!strW) return NULL; + + iNeededChars = WideCharToMultiByte(CP_ACP, + WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, + strW, -1, NULL, 0, NULL, NULL); + + strA = (LPSTR)MemAlloc(0, iNeededChars * sizeof(CHAR)); + if (!strA) return NULL; + + WideCharToMultiByte(CP_ACP, + WC_COMPOSITECHECK /* | WC_NO_BEST_FIT_CHARS */, + strW, -1, strA, iNeededChars, NULL, NULL); return strA; } LPWSTR AnsiToUnicode(LPCSTR strA) { - LPWSTR strW = NULL; - - if (strA) - { - int iNeededChars = MultiByteToWideChar(CP_ACP, - MB_PRECOMPOSED, - strA, -1, NULL, 0); - - strW = (LPWSTR)MemAlloc(0, iNeededChars * sizeof(WCHAR)); - if (strW) - { - MultiByteToWideChar(CP_ACP, - MB_PRECOMPOSED, - strA, -1, strW, iNeededChars); - } - } + LPWSTR strW; + int iNeededChars; + + if (!strA) return NULL; + + iNeededChars = MultiByteToWideChar(CP_ACP, + MB_PRECOMPOSED, + strA, -1, NULL, 0); + + strW = (LPWSTR)MemAlloc(0, iNeededChars * sizeof(WCHAR)); + if (!strW) return NULL; + + MultiByteToWideChar(CP_ACP, + MB_PRECOMPOSED, + strA, -1, strW, iNeededChars); return strW; } LPSTR DuplicateStringA(LPCSTR str) { - LPSTR dupStr = NULL; - - if (str) - { - size_t strSizePlusNull = strlen(str) + 1; - - dupStr = (LPSTR)MemAlloc(0, strSizePlusNull * sizeof(CHAR)); - if (dupStr) - StringCchCopyA(dupStr, strSizePlusNull, str); - } + LPSTR dupStr; + size_t strSizePlusNull; + + if (!str) return NULL; + + strSizePlusNull = strlen(str) + 1; + + dupStr = (LPSTR)MemAlloc(0, strSizePlusNull * sizeof(CHAR)); + if (!dupStr) return NULL; + + StringCchCopyA(dupStr, strSizePlusNull, str); return dupStr; } LPWSTR DuplicateStringW(LPCWSTR str) { - LPWSTR dupStr = NULL; - - if (str) - { - size_t strSizePlusNull = wcslen(str) + 1; - - dupStr = (LPWSTR)MemAlloc(0, strSizePlusNull * sizeof(WCHAR)); - if (dupStr) - StringCchCopyW(dupStr, strSizePlusNull, str); - } + LPWSTR dupStr; + size_t strSizePlusNull; + + if (!str) return NULL; + + strSizePlusNull = wcslen(str) + 1; + + dupStr = (LPWSTR)MemAlloc(0, strSizePlusNull * sizeof(WCHAR)); + if (!dupStr) return NULL; + + StringCchCopyW(dupStr, strSizePlusNull, str); return dupStr; } LPSTR DuplicateStringAEx(LPCSTR str, size_t numOfChars) { - LPSTR dupStr = NULL; - - if (str) - { - size_t strSize = min(strlen(str), numOfChars); - - dupStr = (LPSTR)MemAlloc(0, (strSize + 1) * sizeof(CHAR)); - if (dupStr) - { - StringCchCopyNA(dupStr, strSize + 1, str, strSize); - dupStr[strSize] = '\0'; - } - } + LPSTR dupStr; + size_t strSize; + + if (!str) return NULL; + + strSize = min(strlen(str), numOfChars); + + dupStr = (LPSTR)MemAlloc(0, (strSize + 1) * sizeof(CHAR)); + if (!dupStr) return NULL; + + StringCchCopyNA(dupStr, strSize + 1, str, strSize); + dupStr[strSize] = '\0'; return dupStr; } LPWSTR DuplicateStringWEx(LPCWSTR str, size_t numOfChars) { - LPWSTR dupStr = NULL; - - if (str) - { - size_t strSize = min(wcslen(str), numOfChars); - - dupStr = (LPWSTR)MemAlloc(0, (strSize + 1) * sizeof(WCHAR)); - if (dupStr) - { - StringCchCopyNW(dupStr, strSize + 1, str, strSize); - dupStr[strSize] = L'\0'; - } - } + LPWSTR dupStr; + size_t strSize; + + if (!str) return NULL; + + strSize = min(wcslen(str), numOfChars); + + dupStr = (LPWSTR)MemAlloc(0, (strSize + 1) * sizeof(WCHAR)); + if (!dupStr) return NULL; + + StringCchCopyNW(dupStr, strSize + 1, str, strSize); + dupStr[strSize] = L'\0'; return dupStr; } Modified: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] Wed Oct 21 23:36:17 2015 @@ -41,42 +41,40 @@ FormatDateTime(IN LPSYSTEMTIME pDateTime) { LPWSTR lpszDateTime = NULL; - - if (pDateTime) - { - int iDateBufSize = 0, iTimeBufSize = 0; - - iDateBufSize = GetDateFormatW(LOCALE_USER_DEFAULT, - /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, - pDateTime, - NULL, - NULL, - 0); - iTimeBufSize = GetTimeFormatW(LOCALE_USER_DEFAULT, - 0, - pDateTime, - NULL, - NULL, - 0); - - if ( (iDateBufSize > 0) && (iTimeBufSize > 0) ) - { - lpszDateTime = (LPWSTR)MemAlloc(0, (iDateBufSize + iTimeBufSize) * sizeof(TCHAR)); - - GetDateFormatW(LOCALE_USER_DEFAULT, - /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, - pDateTime, - NULL, - lpszDateTime, - iDateBufSize); - if (iDateBufSize > 0) lpszDateTime[iDateBufSize-1] = L' '; - GetTimeFormatW(LOCALE_USER_DEFAULT, - 0, - pDateTime, - NULL, - lpszDateTime + iDateBufSize, - iTimeBufSize); - } + int iDateBufSize, iTimeBufSize; + + if (pDateTime == NULL) return NULL; + + iDateBufSize = GetDateFormatW(LOCALE_USER_DEFAULT, + /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, + pDateTime, + NULL, + NULL, + 0); + iTimeBufSize = GetTimeFormatW(LOCALE_USER_DEFAULT, + 0, + pDateTime, + NULL, + NULL, + 0); + + if ( (iDateBufSize > 0) && (iTimeBufSize > 0) ) + { + lpszDateTime = (LPWSTR)MemAlloc(0, (iDateBufSize + iTimeBufSize) * sizeof(TCHAR)); + + GetDateFormatW(LOCALE_USER_DEFAULT, + /* Only for Windows 7 : DATE_AUTOLAYOUT | */ DATE_SHORTDATE, + pDateTime, + NULL, + lpszDateTime, + iDateBufSize); + if (iDateBufSize > 0) lpszDateTime[iDateBufSize-1] = L' '; + GetTimeFormatW(LOCALE_USER_DEFAULT, + 0, + pDateTime, + NULL, + lpszDateTime + iDateBufSize, + iTimeBufSize); } return lpszDateTime;

8 years, 11 months

[dreimer] 69636: [DEVMGR] Updated German language

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 21 19:17:16 2015 New Revision: 69636 URL: http://svn.reactos.org/svn/reactos?rev=69636&view=rev Log: [DEVMGR] Updated German language Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Wed Oct 21 19:17:16 2015 @@ -246,79 +246,78 @@ IDR_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Datei" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "&Beenden", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU - POPUP "View" + MENUITEM "Ak&tion", IDC_ACTIONMENU + POPUP "&Ansicht" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "GerÃ¤te nach &Typ", IDC_DEVBYTYPE + MENUITEM "GarÃ¤te nach &Verbindung", IDC_DEVBYCONN + MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Ausgeblendete &GerÃ¤te anzeigen", IDC_SHOWHIDDEN END - POPUP "Help" + POPUP "&Hilfe" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "Ã&ber", IDC_ABOUT END END STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Device Manager" - IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" - IDS_CONFIRM_UNINSTALL "Warning: You are about to uninstall this device from your system.\r\nDo you want to continue?" + IDS_APPNAME "ReactOS GerÃ¤te-Manager" + IDS_CONFIRM_DISABLE "Dieses GerÃ¤t zu deaktivieren wird dessen Funktion einstellen.\r\nWollen Sie es wirklich deaktivieren?" + IDS_CONFIRM_UNINSTALL "Warnung: Sie sind dabei, dieses GerÃ¤t deinstallieren\r\nMÃ¶chten Sie den Vorgang fortsetzen?" END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_UPDATE "Update driver software..." - IDS_MENU_ENABLE "Enable" - IDS_MENU_DISABLE "Disable" - IDS_MENU_UNINSTALL "Uninstall" - IDS_MENU_SCAN "Scan for hardware changes" - IDS_MENU_ADD "Add hardware" - IDS_MENU_PROPERTIES "Properties" + IDS_MENU_UPDATE "Treibersoftware aktualisieren ..." + IDS_MENU_ENABLE "Aktivieren" + IDS_MENU_DISABLE "Deaktivieren" + IDS_MENU_UNINSTALL "Deinstallieren" + IDS_MENU_SCAN "Nach geÃ¤nderter Hardware suchen" + IDS_MENU_ADD "Hardware hinzufÃ¼gen" + IDS_MENU_PROPERTIES "Eigenschaften" END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROPERTIES "Properties" - IDS_TOOLTIP_SCAN "Scan for hardware changes" - IDS_TOOLTIP_ENABLE "Enable" - IDS_TOOLTIP_DISABLE "Disable" - IDS_TOOLTIP_UPDATE "Update Driver Software" - IDS_TOOLTIP_UNINSTALL "Uninstall" + IDS_TOOLTIP_PROPERTIES "Eigenschaften" + IDS_TOOLTIP_SCAN "Nach geÃ¤nderter Hardware suchen" + IDS_TOOLTIP_ENABLE "Aktivieren" + IDS_TOOLTIP_DISABLE "Deaktivieren" + IDS_TOOLTIP_UPDATE "Treibersoftware aktualisieren" + IDS_TOOLTIP_UNINSTALL "Deinstallieren" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Open property dialog for the current selection." - IDS_HINT_SCAN " Scan for changed or new plug and play devices." - IDS_HINT_ENABLE " Enables the selected device." - IDS_HINT_DISABLE " Disables the selected device." - IDS_HINT_UPDATE " Launches the Update Driver Software wizard for the selected device." - IDS_HINT_UNINSTALL " Uninstalls the driver for the selected device." - IDS_HINT_ADD " Adds a legacy (non-Plug and Play) device to the computer." - IDS_HINT_ABOUT " About ReactOS Device Manager." - IDS_HINT_EXIT " Exits the program." - - IDS_HINT_DEV_BY_TYPE " Displays devices by hardware type." - IDS_HINT_DEV_BY_CONN " Displays devices by connection." - IDS_HINT_RES_BY_TYPE " Displays resources by type." - IDS_HINT_RES_BY_CONN " Displays resources by connection type." - IDS_HINT_SHOW_HIDDEN " Displays legacy devices and devices that are no longer installed." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END - + IDS_HINT_PROPERTIES " Ãffnet Eigenschaftsdialog fÃ¼r die aktuelle Auswahl." + IDS_HINT_SCAN " Nach geÃ¤nderten oder neuen Plug & Play-GerÃ¤ten suchen." + IDS_HINT_ENABLE " Aktiviert das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_DISABLE " Deaktiviert das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_UPDATE " Startet den Treibersoftware aktualisieren Assistenten fÃ¼r das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_UNINSTALL " Deinstalliert den Treiber fÃ¼r das ausgewÃ¤hlte GerÃ¤t." + IDS_HINT_ADD " FÃ¼gt ein Legacy (nicht Plug & Play) GerÃ¤t dem Computer hinzu." + IDS_HINT_ABOUT " Ãber ReactOS GerÃ¤te-Manager." + IDS_HINT_EXIT " Beendet das Programm." + + IDS_HINT_DEV_BY_TYPE " Zeigt GerÃ¤te nach Hardwaretyp an." + IDS_HINT_DEV_BY_CONN " Zeigt GerÃ¤te nach Verbindung an." + IDS_HINT_RES_BY_TYPE " Zeigt Ressourcen nach Typ an." + IDS_HINT_RES_BY_CONN " Zeigt Ressourcen nach Verbindungstyp an." + IDS_HINT_SHOW_HIDDEN " Zeigt Legacy-GerÃ¤te und GerÃ¤te, die nicht mehr installiert sind an." + + IDS_HINT_SYS_RESTORE " Stellt dieses Fenster auf die normale GrÃ¶Ãe zurÃ¼ck." + IDS_HINT_SYS_MOVE " Verschiebt das Fenster." + IDS_HINT_SYS_SIZE " Ãndert die GrÃ¶Ãe dieses Fensters." + IDS_HINT_SYS_MINIMIZE " Reduziert dieses Fenster zu einem Symbol." + IDS_HINT_SYS_MAXIMIZE " Erweitert dieses Fenster, um den Bildschirm zu fÃ¼llen." + IDS_HINT_SYS_CLOSE " SchlieÃt dieses Fenster." +END Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Wed Oct 21 19:17:16 2015 @@ -318,4 +318,3 @@ IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." IDS_HINT_SYS_CLOSE " Closes this window." END -

8 years, 11 months

[dreimer] 69635: [MSCONFIG_NEW] Updated German language

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 21 18:41:43 2015 New Revision: 69635 URL: http://svn.reactos.org/svn/reactos?rev=69635&view=rev Log: [MSCONFIG_NEW] Updated German language Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] Wed Oct 21 18:41:43 2015 @@ -135,21 +135,21 @@ IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Expand Files from an Installation Source" +CAPTION "Dateien von einer Installationsquelle erweitern" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 - LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + LTEXT "Geben Sie die Dateien an, die wiederhergestellt werden sollen, den Quellpfad, auf dem sich die Installationsdateien befinden, und den Zielpfad fÃ¼r die Dateien.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "&Wiederherzustellende Dateien:", IDC_STATIC, 7, 31, 93, 16 EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL - PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 - LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + PUSHBUTTON "&Durchsuchen...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "Wieder&herstellen von:", IDC_STATIC, 7, 55, 93, 10 COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 - LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + PUSHBUTTON "D&urchsuchen...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Speichern unter:", IDC_STATIC, 7, 76, 93, 10 COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 - DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 - PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 + PUSHBUTTON "Du&rchsuchen...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Erweitern", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 264, 96, 82, 14 END STRINGTABLE

8 years, 11 months

[tfaber] 69634: [WININET] - Missing the USERPROFILE variable is a critical bug, so inform us about it with an ERR instead of a TRACE CORE-10381

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Oct 21 09:00:13 2015 New Revision: 69634 URL: http://svn.reactos.org/svn/reactos?rev=69634&view=rev Log: [WININET] - Missing the USERPROFILE variable is a critical bug, so inform us about it with an ERR instead of a TRACE CORE-10381 Modified: trunk/reactos/dll/win32/wininet/urlcache.c Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Wed Oct 21 09:00:13 2015 @@ -750,7 +750,7 @@ /* ReactOS r50916 */ if (GetEnvironmentVariableW(UserProfile, NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) { - TRACE("Environment variable 'USERPROFILE' does not exist!\n"); + ERR("Environment variable 'USERPROFILE' does not exist!\n"); return; }

8 years, 11 months

[jimtabor] 69633: [Win32SS] - Implement suspended window support, see CORE-10078.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 21 00:13:23 2015 New Revision: 69633 URL: http://svn.reactos.org/svn/reactos?rev=69633&view=rev Log: [Win32SS] - Implement suspended window support, see CORE-10078. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/userfuncs.h Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -1094,7 +1094,7 @@ case WM_NCCALCSIZE: { - return NC_HandleNCCalcSize( Wnd, wParam, (RECTL *)lParam ); + return NC_HandleNCCalcSize( Wnd, wParam, (RECTL *)lParam, FALSE ); } case WM_NCACTIVATE: Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -1058,6 +1058,13 @@ return STATUS_UNSUCCESSFUL; } + if (IsThreadSuspended(ptirec)) + { + ERR("Sending to Suspended Thread Msg %lx\n",Msg); + if (uResult) *uResult = -1; + return STATUS_UNSUCCESSFUL; + } + // Should we do the same for No Wait? if ( HookMessage == MSQ_NORMAL ) { @@ -2037,7 +2044,28 @@ LARGE_INTEGER LargeTickCount; KeQueryTickCount(&LargeTickCount); - return ((LargeTickCount.u.LowPart - pti->timeLast) > MSQ_HUNG); + + if ((LargeTickCount.u.LowPart - pti->timeLast) > MSQ_HUNG && + !(pti->pcti->fsWakeMask & QS_INPUT) && + !PsGetThreadFreezeCount(pti->pEThread) && + !(pti->ppi->W32PF_flags & W32PF_APPSTARTING)) + return TRUE; + + return FALSE; +} + +BOOL FASTCALL +IsThreadSuspended(PTHREADINFO pti) +{ + if (pti->pEThread) + { + BOOL Ret = TRUE; + ObReferenceObject(pti->pEThread); + if (!(pti->pEThread->Tcb.SuspendCount) && !PsGetThreadFreezeCount(pti->pEThread)) Ret = FALSE; + ObDereferenceObject(pti->pEThread); + return Ret; + } + return FALSE; } VOID Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -251,6 +251,7 @@ VOID FASTCALL ClearMsgBitsMask(PTHREADINFO,UINT); BOOL FASTCALL IntCallMsgFilter(LPMSG,INT); WPARAM FASTCALL MsqGetDownKeyState(PUSER_MESSAGE_QUEUE); +BOOL FASTCALL IsThreadSuspended(PTHREADINFO); int UserShowCursor(BOOL bShow); PCURICON_OBJECT Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -477,7 +477,12 @@ UserDrawMovingFrame( hdc, &newRect, thickframe ); else { // Moving the whole window now! - PWND pwndTemp; + HRGN hrgnNew; + HRGN hrgnOrig = GreCreateRectRgnIndirect(&pwnd->rcWindow); + + if (pwnd->hrgnClip != NULL) + NtGdiCombineRgn(hrgnOrig, hrgnOrig, pwnd->hrgnClip, RGN_AND); + //// This causes the mdi child window to jump up when it is moved. //IntMapWindowPoints( 0, pWndParent, (POINT *)&rect, 2 ); co_WinPosSetWindowPos( pwnd, @@ -488,18 +493,29 @@ newRect.bottom - newRect.top, ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - // Update all the windows after the move or size, including this window. - for ( pwndTemp = pwnd->head.rpdesk->pDeskInfo->spwnd->spwndChild; - pwndTemp; - pwndTemp = pwndTemp->spwndNext ) + hrgnNew = GreCreateRectRgnIndirect(&pwnd->rcWindow); + if (pwnd->hrgnClip != NULL) + NtGdiCombineRgn(hrgnNew, hrgnNew, pwnd->hrgnClip, RGN_AND); + + if (hrgnNew) { - RECTL rect; - // Only the windows that overlap will be redrawn. - if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, &pwndTemp->rcWindow )) + if (hrgnOrig) + NtGdiCombineRgn(hrgnOrig, hrgnOrig, hrgnNew, RGN_DIFF); + } + else + { + if (hrgnOrig) { - co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); + GreDeleteObject(hrgnOrig); + hrgnOrig = 0; } } + + // Update all the windows after the move or size, including this window. + UpdateThreadWindows(UserGetDesktopWindow()->spwndChild, pti, hrgnOrig); + + if (hrgnOrig) GreDeleteObject(hrgnOrig); + if (hrgnNew) GreDeleteObject(hrgnNew); } } sizingRect = newRect; @@ -1163,7 +1179,7 @@ { TempRect = CurrentRect; TempRect.bottom = TempRect.top + menu->cyMenu; - CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE); + if (!(Flags & DC_NOSENDMSG)) CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE); } if (ExStyle & WS_EX_CLIENTEDGE) @@ -1214,7 +1230,7 @@ return 0; // For WM_NCPAINT message, return 0. } -LRESULT NC_HandleNCCalcSize( PWND Wnd, WPARAM wparam, RECTL *Rect ) +LRESULT NC_HandleNCCalcSize( PWND Wnd, WPARAM wparam, RECTL *Rect, BOOL Suspended ) { LRESULT Result = 0; SIZE WindowBorders; @@ -1277,7 +1293,7 @@ CliRect.right -= OrigRect.left; CliRect.left -= OrigRect.left; CliRect.top -= OrigRect.top; - Rect->top += MENU_DrawMenuBar(hDC, &CliRect, Wnd, TRUE); + if (!Suspended) Rect->top += MENU_DrawMenuBar(hDC, &CliRect, Wnd, TRUE); UserReleaseDC(Wnd, hDC, FALSE); } } Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -510,7 +510,7 @@ { HWND hWnd = Wnd->head.h; - if ((Wnd->hrgnUpdate != NULL || Wnd->state & WNDS_INTERNALPAINT)) + if ( Wnd->hrgnUpdate != NULL || Wnd->state & WNDS_INTERNALPAINT ) { if (Wnd->hrgnUpdate) { @@ -1004,6 +1004,106 @@ return TRUE; } +VOID FASTCALL +PaintSuspendedWindow(PWND pwnd, HRGN hrgnOrig) +{ + if (pwnd->hrgnUpdate) + { + HDC hDC; + INT Flags = DC_NC|DC_NOSENDMSG; + HRGN hrgnTemp; + RECT Rect; + INT type; + PREGION prgn; + + if (pwnd->hrgnUpdate > HRGN_WINDOW) + { + hrgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0); + type = NtGdiCombineRgn( hrgnTemp, pwnd->hrgnUpdate, 0, RGN_COPY); + if (type == ERROR) + { + GreDeleteObject(hrgnTemp); + hrgnTemp = HRGN_WINDOW; + } + } + else + { + hrgnTemp = GreCreateRectRgnIndirect(&pwnd->rcWindow); + } + + if ( hrgnOrig && + hrgnTemp > HRGN_WINDOW && + NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnOrig, RGN_AND) == NULLREGION) + { + GreDeleteObject(hrgnTemp); + return; + } + + hDC = UserGetDCEx(pwnd, hrgnTemp, DCX_WINDOW|DCX_INTERSECTRGN|DCX_USESTYLE|DCX_KEEPCLIPRGN); + + Rect = pwnd->rcWindow; + RECTL_vOffsetRect(&Rect, -pwnd->rcWindow.left, -pwnd->rcWindow.top); + + // Clear out client area! + FillRect(hDC, &Rect, IntGetSysColorBrush(COLOR_WINDOW)); + + NC_DoNCPaint(pwnd, hDC, Flags); // Redraw without MENUs. + + UserReleaseDC(pwnd, hDC, FALSE); + + prgn = REGION_LockRgn(hrgnTemp); + IntInvalidateWindows(pwnd, prgn, RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN); + REGION_UnlockRgn(prgn); + + // Set updates for this window. + pwnd->state |= WNDS_SENDNCPAINT|WNDS_SENDERASEBACKGROUND|WNDS_UPDATEDIRTY; + + // DCX_KEEPCLIPRGN is set. Check it anyway. + if (hrgnTemp > HRGN_WINDOW && GreIsHandleValid(hrgnTemp)) GreDeleteObject(hrgnTemp); + } +} + +VOID FASTCALL +UpdateTheadChildren(PWND pWnd, HRGN hRgn) +{ + PaintSuspendedWindow( pWnd, hRgn ); + + if (!(pWnd->style & WS_CLIPCHILDREN)) + return; + + pWnd = pWnd->spwndChild; // invalidate children if any. + while (pWnd) + { + UpdateTheadChildren( pWnd, hRgn ); + pWnd = pWnd->spwndNext; + } +} + +VOID FASTCALL +UpdateThreadWindows(PWND pWnd, PTHREADINFO pti, HRGN hRgn) +{ + PWND pwndTemp; + + for ( pwndTemp = pWnd; + pwndTemp; + pwndTemp = pwndTemp->spwndNext ) + { + if (pwndTemp->head.pti == pti) + { + UserUpdateWindows(pwndTemp, RDW_ALLCHILDREN); + } + else + { + if (IsThreadSuspended(pwndTemp->head.pti)) + { + UpdateTheadChildren(pwndTemp, hRgn); + } + else + UserUpdateWindows(pwndTemp, RDW_ALLCHILDREN); + } + } +} + BOOL FASTCALL IntIsWindowDirty(PWND Wnd) { @@ -1631,7 +1731,7 @@ { if (hrgnTemp) GreDeleteObject(hrgnTemp); NtGdiSetRectRgn(hRgn, 0, 0, 0, 0); - return NULLREGION; + return RegionType; } if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP @@ -1684,9 +1784,23 @@ if (IntIntersectWithParents(Window, pRect)) { - RECTL_vOffsetRect(pRect, - -Window->rcClient.left, - -Window->rcClient.top); + if (Window != UserGetDesktopWindow()) // Window->fnid == FNID_DESKTOP + { + RECTL_vOffsetRect(pRect, + -Window->rcClient.left, + -Window->rcClient.top); + } + if (Window->pcls->style & CS_OWNDC) + { + HDC hdc; + //DWORD layout; + hdc = UserGetDCEx(Window, NULL, DCX_USESTYLE); + //layout = NtGdiSetLayout(hdc, -1, 0); + //IntMapWindowPoints( 0, Window, (LPPOINT)pRect, 2 ); + GreDPtoLP( hdc, (LPPOINT)pRect, 2 ); + //NtGdiSetLayout(hdc, -1, layout); + UserReleaseDC(Window, hdc, FALSE); + } } else { Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -35,4 +35,5 @@ BOOL FASTCALL IntIntersectWithParents(PWND, RECTL *); BOOL FASTCALL IntIsWindowDrawable(PWND); BOOL UserDrawCaption(PWND,HDC,RECTL*,HFONT,HICON,const PUNICODE_STRING,UINT); +VOID FASTCALL UpdateThreadWindows(PWND,PTHREADINFO,HRGN); Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Wed Oct 21 00:13:23 2015 @@ -131,7 +131,7 @@ LRESULT NC_DoNCPaint(PWND,HDC,INT); void FASTCALL NC_GetSysPopupPos(PWND, RECT *); LRESULT NC_HandleNCActivate( PWND Wnd, WPARAM wParam, LPARAM lParam ); -LRESULT NC_HandleNCCalcSize( PWND wnd, WPARAM wparam, RECTL *winRect ); +LRESULT NC_HandleNCCalcSize( PWND wnd, WPARAM wparam, RECTL *winRect, BOOL Suspended ); VOID NC_DrawFrame( HDC hDC, RECT *CurrentRect, BOOL Active, DWORD Style, DWORD ExStyle); VOID UserDrawCaptionBar( PWND pWnd, HDC hDC, INT Flags); void UserGetInsideRectNC(PWND Wnd, RECT *rect);

8 years, 11 months

[hbelusca] 69632: [MSCONFIG_NEW] - Implement the "file extract" dialog and enable it in the general page. The extraction functionality proper will be implemented later on. - Remove an unneeded reso...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 20 23:59:28 2015 New Revision: 69632 URL: http://svn.reactos.org/svn/reactos?rev=69632&view=rev Log: [MSCONFIG_NEW] - Implement the "file extract" dialog and enable it in the general page. The extraction functionality proper will be implemented later on. - Remove an unneeded resource string. CORE-9333 Added: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c (with props) trunk/reactos/base/applications/msconfig_new/fileextractdialog.h (with props) Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/generalpage.c trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc trunk/reactos/base/applications/msconfig_new/lang/en-US.rc trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/resource.h trunk/reactos/base/applications/msconfig_new/srvpage.c Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -14,6 +14,7 @@ # systempage.c # startuppage.c # freeldrpage.c + fileextractdialog.c fileutils.c generalpage.c msconfig.c @@ -30,5 +31,5 @@ add_pch(msconfig_new precomp.h CPP_SOURCE) set_module_type(msconfig_new win32gui UNICODE) target_link_libraries(msconfig_new comsupp) -add_importlibs(msconfig_new user32 advapi32 version comctl32 ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32) +add_importlibs(msconfig_new user32 advapi32 version comctl32 comdlg32 ole32 oleaut32 msxml3 shell32 shlwapi msvcrt kernel32) add_cd_file(TARGET msconfig_new DESTINATION reactos/system32 FOR all) Added: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/fileextractdialog.c (added) +++ trunk/reactos/base/applications/msconfig_new/fileextractdialog.c [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -0,0 +1,258 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/fileextractdialog.c + * PURPOSE: File Extract Dialog + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" + +#include <wingdi.h> +#include <commdlg.h> // It needs stuff defined in wingdi.h ... +#undef LF_FACESIZE // but wingdi.h defines LF_FACESIZE, and if LF_FACESIZE is defined ... +#include <shlobj.h> // shlobj.h wants to define NT_CONSOLE_PROPS which needs COORD structure + // to be declared, this means, including wincon.h in a GUI app!! + // WTF!! I don't want that!! + +// #include <setupapi.h> +#include "fileextractdialog.h" +#include "commctrldefs.h" +#include "utils.h" + +// #include "callbacks.h" + +// FIXME: This should be present in PSDK commdlg.h +// +// FlagsEx Values +#if (_WIN32_WINNT >= 0x0500) +#define OFN_EX_NOPLACESBAR 0x00000001 +#endif // (_WIN32_WINNT >= 0x0500) + + +VOID +AddStringToComboList(HWND hWnd, + LPCWSTR lpszString) +{ + /* Try to find an already existing occurrence of the string in the list */ + LRESULT hPos = ComboBox_FindStringExact(hWnd, -1, lpszString); + + if (hPos == CB_ERR) + { + /* The string doesn't exist, so add it to the list and select it */ + ComboBox_InsertString(hWnd, 0, lpszString); + ComboBox_SetCurSel(hWnd, 0); + } + else + { + /* The string exists, so select it */ + ComboBox_SetCurSel(hWnd, hPos); + } + + return; +} + +INT_PTR CALLBACK +FileExtractDialogWndProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + { + LPWSTR szCabPathFileName; + LPWSTR szFileName; + LPWSTR szDestDir; + + size_t cabPathNum, fileNameNum, destDirNum; + + cabPathNum = GetWindowTextLengthW(GetDlgItem(hDlg, IDC_DRP_CAB_FILE)) + 1; + szCabPathFileName = (LPWSTR)MemAlloc(0, cabPathNum * sizeof(WCHAR)); + GetDlgItemText(hDlg, IDC_DRP_CAB_FILE, szCabPathFileName, (int)cabPathNum); + + fileNameNum = GetWindowTextLengthW(GetDlgItem(hDlg, IDC_TXT_FILE_TO_RESTORE)) + 1; + szFileName = (LPWSTR)MemAlloc(0, fileNameNum * sizeof(WCHAR)); + GetDlgItemText(hDlg, IDC_TXT_FILE_TO_RESTORE, szFileName, (int)fileNameNum); + + destDirNum = GetWindowTextLengthW(GetDlgItem(hDlg, IDC_DRP_DEST_DIR)) + 1; + szDestDir = (LPWSTR)MemAlloc(0, destDirNum * sizeof(WCHAR)); + GetDlgItemText(hDlg, IDC_DRP_DEST_DIR, szDestDir, (int)destDirNum); + +#if 0 + if (!ExtractFromCabinet(szCabPathFileName, szFileName, szDestDir)) + { + MessageBoxW(NULL, L"An error has occurred!!", L"Error", MB_ICONERROR | MB_OK); + } + else + { + MessageBoxW(NULL, L"All the files were uncompressed successfully.", L"Info", MB_ICONINFORMATION | MB_OK); + + // TODO: Save the extraction paths into the registry. + + /* Quit */ + EndDialog(hDlg, LOWORD(wParam)); + } +#else + MessageBoxW(NULL, L"File extraction is unimplemented!", L"Info", MB_ICONINFORMATION | MB_OK); +#endif + + MemFree(szDestDir); + MemFree(szFileName); + MemFree(szCabPathFileName); + + return TRUE; + } + + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + + case IDC_BTN_BROWSE_ALL_FILES: + { + unsigned int nMaxFilesNum = 255; + size_t newSize = (nMaxFilesNum * (MAX_PATH + 1)) + 1; + LPWSTR szPath = (LPWSTR)MemAlloc(HEAP_ZERO_MEMORY, newSize * sizeof(WCHAR)); + OPENFILENAMEW ofn; + + SecureZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hDlg; + ofn.lpstrTitle = L"Files to be restored"; // L"Fichiers à restaurer"; // FIXME: Localize! + ofn.Flags = OFN_ALLOWMULTISELECT | OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_LONGNAMES; + // ofn.FlagsEx = OFN_EX_NOPLACESBAR; + ofn.lpstrFilter = L"All files (*.*)\0*.*\0"; + ofn.nFilterIndex = 0; + ofn.lpstrFile = szPath; + ofn.nMaxFile = (DWORD)newSize; // TODO: size_t to DWORD conversion... + + if (GetSaveFileName(&ofn)) + { + if ( (ofn.Flags & OFN_EXPLORER) && + (ofn.Flags & OFN_ALLOWMULTISELECT) ) // Must be always true... + { + LPWSTR lpszFiles = szPath + ofn.nFileOffset; + LPWSTR lpszFilePatterns = NULL; + + LPWSTR lpszTmp = lpszFiles; + unsigned int n = 0; + size_t numOfChars = 0; + + /* Truncate the path, if needed */ + szPath[ofn.nFileOffset - 1] = L'\0'; + + while (*lpszTmp) + { + ++n; + numOfChars += wcslen(lpszTmp)+1 + 3; // 3 = 2 quotation marks + 1 space. + lpszTmp += wcslen(lpszTmp)+1; + } + + lpszFilePatterns = (LPWSTR)MemAlloc(HEAP_ZERO_MEMORY, numOfChars*sizeof(WCHAR)); + + if (n >= 2) + { + while (*lpszFiles) + { + wcscat(lpszFilePatterns, L"\""); + wcscat(lpszFilePatterns, lpszFiles); + wcscat(lpszFilePatterns, L"\""); + + lpszFiles += wcslen(lpszFiles)+1; + if (*lpszFiles) + wcscat(lpszFilePatterns, L" "); + } + } + else + { + wcscpy(lpszFilePatterns, lpszFiles); + } + + Edit_SetText(GetDlgItem(hDlg, IDC_TXT_FILE_TO_RESTORE), lpszFilePatterns); + AddStringToComboList(GetDlgItem(hDlg, IDC_DRP_DEST_DIR), szPath); + + SetFocus(GetDlgItem(hDlg, IDC_TXT_FILE_TO_RESTORE)); + Edit_SetSel(GetDlgItem(hDlg, IDC_TXT_FILE_TO_RESTORE), 0, -1); + + MemFree(lpszFilePatterns); + } + } + + MemFree(szPath); + + break; + } + + case IDC_BTN_BROWSE_CAB_FILES: + { + OPENFILENAMEW ofn; + WCHAR szPath[MAX_PATH] = L""; + + SecureZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hDlg; + ofn.lpstrTitle = L"Open an archive file"; // L"Ouvrir un fichier archive"; // FIXME: Localize! + ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_HIDEREADONLY | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_READONLY; + // ofn.FlagsEx = OFN_EX_NOPLACESBAR; + ofn.lpstrFilter = L"Cabinet files (*.cab)\0*.cab\0"; + ofn.lpstrDefExt = L"cab"; + ofn.nFilterIndex = 0; + ofn.lpstrFile = szPath; + ofn.nMaxFile = ARRAYSIZE(szPath); + + if (GetOpenFileName(&ofn)) + { + AddStringToComboList(GetDlgItem(hDlg, IDC_DRP_CAB_FILE), szPath); + SetFocus(GetDlgItem(hDlg, IDC_DRP_CAB_FILE)); + } + + break; + } + + case IDC_BTN_BROWSE_DIRS: + { + BROWSEINFOW bi; + WCHAR szPath[MAX_PATH] = L""; + + SecureZeroMemory(&bi, sizeof(bi)); + bi.hwndOwner = hDlg; + bi.pidlRoot = NULL; + bi.lpszTitle = L"Select the directory where the restored files should be stored:"; + // L"Choisissez le répertoire dans lequel doivent être enregistrés les fichiers restaurés :"; // FIXME: Localize! + bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_SHAREABLE | BIF_VALIDATE /* | BIF_BROWSEFILEJUNCTIONS <--- only in Windows 7+ */; + + if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) + { + /*PIDLIST_ABSOLUTE*/ LPITEMIDLIST pidl = SHBrowseForFolderW(&bi); + if (SHGetPathFromIDListW(pidl, szPath)) + { + AddStringToComboList(GetDlgItem(hDlg, IDC_DRP_DEST_DIR), szPath); + SetFocus(GetDlgItem(hDlg, IDC_DRP_DEST_DIR)); + } + + CoTaskMemFree(pidl); + CoUninitialize(); + } + + break; + } + + default: + //break; + return FALSE; + } + } + } + + return FALSE; +} Propchange: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/fileextractdialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/fileextractdialog.h (added) +++ trunk/reactos/base/applications/msconfig_new/fileextractdialog.h [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/fileextractdialog.h + * PURPOSE: File Extract Dialog + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef __FILEEXTRACTDIALOG_H__ +#define __FILEEXTRACTDIALOG_H__ + +INT_PTR CALLBACK +FileExtractDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif // __FILEEXTRACTDIALOG_H__ Propchange: trunk/reactos/base/applications/msconfig_new/fileextractdialog.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -11,13 +11,14 @@ #include "fileutils.h" #include "utils.h" #include "commctrldefs.h" +#include "fileextractdialog.h" static LPCWSTR lpszRestoreProgPath1 = L"%SystemRoot%\\System32\\rstrui.exe"; static LPCWSTR lpszRestoreProgPath2 = L"%SystemRoot%\\System32\\restore\\rstrui.exe"; static HWND hGeneralPage = NULL; static BOOL bIsOriginalBootIni = TRUE; -static BOOL bIsStartupNotModified = TRUE; +// static BOOL bIsStartupNotModified = TRUE; static VOID EnableSelectiveStartupControls(BOOL bEnable) { @@ -142,9 +143,9 @@ break; } - // case IDC_BTN_FILE_EXTRACTION: - // DialogBox(hInst, MAKEINTRESOURCE(IDD_FILE_EXTRACT_DIALOG), hGeneralPage /* GetParent(hGeneralPage) */, FileExtractDialogWndProc); - // break; + case IDC_BTN_FILE_EXTRACTION: + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_FILE_EXTRACT_DIALOG), hGeneralPage /* GetParent(hGeneralPage) */, FileExtractDialogWndProc); + break; default: //break; Modified: trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/bg-BG.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "ÐÑÐºÐ°Ð·", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ÐÑÑÐ½Ð°Ñ" IDS_SERVICES_STATUS_STOPPED "Ð¡Ð¿ÑÑÐ½" - IDS_SERVICES_YES "ÐÐ°" IDS_SERVICES_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐµÐ½" END Modified: trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ca-ES.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "CancelÂ·lar", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Programa de configuracio del sistema" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "En marxa" IDS_SERVICES_STATUS_STOPPED "Parat" - IDS_SERVICES_YES "Si" IDS_SERVICES_UNKNOWN "Indeterminat" END Modified: trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/cs-CZ.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -139,6 +139,25 @@ PUSHBUTTON "Storno", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "NÃ¡stroj pro konfiguraci systÃ©mu" @@ -182,6 +201,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "SpuÅ¡tÄno" IDS_SERVICES_STATUS_STOPPED "Zastaveno" - IDS_SERVICES_YES "Ano" IDS_SERVICES_UNKNOWN "NeznÃ¡mÃ½" END Modified: trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/de-DE.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Abbrechen", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfiguration" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Gestartet" IDS_SERVICES_STATUS_STOPPED "Beendet" - IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Unbekannt" END Modified: trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/el-GR.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "ÎÎºÏÏÏÏÎ·", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Î ÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÎ±ÏÎ±Î¼ÎµÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ÎÎºÏÎµÎ»ÎµÎ¯ÏÎ±Î¹" IDS_SERVICES_STATUS_STOPPED "Î¤ÎµÏÎ¼Î±ÏÎ¯ÏÏÎ·ÎºÎµ" - IDS_SERVICES_YES "ÎÎ±Î¹" IDS_SERVICES_UNKNOWN "ÎÎ³Î½ÏÏÏÎ·" END Modified: trunk/reactos/base/applications/msconfig_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/en-US.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "System Configuration Program" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Running" IDS_SERVICES_STATUS_STOPPED "Stopped" - IDS_SERVICES_YES "Yes" IDS_SERVICES_UNKNOWN "Unknown" END Modified: trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/es-ES.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -136,6 +136,25 @@ PUSHBUTTON "Cancelar", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Utilidad de configuraciÃ³n del sistema" @@ -179,6 +198,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "En ejecuciÃ³n" IDS_SERVICES_STATUS_STOPPED "Detenido" - IDS_SERVICES_YES "SÃ" IDS_SERVICES_UNKNOWN "Desconocido" END Modified: trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/fr-FR.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Annuler", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "DÃ©compression de fichiers Ã partir de la source d'installation" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Indiquez les fichiers que vous voulez restaurer, l'emplacement de la source contenant les fichiers d'installation ainsi que l'emplacement de destination des fichiers.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "&Fichiers Ã restaurerÂ :", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "Parco&urir les fichiers...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restaurer Ã partir de :", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Parcourir &depuis...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Enregistrer les fichiers dansÂ :", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Parcourir &vers...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "DÃ©compresser", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Annuler", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Utilitaire de configuration systÃ¨me" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "En cours d'exÃ©cution" IDS_SERVICES_STATUS_STOPPED "ArrÃªtÃ©" - IDS_SERVICES_YES "Oui" IDS_SERVICES_UNKNOWN "Inconnu" END Modified: trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/he-IL.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "×××××", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "××× ×©××¨××ª ××§×××¢×ª ×ª×¦××¨×ª ×××¢×¨××ª" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "×××¤×¢×" IDS_SERVICES_STATUS_STOPPED "× ×¢×¦×¨" - IDS_SERVICES_YES "××" IDS_SERVICES_UNKNOWN "×× ××××¢" END Modified: trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/hu-HU.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "RendszerkonfigurÃ¡ciÃ¼s segÃ©dprogram" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Fut" IDS_SERVICES_STATUS_STOPPED "LeÃ¡llÃtva" - IDS_SERVICES_YES "Igen" IDS_SERVICES_UNKNOWN "Ismeretlen" END Modified: trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/id-ID.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Batal", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Program konfigurasi sistem" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Berjalan" IDS_SERVICES_STATUS_STOPPED "Dihentikan" - IDS_SERVICES_YES "Ya" IDS_SERVICES_UNKNOWN "Tidak Dikenal" END Modified: trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/it-IT.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Annulla", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "UtilitÃ di configurazione del sistema" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Esecuzione" IDS_SERVICES_STATUS_STOPPED "Interrotto" - IDS_SERVICES_YES "SÃ¬" IDS_SERVICES_UNKNOWN "Sconosciuto" END Modified: trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ko-KR.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "ì·¨ì", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ìì¤í ì¤ì íë¡ê·¸ë¨" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ì¤íì¤" IDS_SERVICES_STATUS_STOPPED "ì ì§ë¨" - IDS_SERVICES_YES "ì" IDS_SERVICES_UNKNOWN "Unknown" END Modified: trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/nl-NL.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Wordt uitgevoerd" IDS_SERVICES_STATUS_STOPPED "Gestopt" - IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Onbekend" END Modified: trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/no-NO.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -133,6 +133,25 @@ PUSHBUTTON "Avbryt", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfigurasjon" @@ -176,6 +195,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "KjÃ¸rer" IDS_SERVICES_STATUS_STOPPED "Stoppet" - IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Ukjent" END Modified: trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/pl-PL.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -141,6 +141,25 @@ PUSHBUTTON "Anuluj", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Program konfiguracji systemu" @@ -184,6 +203,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Uruchomiona" IDS_SERVICES_STATUS_STOPPED "Zatrzymana" - IDS_SERVICES_YES "Tak" IDS_SERVICES_UNKNOWN "Nieznany" END Modified: trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/pt-BR.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "Cancelar", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Programa de configuraÃ§Ã£o do sistema" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Em execuÃ§Ã£o" IDS_SERVICES_STATUS_STOPPED "Parado" - IDS_SERVICES_YES "Sim" IDS_SERVICES_UNKNOWN "Desconhecido" END Modified: trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ro-RO.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "A&nuleazÄ", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Configuratorul de sistem" // "Program de configurare sistem" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Pornit" IDS_SERVICES_STATUS_STOPPED "Oprit" - IDS_SERVICES_YES "Da" IDS_SERVICES_UNKNOWN "Nespecificat" END Modified: trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/ru-RU.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ÐÐ°Ð¿ÑÑÐµÐ½Ð¾" IDS_SERVICES_STATUS_STOPPED "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾" - IDS_SERVICES_YES "ÐÐ°" IDS_SERVICES_UNKNOWN "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹" END Modified: trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sk-SK.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -137,6 +137,25 @@ PUSHBUTTON "ZruÅ¡iÅ¥", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Program na konfigurÃ¡ciu systÃ©mu" @@ -180,6 +199,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "SpustenÃ¡" IDS_SERVICES_STATUS_STOPPED "ZastavenÃ¡" - IDS_SERVICES_YES "Ãno" IDS_SERVICES_UNKNOWN "NeznÃ¡my" END Modified: trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sq-AL.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -137,6 +137,25 @@ PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Programi i konfigurimit te sistemit" @@ -180,6 +199,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Funksional" IDS_SERVICES_STATUS_STOPPED "I'ndaluar" - IDS_SERVICES_YES "Po" IDS_SERVICES_UNKNOWN "I'panjohur" END Modified: trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/sv-SE.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -140,6 +140,25 @@ PUSHBUTTON "Avbryt", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Systemkonfiguration" @@ -183,6 +202,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "KÃ¶rs" IDS_SERVICES_STATUS_STOPPED "Stoppad" - IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "OkÃ¤nt" END Modified: trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/th-TH.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "à¸¢à¸à¹à¸¥à¸´à¸", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "à¹à¸à¸£à¹à¸à¸£à¸¡à¹à¸à¸£à¸à¹à¸à¸à¸£à¸°à¸à¸" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "à¸à¸³à¸¥à¸±à¸à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸" IDS_SERVICES_STATUS_STOPPED "à¸«à¸¢à¸¸à¸à¹à¸¥à¹à¸§" - IDS_SERVICES_YES "à¹à¸à¹" IDS_SERVICES_UNKNOWN "à¹à¸¡à¹à¸à¸£à¸²à¸" END Modified: trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/tr-TR.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "Ä°ptal", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "Dizge YapÄ±landÄ±rma Ä°zlencesi" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ÃalÄ±ÅÄ±yor" IDS_SERVICES_STATUS_STOPPED "Durduruldu" - IDS_SERVICES_YES "Evet" IDS_SERVICES_UNKNOWN "Bilinmeyen" END Modified: trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/uk-UA.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -141,6 +141,25 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ÐÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸" @@ -184,6 +203,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "ÐÑÐ°ÑÑÑ" IDS_SERVICES_STATUS_STOPPED "ÐÑÐ¿Ð¸Ð½ÐµÐ½Ð°" - IDS_SERVICES_YES "Ð¢Ð°Ðº" IDS_SERVICES_UNKNOWN "ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð¾" END Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/zh-CN.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "åæ¶", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ç³»ç»éç½®å®ç¨ç¨åº" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "æ£å¨è¿è¡" IDS_SERVICES_STATUS_STOPPED "å·²åæ¢" - IDS_SERVICES_YES "æ¯" IDS_SERVICES_UNKNOWN "æªç¥" END Modified: trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/lang/zh-TW.rc [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -135,6 +135,25 @@ PUSHBUTTON "åæ¶", IDC_CANCEL, 100, 160, 50, 12 END +IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Expand Files from an Installation Source" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 + LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 + EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL + PUSHBUTTON "&Browse Files...", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 + LTEXT "&Restore from:", IDC_STATIC, 7, 55, 93, 10 + COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &From...", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + LTEXT "&Save files in:", IDC_STATIC, 7, 76, 93, 10 + COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse &To...", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 + DEFPUSHBUTTON "Expand", IDOK, 179, 96, 82, 14 + PUSHBUTTON "Cancel", IDCANCEL, 264, 96, 82, 14 +END + STRINGTABLE BEGIN IDS_MSCONFIG "ç³»çµ±è¨å®" @@ -178,6 +197,5 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "å·è¡ä¸" IDS_SERVICES_STATUS_STOPPED "å·²åæ¢" - IDS_SERVICES_YES "æ¯" IDS_SERVICES_UNKNOWN "æªç¥" END Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -126,7 +126,7 @@ switch (LOWORD(wParam) /*GET_WM_COMMAND_ID(wParam, lParam)*/) { case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_ABOUTBOX), hWnd, About); // break; return TRUE; } @@ -140,7 +140,7 @@ switch (LOWORD(wParam) /*GET_WM_COMMAND_ID(wParam, lParam)*/) { case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About); + DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_ABOUTBOX), hWnd, About); // break; return TRUE; } Modified: trunk/reactos/base/applications/msconfig_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -13,9 +13,6 @@ #define IDD_SYSTEM_PAGE 107 #define IDD_FREELDR_ADVANCED_PAGE 108 -#define IDC_TAB 1001 -#define IDC_BTN_APPLY 1002 -#define IDC_BTN_HELP 1003 #define IDC_SERVICES_LIST 1006 #define IDC_STARTUP_LIST 1008 #define IDC_BTN_SERVICES_ACTIVATE 1009 @@ -43,6 +40,15 @@ #define IDS_TOOLS_COLUMN_NAME 2010 #define IDS_TOOLS_COLUMN_DESCR 2011 #define IDS_TOOLS_COLUMN_STANDARD 2006 + +/* File extract dialog */ +#define IDD_FILE_EXTRACT_DIALOG 1500 +#define IDC_BTN_BROWSE_ALL_FILES 1501 +#define IDC_BTN_BROWSE_CAB_FILES 1502 +#define IDC_BTN_BROWSE_DIRS 1503 +#define IDC_TXT_FILE_TO_RESTORE 1504 +#define IDC_DRP_CAB_FILE 1505 +#define IDC_DRP_DEST_DIR 1506 #define IDC_LIST_BOX 1019 #define IDC_BTN_CHECK_BOOT_PATH 1020 @@ -101,7 +107,6 @@ #define IDS_SERVICES_STATUS_STOPPED 2200 #define IDS_SERVICES_STATUS_RUNNING 2201 -#define IDS_SERVICES_YES 2202 #define IDS_SERVICES_UNKNOWN 2203 Modified: trunk/reactos/base/applications/msconfig_new/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.c [iso-8859-1] Tue Oct 20 23:59:28 2015 @@ -192,7 +192,7 @@ { if (pServiceFailureActions->cActions && pServiceFailureActions->lpsaActions[0].Type == SC_ACTION_REBOOT) { - LoadString(hInst, IDS_SERVICES_YES, szStatus, 128); + LoadString(hInst, IDS_YES, szStatus, 128); item.pszText = szStatus; item.iSubItem = 1; SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);

8 years, 11 months

[hbelusca] 69631: [PSDK] - Enable the specstrings.h in shlwapi header (since we have it) - Add missing BIF_SHAREABLE define (which exists in the 2k3 PSDK), even if it's not used at all in our code ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 20 22:49:34 2015 New Revision: 69631 URL: http://svn.reactos.org/svn/reactos?rev=69631&view=rev Log: [PSDK] - Enable the specstrings.h in shlwapi header (since we have it) - Add missing BIF_SHAREABLE define (which exists in the 2k3 PSDK), even if it's not used at all in our code (and in wine either); I use it in msconfig for a shell browse dialog (because I want it to behave as I expect also on windows). Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shlwapi.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Tue Oct 20 22:49:34 2015 @@ -968,6 +968,7 @@ #define BIF_BROWSEFORCOMPUTER 0x1000 #define BIF_BROWSEFORPRINTER 0x2000 #define BIF_BROWSEINCLUDEFILES 0x4000 +#define BIF_SHAREABLE 0x8000 /* message from browser */ #define BFFM_INITIALIZED 1 Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Tue Oct 20 22:49:34 2015 @@ -21,7 +21,7 @@ #ifndef __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H -/* FIXME: #include <specstrings.h> */ +#include <specstrings.h> #include <objbase.h> #include <shtypes.h>

8 years, 11 months

[hbelusca] 69630: [MSCONFIG_NEW] - Add some file utility functions, they will be used later for managing the startup programs. - Half-plement the general page controls. - Simplify some code; fix fi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 20 21:57:36 2015 New Revision: 69630 URL: http://svn.reactos.org/svn/reactos?rev=69630&view=rev Log: [MSCONFIG_NEW] - Add some file utility functions, they will be used later for managing the startup programs. - Half-plement the general page controls. - Simplify some code; fix file headers; remove the old toolspage.c (replaced by its c++ equivalent). CORE-9333 Added: trunk/reactos/base/applications/msconfig_new/fileutils.c (with props) trunk/reactos/base/applications/msconfig_new/fileutils.h (with props) Removed: trunk/reactos/base/applications/msconfig_new/toolspage.c Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/generalpage.c trunk/reactos/base/applications/msconfig_new/generalpage.h trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/toolspage.cpp trunk/reactos/base/applications/msconfig_new/toolspage.h trunk/reactos/base/applications/msconfig_new/utils.c trunk/reactos/base/applications/msconfig_new/utils.h Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -10,11 +10,11 @@ list(APPEND C_SOURCE comctl32ex/listviewfuncs.c - # toolspage.c # srvpage.c # systempage.c # startuppage.c # freeldrpage.c + fileutils.c generalpage.c msconfig.c stringutils.c Added: trunk/reactos/base/applications/msconfig_new/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/fileutils.c (added) +++ trunk/reactos/base/applications/msconfig_new/fileutils.c [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -0,0 +1,90 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/fileutils.c + * PURPOSE: File Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" +#include "utils.h" +#include "fileutils.h" + +// +// NOTE: A function called "FileExists" with the very same prototype +// already exists in the PSDK headers (in setupapi.h) +// +BOOL +MyFileExists(IN LPCWSTR lpszFilePath, + OUT PWIN32_FIND_DATAW pFindData OPTIONAL) +{ + BOOL bIsFound = FALSE; + WIN32_FIND_DATAW find_data; + + DWORD dwNumOfChars; + LPWSTR lpszCmdLine; + HANDLE search; + + dwNumOfChars = ExpandEnvironmentStringsW(lpszFilePath, NULL, 0); + lpszCmdLine = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR)); + ExpandEnvironmentStringsW(lpszFilePath, lpszCmdLine, dwNumOfChars); + + search = FindFirstFileW(lpszCmdLine, &find_data); + MemFree(lpszCmdLine); + + bIsFound = (search != INVALID_HANDLE_VALUE); + + FindClose(search); + + if (bIsFound && pFindData) + *pFindData = find_data; + + return bIsFound; +} + +LRESULT +FileQueryFiles(IN LPCWSTR Path, + IN LPCWSTR FileNamesQuery, + IN PQUERY_FILES_TABLE QueryTable, + IN PVOID Context) +{ + LRESULT res = ERROR_SUCCESS; + WIN32_FIND_DATAW find_data; + + LPWSTR lpszQuery; + DWORD dwNumOfChars; + LPWSTR lpszExpandedQuery; + HANDLE search; + + lpszQuery = (LPWSTR)MemAlloc(0, (wcslen(Path) + 1 + wcslen(FileNamesQuery) + 1) * sizeof(WCHAR)); + wcscpy(lpszQuery, Path); + wcscat(lpszQuery, L"\\"); + wcscat(lpszQuery, FileNamesQuery); + + dwNumOfChars = ExpandEnvironmentStringsW(lpszQuery, NULL, 0); + lpszExpandedQuery = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR)); + ExpandEnvironmentStringsW(lpszQuery, lpszExpandedQuery, dwNumOfChars); + MemFree(lpszQuery); + + search = FindFirstFileW(lpszExpandedQuery, &find_data); + if (search != INVALID_HANDLE_VALUE) + { + do + { + PQUERY_FILES_TABLE pTable = QueryTable; + while (pTable && pTable->QueryRoutine) + { + pTable->QueryRoutine(Path, FileNamesQuery, lpszExpandedQuery, &find_data, Context, pTable->EntryContext); + ++pTable; + } + } while (/*res = */ FindNextFileW(search, &find_data)); + } + else + res = ERROR_NO_MORE_FILES; + + FindClose(search); + + MemFree(lpszExpandedQuery); + + return res; +} Propchange: trunk/reactos/base/applications/msconfig_new/fileutils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/fileutils.h (added) +++ trunk/reactos/base/applications/msconfig_new/fileutils.h [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -0,0 +1,62 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/fileutils.h + * PURPOSE: File Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef __FILEUTILS_H__ +#define __FILEUTILS_H__ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +// +// NOTE: A function called "FileExists" with the very same prototype +// already exists in the PSDK headers (in setupapi.h) +// +BOOL +MyFileExists(IN LPCWSTR lpszFilePath, + OUT PWIN32_FIND_DATAW pFindData OPTIONAL); + +//////////////////////////////////////////////////////////////////////////////// +typedef LRESULT +(*PQUERY_FILES_TABLE_ROUTINE)(IN LPCWSTR Path, + IN LPCWSTR FileNamesQuery, + IN LPCWSTR ExpandedFileNamesQuery, + IN PWIN32_FIND_DATAW pfind_data, + IN PVOID Context, + IN PVOID EntryContext); + +#define QUERY_FILES_TABLE_ROUTINE(fnName) \ + LRESULT (fnName)(IN LPCWSTR Path, \ + IN LPCWSTR FileNamesQuery, \ + IN LPCWSTR ExpandedFileNamesQuery, \ + IN PWIN32_FIND_DATAW pfind_data, \ + IN PVOID Context, \ + IN PVOID EntryContext) + +typedef struct __tagQUERY_FILES_TABLE +{ + PQUERY_FILES_TABLE_ROUTINE QueryRoutine; + PVOID EntryContext; + // Other fields ? +} QUERY_FILES_TABLE, *PQUERY_FILES_TABLE; + +LRESULT +FileQueryFiles(IN LPCWSTR Path, + IN LPCWSTR FileNamesQuery, + IN PQUERY_FILES_TABLE QueryTable, + IN PVOID Context); + +//////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __FILEUTILS_H__ Propchange: trunk/reactos/base/applications/msconfig_new/fileutils.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -4,17 +4,21 @@ * FILE: base/applications/msconfig_new/generalpage.c * PURPOSE: General page message handler * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> - * + * Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */ #include "precomp.h" - -// static LPCWSTR lpszRestoreProgPath1 = L"%SystemRoot%\\System32\\rstrui.exe"; -// static LPCWSTR lpszRestoreProgPath2 = L"%SystemRoot%\\System32\\restore\\rstrui.exe"; - -HWND hGeneralPage; - -#if 0 // TODO: Will be used later on... +#include "fileutils.h" +#include "utils.h" +#include "commctrldefs.h" + +static LPCWSTR lpszRestoreProgPath1 = L"%SystemRoot%\\System32\\rstrui.exe"; +static LPCWSTR lpszRestoreProgPath2 = L"%SystemRoot%\\System32\\restore\\rstrui.exe"; + +static HWND hGeneralPage = NULL; +static BOOL bIsOriginalBootIni = TRUE; +static BOOL bIsStartupNotModified = TRUE; + static VOID EnableSelectiveStartupControls(BOOL bEnable) { assert(hGeneralPage); @@ -45,7 +49,6 @@ return; } -#endif INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -57,7 +60,14 @@ case WM_INITDIALOG: { hGeneralPage = hDlg; - PropSheet_UnChanged(hMainWnd, hGeneralPage); + PropSheet_UnChanged(GetParent(hGeneralPage), hGeneralPage); + + /* Search for the restore program and enable its button if needed */ + if ( MyFileExists(lpszRestoreProgPath1, NULL) || + MyFileExists(lpszRestoreProgPath2, NULL) ) + Button_Enable(GetDlgItem(hGeneralPage, IDC_BTN_SYSTEM_RESTORE_START), TRUE); + else + Button_Enable(GetDlgItem(hGeneralPage, IDC_BTN_SYSTEM_RESTORE_START), FALSE); #if 0 /* FIXME */ @@ -67,6 +77,141 @@ return TRUE; } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_RB_NORMAL_STARTUP: + { + /* Be sure that only this button is activated and the others are not */ + CheckRadioButton(hGeneralPage, IDC_RB_NORMAL_STARTUP, IDC_RB_SELECTIVE_STARTUP, IDC_RB_NORMAL_STARTUP); + + bIsOriginalBootIni = TRUE; + EnableSelectiveStartupControls(FALSE); + CheckSelectiveStartupControls(TRUE); + + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_USE_ORIGINAL_BOOTCFG), (bIsOriginalBootIni ? BST_CHECKED : BST_UNCHECKED)); + + PropSheet_Changed(GetParent(hGeneralPage), hGeneralPage); + break; + } + + case IDC_RB_DIAGNOSTIC_STARTUP: + { + /* Be sure that only this button is activated and the others are not */ + CheckRadioButton(hGeneralPage, IDC_RB_NORMAL_STARTUP, IDC_RB_SELECTIVE_STARTUP, IDC_RB_DIAGNOSTIC_STARTUP); + + EnableSelectiveStartupControls(FALSE); + CheckSelectiveStartupControls(FALSE); + + PropSheet_Changed(GetParent(hGeneralPage), hGeneralPage); + break; + } + + case IDC_RB_SELECTIVE_STARTUP: + { + /* Be sure that only this button is activated and the others are not */ + CheckRadioButton(hGeneralPage, IDC_RB_NORMAL_STARTUP, IDC_RB_SELECTIVE_STARTUP, IDC_RB_SELECTIVE_STARTUP); + + EnableSelectiveStartupControls(TRUE); + PropSheet_Changed(GetParent(hGeneralPage), hGeneralPage); + + break; + } + + case IDC_CBX_USE_ORIGINAL_BOOTCFG: + { + bIsOriginalBootIni = TRUE; + + Button_SetCheck(GetDlgItem(hGeneralPage, IDC_CBX_USE_ORIGINAL_BOOTCFG), (bIsOriginalBootIni ? BST_CHECKED : BST_UNCHECKED)); + EnableWindow(GetDlgItem(hGeneralPage, IDC_CBX_USE_ORIGINAL_BOOTCFG), !bIsOriginalBootIni /*FALSE*/); + + PropSheet_Changed(GetParent(hGeneralPage), hGeneralPage); + + break; + } + + case IDC_BTN_SYSTEM_RESTORE_START: + { + // NOTE: 'err' variable defined for debugging purposes only. + DWORD err = RunCommand(lpszRestoreProgPath1, NULL, SW_SHOW); + if (err == ERROR_FILE_NOT_FOUND) + err = RunCommand(lpszRestoreProgPath2, NULL, SW_SHOW); + + break; + } + + // case IDC_BTN_FILE_EXTRACTION: + // DialogBox(hInst, MAKEINTRESOURCE(IDD_FILE_EXTRACT_DIALOG), hGeneralPage /* GetParent(hGeneralPage) */, FileExtractDialogWndProc); + // break; + + default: + //break; + return FALSE; + } + break; + } + + case WM_NOTIFY: + { + switch (((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + { + // TODO: Try to apply the modifications to the system. + PropSheet_UnChanged(GetParent(hGeneralPage), hGeneralPage); + return TRUE; + } + + case PSN_HELP: + { + MessageBoxW(hGeneralPage, L"Help not implemented yet!", L"Help", MB_ICONINFORMATION | MB_OK); + return TRUE; + } + + case PSN_KILLACTIVE: // Is going to lose activation. + { + // Changes are always valid of course. + SetWindowLongPtr(hGeneralPage, DWLP_MSGRESULT, FALSE); + return TRUE; + } + + case PSN_QUERYCANCEL: + { + // Allows cancellation. + SetWindowLongPtr(hGeneralPage, DWLP_MSGRESULT, FALSE); + return TRUE; + } + + case PSN_QUERYINITIALFOCUS: + { + // SetWindowLongPtr(hGeneralPage, DWLP_MSGRESULT, + // (LONG_PTR)GetDlgItem(hGeneralPage, (bIsOriginalBootIni ? IDC_RB_NORMAL_STARTUP : IDC_RB_SELECTIVE_STARTUP))); + return TRUE; + } + + // + // DO NOT TOUCH THESE NEXT MESSAGES, THEY ARE OK LIKE THIS... + // + case PSN_RESET: // Perform final cleaning, called before WM_DESTROY. + return TRUE; + + case PSN_SETACTIVE: // Is going to gain activation. + { + SetWindowLongPtr(hGeneralPage, DWLP_MSGRESULT, 0); + return TRUE; + } + + default: + break; + } + + return FALSE; + } + + default: + return FALSE; } return FALSE; Modified: trunk/reactos/base/applications/msconfig_new/generalpage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/generalpage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/generalpage.h [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -1,7 +1,14 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/generalpage.c + * PURPOSE: General page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + #ifndef _GENERALPAGE_H_ #define _GENERALPAGE_H_ - -extern HWND hGeneralPage; INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -116,7 +116,7 @@ } -/* Message handler for dialog box. */ +/* Message handler for dialog box */ LRESULT CALLBACK MainWndProc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { switch (uMessage) Removed: trunk/reactos/base/applications/msconfig_new/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.c (removed) @@ -1,189 +0,0 @@ -/* - * PROJECT: ReactOS Applications - * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/toolspage.c - * PURPOSE: Tools page message handler - * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> - * - */ - -#include "precomp.h" - -#include <shlwapi.h> - -HWND hToolsPage; -HWND hToolsListCtrl; -HWND hToolsDialog; - -void AddItem ( DWORD, DWORD, DWORD, DWORD, int ); -void FillListView ( void ); - -DWORD ListItems_Cmds[20]; -DWORD ListItems_Params[20]; -DWORD ListItems_Locations[20]; - -void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id, int csidl ) { - TCHAR szTemp[256]; - LV_ITEM item; - - LoadString(hInst, name_id, szTemp, 256); - memset(&item, 0, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT; - item.iImage = 0; - item.pszText = szTemp; - item.iItem = ListView_GetItemCount(hToolsListCtrl); - item.lParam = 0; - (void)ListView_InsertItem(hToolsListCtrl, &item); - - ListItems_Cmds[item.iItem] = cmd_id; - ListItems_Params[item.iItem] = param_id; - ListItems_Locations[item.iItem] = csidl; - - LoadString(hInst, descr_id, szTemp, 256); - item.pszText = szTemp; - item.iSubItem = 1; - SendMessage(hToolsListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); -} - -void FillListView ( void ) { - AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM, CSIDL_SYSTEM); - AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM, CSIDL_WINDOWS); - AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM, CSIDL_SYSTEM); - AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM, CSIDL_SYSTEM); -} - -INT_PTR CALLBACK -ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - LV_COLUMN column; - TCHAR szTemp[MAX_PATH*2]; - TCHAR szTemp2[256]; - TCHAR * Ptr = NULL; - LPNMITEMACTIVATE lpnmitem; - LPNMHDR nmh; - DWORD dwStyle; - PROCESS_INFORMATION pi; - STARTUPINFO si; - - switch (message) - { - case WM_INITDIALOG: - { - hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); - hToolsDialog = hDlg; - - dwStyle = (DWORD) SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - dwStyle = dwStyle | LVS_EX_FULLROWSELECT; - SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - - // Initialize the application page's controls - column.mask = LVCF_TEXT | LVCF_WIDTH; - - LoadString(hInst, IDS_TOOLS_COLUMN_NAME, szTemp, 256); - column.pszText = szTemp; - column.cx = 150; - (void)ListView_InsertColumn(hToolsListCtrl, 0, &column); - - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_TOOLS_COLUMN_DESCR, szTemp, 256); - column.pszText = szTemp; - column.cx = 500; - (void)ListView_InsertColumn(hToolsListCtrl, 1, &column); - - FillListView(); - return TRUE; - } - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_BTN_RUN: - { - if (ListView_GetSelectionMark(hToolsListCtrl) != -1) - { - if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) - Ptr = PathAddBackslash(szTemp); - - if (!Ptr) - Ptr = szTemp; - - szTemp2[0] = _T('\0'); - LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], Ptr, 256); - LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); - if (_tcslen(szTemp2)) - { - _tcscat(szTemp, _T(" ")); - _tcscat(Ptr, szTemp2); - } - ZeroMemory(&si, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - } - } - } - } - break; - } - case WM_NOTIFY: - { - nmh = (LPNMHDR) lParam; - if (nmh->hwndFrom == hToolsListCtrl) - { - switch (nmh->code) - { - case LVN_ITEMCHANGED: - { - lpnmitem = (LPNMITEMACTIVATE) lParam; - if (lpnmitem->iItem > -1) - { - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); - szTemp2[0] = _T('\0'); - LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - _tcscat(szTemp, _T(" ")); - _tcscat(szTemp, szTemp2); - SendDlgItemMessage(hToolsDialog, IDC_TOOLS_CMDLINE, WM_SETTEXT, 0, (LPARAM) szTemp); - } - break; - } - case NM_DBLCLK: - { - lpnmitem = (LPNMITEMACTIVATE) lParam; - if (lpnmitem->iItem > -1) - { - if (SHGetSpecialFolderPath(NULL, szTemp, ListItems_Locations[ListView_GetSelectionMark(hToolsListCtrl)], FALSE)) - Ptr = PathAddBackslash(szTemp); - - if (!Ptr) - Ptr = szTemp; - - szTemp2[0] = _T('\0'); - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], Ptr, 256); - LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - if (_tcslen(szTemp2)) - { - _tcscat(szTemp, _T(" ")); - _tcscat(Ptr, szTemp2); - } - ZeroMemory(&si, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - if (CreateProcess(NULL, szTemp, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - CloseHandle(pi.hThread); - CloseHandle(pi.hProcess); - } - } - break; - } - } - } - } - break; - } - return 0; -} - Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -16,7 +16,7 @@ static HWND hToolsListCtrl = NULL; static int iSortedColumn = 0; -typedef struct TOOL +struct TOOL { TOOL(const _bstr_t& Command, const _bstr_t& DefParam, @@ -37,8 +37,7 @@ _bstr_t m_Command; _bstr_t m_DefParam; _bstr_t m_AdvParam; - -} *PTOOL; +}; static void AddTool(IXMLDOMElement*, BOOL); @@ -120,7 +119,7 @@ } static void -AddItem(BOOL bIsStandard, const _bstr_t& name, const _bstr_t& descr, PTOOL tool) +AddItem(BOOL bIsStandard, const _bstr_t& name, const _bstr_t& descr, TOOL* tool) { LPTSTR lpszStandard; LVITEM item = {}; @@ -155,7 +154,7 @@ static void AddTool(IXMLDOMElement* pXMLTool, BOOL bIsStandard) { - PTOOL tool; + TOOL* tool; _variant_t varLocID, varName, varPath, varDefOpt, varAdvOpt, varHelp; @@ -234,7 +233,7 @@ static void Update_States(int iSelectedItem) { - PTOOL tool; + TOOL* tool; LVITEM item = {}; assert(hToolsPage); @@ -246,7 +245,7 @@ { LPTSTR lpszCmdLine = NULL; size_t numOfChars = 0; - tool = reinterpret_cast<PTOOL>(item.lParam); + tool = reinterpret_cast<TOOL*>(item.lParam); ListView_EnsureVisible(hToolsListCtrl, item.iItem, FALSE); @@ -308,7 +307,7 @@ bUseAdvParams = FALSE; // Values greater (strictly) than 32 indicate success (see MSDN documentation for ShellExecute(...) API). - bRetVal = (reinterpret_cast<PTOOL>(item.lParam)->Run(bUseAdvParams) > 32); + bRetVal = (reinterpret_cast<TOOL*>(item.lParam)->Run(bUseAdvParams) > 32); } return bRetVal; @@ -386,7 +385,7 @@ ListView_GetItem(hToolsListCtrl, &lvitem); - delete reinterpret_cast<PTOOL>(lvitem.lParam); + delete reinterpret_cast<TOOL*>(lvitem.lParam); lvitem.lParam = NULL; } ListView_DeleteAllItems(hToolsListCtrl); @@ -418,16 +417,16 @@ case WM_NOTIFY: { - if (reinterpret_cast<LPNMHDR>(lParam)->hwndFrom == hToolsListCtrl) + if (((LPNMHDR)lParam)->hwndFrom == hToolsListCtrl) { - switch (reinterpret_cast<LPNMHDR>(lParam)->code) + switch (((LPNMHDR)lParam)->code) { case LVN_ITEMCHANGED: { - if ( (reinterpret_cast<LPNMLISTVIEW>(lParam)->uChanged & LVIF_STATE) && /* The state has changed */ - (reinterpret_cast<LPNMLISTVIEW>(lParam)->uNewState & LVIS_SELECTED) /* The item has been (de)selected */ ) + if ( (((LPNMLISTVIEW)lParam)->uChanged & LVIF_STATE) && /* The state has changed */ + (((LPNMLISTVIEW)lParam)->uNewState & LVIS_SELECTED) /* The item has been (de)selected */ ) { - Update_States(reinterpret_cast<LPNMLISTVIEW>(lParam)->iItem); + Update_States(((LPNMLISTVIEW)lParam)->iItem); } return TRUE; @@ -442,7 +441,7 @@ case LVN_COLUMNCLICK: { - int iSortingColumn = reinterpret_cast<LPNMLISTVIEW>(lParam)->iSubItem; + int iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem; ListView_SortEx(hToolsListCtrl, iSortingColumn, iSortedColumn); iSortedColumn = iSortingColumn; @@ -456,7 +455,7 @@ } else { - switch (reinterpret_cast<LPNMHDR>(lParam)->code) + switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: { @@ -469,7 +468,7 @@ case PSN_HELP: { - MessageBox(hToolsPage, _T("Help not implemented yet!"), _T("Help"), MB_ICONINFORMATION | MB_OK); + MessageBoxW(hToolsPage, L"Help not implemented yet!", L"Help", MB_ICONINFORMATION | MB_OK); return TRUE; } Modified: trunk/reactos/base/applications/msconfig_new/toolspage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.h [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/toolspage.cpp + * FILE: base/applications/msconfig_new/toolspage.h * PURPOSE: Tools page message handler * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> * Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> Modified: trunk/reactos/base/applications/msconfig_new/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.c [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/utils.c + * PURPOSE: Memory Management, Resources, ... Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + #include "precomp.h" #include "utils.h" #include "stringutils.h" Modified: trunk/reactos/base/applications/msconfig_new/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/utils.h [iso-8859-1] Tue Oct 20 21:57:36 2015 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/utils.c + * PURPOSE: Memory Management, Resources, ... Utility Functions + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + #ifndef __UTILS_H__ #define __UTILS_H__

8 years, 11 months

[tfaber] 69629: [SERVICES] - Sanitize allocation lifetime and fix memory leaks in ScmConvertToBootPathName. CID 1102363 - Fix leak in failure case of REnumServicesStatusExA. CID 716334

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 20 10:09:59 2015 New Revision: 69629 URL: http://svn.reactos.org/svn/reactos?rev=69629&view=rev Log: [SERVICES] - Sanitize allocation lifetime and fix memory leaks in ScmConvertToBootPathName. CID 1102363 - Fix leak in failure case of REnumServicesStatusExA. CID 716334 Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Oct 20 10:09:59 2015 @@ -505,16 +505,20 @@ if (!Expanded) { DPRINT("Error allocating memory for boot driver name!\n"); + RtlFreeUnicodeString(&NtPathName); return ERROR_NOT_ENOUGH_MEMORY; } ExpandedLen = NtPathName.Length / sizeof(WCHAR); wcsncpy(Expanded, NtPathName.Buffer, ExpandedLen); Expanded[ExpandedLen] = UNICODE_NULL; + RtlFreeUnicodeString(&NtPathName); if (ServiceNameLen > ExpandedLen && !_wcsnicmp(Expanded, CanonName, ExpandedLen)) { + HeapFree(GetProcessHeap(), 0, Expanded); + /* Only \SystemRoot\ is missing */ *RelativeName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -522,16 +526,17 @@ if (*RelativeName == NULL) { DPRINT("Error allocating memory for boot driver name!\n"); - HeapFree(GetProcessHeap(), 0, Expanded); return ERROR_NOT_ENOUGH_MEMORY; } wcscpy(*RelativeName, L"\\SystemRoot\\"); wcscat(*RelativeName, CanonName + ExpandedLen); - RtlFreeUnicodeString(&NtPathName); return ERROR_SUCCESS; } + + /* No longer need this */ + HeapFree(GetProcessHeap(), 0, Expanded); /* The most complex case starts here */ RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot"); @@ -543,24 +548,20 @@ /* Open this symlink */ Status = NtOpenSymbolicLinkObject(&SymbolicLinkHandle, SYMBOLIC_LINK_QUERY, &ObjectAttributes); - if (NT_SUCCESS(Status)) { - LinkTarget.Length = 0; - LinkTarget.MaximumLength = 0; - DPRINT("Opened symbolic link object\n"); + RtlInitEmptyUnicodeString(&LinkTarget, NULL, 0); Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) { /* Check if required buffer size is sane */ - if (BufferSize > 0xFFFD) + if (BufferSize > UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL)) { DPRINT("Too large buffer required\n"); - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); + NtClose(SymbolicLinkHandle); return ERROR_NOT_ENOUGH_MEMORY; } @@ -573,13 +574,13 @@ if (!LinkTarget.Buffer) { DPRINT("Unable to alloc buffer\n"); - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); + NtClose(SymbolicLinkHandle); return ERROR_NOT_ENOUGH_MEMORY; } /* Do a real query now */ Status = NtQuerySymbolicLinkObject(SymbolicLinkHandle, &LinkTarget, &BufferSize); + NtClose(SymbolicLinkHandle); if (NT_SUCCESS(Status)) { DPRINT("LinkTarget: %wZ\n", &LinkTarget); @@ -595,9 +596,6 @@ if (*RelativeName == NULL) { DPRINT("Unable to alloc buffer\n"); - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); - RtlFreeUnicodeString(&NtPathName); return ERROR_NOT_ENOUGH_MEMORY; } @@ -605,38 +603,25 @@ with SystemRoot */ wcscpy(*RelativeName, L"\\SystemRoot\\"); wcscat(*RelativeName, CanonName+ExpandedLen+1); - - /* Cleanup */ - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); - RtlFreeUnicodeString(&NtPathName); /* Return success */ return ERROR_SUCCESS; } else { - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); - RtlFreeUnicodeString(&NtPathName); return ERROR_INVALID_PARAMETER; } } else { DPRINT("Error, Status = %08X\n", Status); - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); - RtlFreeUnicodeString(&NtPathName); return ERROR_INVALID_PARAMETER; } } else { DPRINT("Error, Status = %08X\n", Status); - if (SymbolicLinkHandle) NtClose(SymbolicLinkHandle); - HeapFree(GetProcessHeap(), 0, Expanded); - RtlFreeUnicodeString(&NtPathName); + NtClose(SymbolicLinkHandle); return ERROR_INVALID_PARAMETER; } } @@ -644,7 +629,6 @@ { /* Failure */ DPRINT("Error, Status = %08X\n", Status); - HeapFree(GetProcessHeap(), 0, Expanded); return ERROR_INVALID_PARAMETER; } } @@ -5897,7 +5881,8 @@ if (!pszGroupNameW) { DPRINT("Failed to allocate buffer!\n"); - return ERROR_NOT_ENOUGH_MEMORY; + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto Done; } MultiByteToWideChar(CP_ACP, @@ -5914,7 +5899,8 @@ if (!lpStatusPtrW) { DPRINT("Failed to allocate buffer!\n"); - return ERROR_NOT_ENOUGH_MEMORY; + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto Done; } }

8 years, 11 months

[tfaber] 69628: [WORDPAD] - Fix potential buffer overflows. CID 713265, 713266

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 20 08:40:29 2015 New Revision: 69628 URL: http://svn.reactos.org/svn/reactos?rev=69628&view=rev Log: [WORDPAD] - Fix potential buffer overflows. CID 713265, 713266 Modified: trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Tue Oct 20 08:40:29 2015 @@ -156,9 +156,9 @@ { LPWSTR pos_basename; LPWSTR truncpos1, truncpos2; - WCHAR myDocs[MAX_STRING_LEN]; - - SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, (LPWSTR)&myDocs); + WCHAR myDocs[MAX_PATH]; + + SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, myDocs); pos_basename = file_basename(file); truncpos1 = NULL; truncpos2 = NULL; Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Tue Oct 20 08:40:29 2015 @@ -1229,7 +1229,7 @@ if (pFr->lpstrFindWhat != custom_data->findBuffer) { lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, - sizeof(custom_data->findBuffer)); + _countof(custom_data->findBuffer)); pFr->lpstrFindWhat = custom_data->findBuffer; }

8 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015