Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 74403: [USER32] Fix heap corruption in EnumDisplaySettingsExA/W: - Do not overwrite the user-provided buffer size in dmDriverExtra - Fix broken pointer arithmetic CORE-13097
by tfaber＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: tfaber Date: Mon Apr 24 15:04:00 2017 New Revision: 74403 URL: http://svn.reactos.org/svn/reactos?rev=74403&view=rev Log: [USER32] Fix heap corruption in EnumDisplaySettingsExA/W: - Do not overwrite the user-provided buffer size in dmDriverExtra - Fix broken pointer arithmetic CORE-13097 Modified: trunk/reactos/win32ss/user/user32/misc/display.c Modified: trunk/reactos/win32ss/user/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] Mon Apr 24 15:04:00 2017 @@ -238,7 +238,6 @@ COPYS(dmDeviceName, CCHDEVICENAME); COPYN(dmSpecVersion); COPYN(dmDriverVersion); - COPYN(dmDriverExtra); COPYN(dmFields); COPYN(dmPosition.x); COPYN(dmPosition.y); @@ -288,7 +287,9 @@ lpDevMode->dmDriverExtra = lpExtendedDevMode->dmDriverExtra; /* Copy extra data */ - RtlCopyMemory(lpDevMode + OldSize, lpExtendedDevMode + 1, lpDevMode->dmDriverExtra); + RtlCopyMemory((PUCHAR)lpDevMode + OldSize, + lpExtendedDevMode + 1, + lpDevMode->dmDriverExtra); } /* If the size of source structure is less, than used, we clean unsupported flags */ @@ -363,14 +364,16 @@ Status = NtUserEnumDisplaySettings(pusDeviceName, iModeNum, lpExtendedDevMode, dwFlags); if (NT_SUCCESS(Status)) { - /* Store old structure size */ + /* Store old structure sizes */ WORD OldSize = lpDevMode->dmSize; + WORD OldDriverExtra = lpDevMode->dmDriverExtra; /* Copy general data */ RtlCopyMemory(lpDevMode, lpExtendedDevMode, OldSize); - /* Restore old size */ + /* Restore old sizes */ lpDevMode->dmSize = OldSize; + lpDevMode->dmDriverExtra = OldDriverExtra; /* Extra data presented? */ if (lpDevMode->dmDriverExtra && lpExtendedDevMode->dmDriverExtra) @@ -380,7 +383,9 @@ lpDevMode->dmDriverExtra = lpExtendedDevMode->dmDriverExtra; /* Copy extra data */ - RtlCopyMemory(lpDevMode + OldSize, lpExtendedDevMode + 1, lpDevMode->dmDriverExtra); + RtlCopyMemory((PUCHAR)lpDevMode + OldSize, + lpExtendedDevMode + 1, + lpDevMode->dmDriverExtra); } /* If the size of source structure is less, than used, we clean unsupported flags */

1 0

[hbelusca] 74402: [ACCESS]: Fix french el-typo, noticed by Kyle Katarn. Thanks! CORE-12482
by hbelusca＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: hbelusca Date: Mon Apr 24 11:17:10 2017 New Revision: 74402 URL: http://svn.reactos.org/svn/reactos?rev=74402&view=rev Log: [ACCESS]: Fix french el-typo, noticed by Kyle Katarn. Thanks! CORE-12482 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] Mon Apr 24 11:17:10 2017 @@ -98,7 +98,7 @@ AUTOCHECKBOX "Ãmettre un son lors de l'activation/dÃ©sactivation d'une fonctionnalitÃ©", IDC_NOTIFICATION_SOUND, 12, 90, 222, 14 GROUPBOX "PÃ©riphÃ©riques Touches sÃ©rie", -1, 6, 115, 234, 47 - LTEXT "Les pÃ©riphÃ©riques Touches sÃ©rie reprÃ©sentent un une alternative pour accÃ©der aux fonctionnalitÃ©s du clavier et de la souris.", + LTEXT "Les pÃ©riphÃ©riques Touches sÃ©rie reprÃ©sentent une alternative pour accÃ©der aux fonctionnalitÃ©s du clavier et de la souris.", -1, 12, 124, 222, 20 AUTOCHECKBOX "U&tiliser les touches sÃ©rie", IDC_SERIAL_BOX, 12, 142, 126, 14 PUSHBUTTON "&ParamÃ¨tres", IDC_SERIAL_BUTTON, 144, 142, 90, 14

1 0

[tfaber] 74401: [WININET] - Silence Firefox/Safari debug spam CORE-12853 CORE-12128 CORE-11135
by tfaber＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: tfaber Date: Mon Apr 24 10:07:39 2017 New Revision: 74401 URL: http://svn.reactos.org/svn/reactos?rev=74401&view=rev Log: [WININET] - Silence Firefox/Safari debug spam CORE-12853 CORE-12128 CORE-11135 Modified: trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/sdk/include/psdk/wininet.h Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Apr 24 10:07:39 2017 @@ -2388,7 +2388,11 @@ if((ret = INTERNET_LoadProxySettings(&pi))) return ret; +#ifdef __REACTOS__ + WARN("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); +#else FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); +#endif if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { FreeProxyInfo(&pi); @@ -2447,6 +2451,12 @@ memset(&optionW->Value, 0, sizeof(optionW->Value)); break; +#ifdef __REACTOS__ + case INTERNET_PER_CONN_FLAGS_UI: + WARN("Unhandled dwOption %d\n", optionW->dwOption); + break; + +#endif default: FIXME("Unknown dwOption %d\n", optionW->dwOption); res = ERROR_INVALID_PARAMETER; Modified: trunk/reactos/sdk/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wininet.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wininet.h [iso-8859-1] Mon Apr 24 10:07:39 2017 @@ -340,6 +340,7 @@ #define INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS 7 #define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME 8 #define INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL 9 +#define INTERNET_PER_CONN_FLAGS_UI 10 /* Values for INTERNET_PER_CONN_FLAGS */ #define PROXY_TYPE_DIRECT 0x00000001

1 0

[tfaber] 74400: [NTOS:MM] - In MiFlushTbAndCapture, only print a fixme if we actually need to do something. CORE-12074 #resolve
by tfaber＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: tfaber Date: Mon Apr 24 09:45:03 2017 New Revision: 74400 URL: http://svn.reactos.org/svn/reactos?rev=74400&view=rev Log: [NTOS:MM] - In MiFlushTbAndCapture, only print a fixme if we actually need to do something. CORE-12074 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Apr 24 09:45:03 2017 @@ -1956,7 +1956,7 @@ IN PMMPTE PointerPte, IN ULONG ProtectionMask, IN PMMPFN Pfn1, - IN BOOLEAN CaptureDirtyBit) + IN BOOLEAN UpdateDirty) { MMPTE TempPte, PreviousPte; KIRQL OldIrql; @@ -2032,7 +2032,13 @@ // // Windows updates the relevant PFN1 information, we currently don't. // - if (CaptureDirtyBit) DPRINT1("Warning, not handling dirty bit\n"); + if (UpdateDirty && PreviousPte.u.Hard.Dirty) + { + if (!Pfn1->u3.e1.Modified) + { + DPRINT1("FIXME: Mark PFN as dirty\n"); + } + } // // Not supported in ARM3

1 0

[tfaber] 74399: [CONSOLE] - Fix build CORE-12451
by tfaber＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: tfaber Date: Mon Apr 24 07:19:41 2017 New Revision: 74399 URL: http://svn.reactos.org/svn/reactos?rev=74399&view=rev Log: [CONSOLE] - Fix build CORE-12451 Modified: trunk/reactos/dll/cpl/console/console.h Modified: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.h [iso-8859-1] Mon Apr 24 07:19:41 2017 @@ -12,6 +12,7 @@ #include <winreg.h> #include <winuser.h> #include <wincon.h> +#include <wchar.h> #include <commctrl.h> #include <cpl.h>

1 0

[hbelusca] 74398: [CONSOLE.CPL]: Addendum to r74397: Fix a cast.
by hbelusca＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: hbelusca Date: Mon Apr 24 00:32:10 2017 New Revision: 74398 URL: http://svn.reactos.org/svn/reactos?rev=74398&view=rev Log: [CONSOLE.CPL]: Addendum to r74397: Fix a cast. Modified: trunk/reactos/dll/cpl/console/options.c Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Mon Apr 24 00:32:10 2017 @@ -170,7 +170,7 @@ iItem = 0; if (iDupItem != CB_ERR) return; - iItem = (INT)SendMessageW(hWndList, CB_INSERTSTRING, iItem, (LPARAM)CPInfo.CodePageName); + iItem = (UINT)SendMessageW(hWndList, CB_INSERTSTRING, iItem, (LPARAM)CPInfo.CodePageName); if (iItem != CB_ERR && iItem != CB_ERRSPACE) iItem = SendMessageW(hWndList, CB_SETITEMDATA, iItem, CodePage); }

1 0

[hbelusca] 74397: [CONSOLE.CPL]: Add a list of available code pages in the console properties dialog. Display a list of available code pages, as done on Windows (NT/2k/2k3/Vista/7/8, when a CJK lan...
by hbelusca＠svn.reactos.org 24 Apr '17

24 Apr '17

Author: hbelusca Date: Mon Apr 24 00:24:34 2017 New Revision: 74397 URL: http://svn.reactos.org/svn/reactos?rev=74397&view=rev Log: [CONSOLE.CPL]: Add a list of available code pages in the console properties dialog. Display a list of available code pages, as done on Windows (NT/2k/2k3/Vista/7/8, when a CJK language is selected, and as always done on Windows 10 for all languages). But contrary to Windows, do not limit this list to only CJK + CP-437 codepages, but list *all* the available CPs, retrieved from the registry. These CPs are also those available when using the "chcp" or "mode con cp" commands. And contrary to Windows (where this is done only for the general console properties), always allow the user to view or change the code page even from the console properties dialog. [CONSRV]: Support changing the current code page from the console properties dialog. CORE-12451 Modified: trunk/reactos/dll/cpl/console/lang/bg-BG.rc trunk/reactos/dll/cpl/console/lang/cs-CZ.rc trunk/reactos/dll/cpl/console/lang/de-DE.rc trunk/reactos/dll/cpl/console/lang/en-US.rc trunk/reactos/dll/cpl/console/lang/es-ES.rc trunk/reactos/dll/cpl/console/lang/fr-FR.rc trunk/reactos/dll/cpl/console/lang/he-IL.rc trunk/reactos/dll/cpl/console/lang/id-ID.rc trunk/reactos/dll/cpl/console/lang/it-IT.rc trunk/reactos/dll/cpl/console/lang/ja-JP.rc trunk/reactos/dll/cpl/console/lang/no-NO.rc trunk/reactos/dll/cpl/console/lang/pl-PL.rc trunk/reactos/dll/cpl/console/lang/pt-BR.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/console/lang/sk-SK.rc trunk/reactos/dll/cpl/console/lang/sq-AL.rc trunk/reactos/dll/cpl/console/lang/tr-TR.rc trunk/reactos/dll/cpl/console/lang/uk-UA.rc trunk/reactos/dll/cpl/console/lang/zh-CN.rc trunk/reactos/dll/cpl/console/lang/zh-TW.rc trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/cpl/console/resource.h trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/bg-BG… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -25,6 +25,8 @@ GROUPBOX "ÐÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ", -1, 143, 85, 130, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "Ð ÐµÐ¶Ð¸Ð¼ &Ð±ÑÑÐ·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°", IDC_CHECK_QUICK_EDIT, 150, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Ð ÐµÐ¶Ð¸Ð¼ &Ð²Ð¼ÑÐºÐ²Ð°Ð½Ðµ", IDC_CHECK_INSERT_MODE, 150, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -31,6 +31,8 @@ GROUPBOX "MoÅ¾nosti Ãºprav", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "ReÅ¾im &rychlÃ½ch Ãºprav", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "ReÅ¾im v&klÃ¡dÃ¡nÃ", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Bearbeitungsoptionen", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&QuickEdit-Modus", IDC_CHECK_QUICK_EDIT, 150, 100, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&EinfÃ¼gemodus", IDC_CHECK_INSERT_MODE, 150, 120, 70, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -25,6 +25,8 @@ GROUPBOX "Edit Options", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/es-ES… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Editar Opciones", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "Modo &EdiciÃ³n rÃ¡pida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Modo &Insertar", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Options d'Ã©dition", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "M&ode d'Ã©dition rapide", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Page de codes", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "××¤×©×¨××××ª ×¢×¨×××", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/id-ID… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Opsi Edit", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "Mode Edit&Cepat", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Mode S&isip", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/it-IT… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Opzioni di modifica", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "ModalitÃ &Modifica rapida", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "ModalitÃ &Inserimento", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/cpl/console/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ja-JP.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -25,6 +25,8 @@ GROUPBOX "ãªãã·ã§ã³ã®ç·¨é", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&Quickç·¨éã¢ã¼ã", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "æ¿å¥ã¢ã¼ã(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -25,6 +25,8 @@ GROUPBOX "Rediger valg", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&Hurtigredigeringsmodus", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Innsettingsmodus", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -32,6 +32,8 @@ GROUPBOX "Edytuj opcje", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&Tryb szybkiej edycji", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Wstaw tryb", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/cpl/console/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pt-BR… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/pt-BR.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -25,6 +25,8 @@ GROUPBOX "OpÃ§Ãµes de ediÃ§Ã£o", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "Modo de ediÃ§Ã£o &rÃ¡pida", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Modo de &inserÃ§Ã£o", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -34,6 +34,8 @@ GROUPBOX "OpÈiuni de editare", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "Mod de &editare rapidÄâ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Mod de inse&rÈieâ", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&ÐÑÑÑÑÐ¾Ðµ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Ð ÐµÐ¶Ð¸Ð¼ Ð²ÑÑÐ°Ð²ÐºÐ¸", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sk-SK… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -29,6 +29,8 @@ GROUPBOX "MoÅ¾nosti Ãºprav", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sq-AL… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -29,6 +29,8 @@ GROUPBOX "Modifiko Opsione", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "MÃ«nyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "MÃ«nyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "DÃ¼zenleme SeÃ§enekleri", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&HÄ±zlÄ± DÃ¼zenleme Kipi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Ek&leme Kipi", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÑÐµÐ´Ð°Ð³ÑÐ²Ð°Ð½Ð½Ñ", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "&Ð¨Ð²Ð¸Ð´ÐºÐµ ÑÐµÐ´Ð°Ð³ÑÐ²Ð°Ð½Ð½Ñ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "&Ð ÐµÐ¶Ð¸Ð¼ Ð²ÑÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/zh-CN… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "ç¼è¾éé¡¹", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "å¿«éç¼è¾æ¨¡å¼(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "æå¥æ¨¡å¼(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/zh-TW… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/zh-TW.rc [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -27,6 +27,8 @@ GROUPBOX "ç·¨è¼¯é¸é ", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "å¿«éç·¨è¼¯æ¨¡å¼(&Q)", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "æå¥æ¨¡å¼(&I)", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Code Page", -1, 7, 170, 238, 31 + COMBOBOX IDL_CODEPAGE, 13, 181, 224, 58, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -4,12 +4,238 @@ * FILE: dll/cpl/console/options.c * PURPOSE: Options dialog * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #include "console.h" #define NDEBUG #include <debug.h> + +#define MAX_VALUE_NAME 16383 + + +/* + * A function that locates the insertion point (index) for a given value 'Value' + * in a list 'List' to maintain its sorted order by increasing values. + * + * - When 'BisectRightOrLeft' == TRUE, the bisection is performed to the right, + * i.e. the returned insertion point comes after (to the right of) any existing + * entries of 'Value' in 'List'. + * The returned insertion point 'i' partitions the list 'List' into two halves + * such that: + * all(val <= Value for val in List[start:i[) for the left side, and + * all(val > Value for val in List[i:end+1[) for the right side. + * + * - When 'BisectRightOrLeft' == FALSE, the bisection is performed to the left, + * i.e. the returned insertion point comes before (to the left of) any existing + * entries of 'Value' in 'List'. + * The returned insertion point 'i' partitions the list 'List' into two halves + * such that: + * all(val < Value for val in List[start:i[) for the left side, and + * all(val >= Value for val in List[i:end+1[) for the right side. + * + * The exact value of List[i] may, or may not, be equal to Value, depending on + * whether or not 'Value' is actually present on the list. + */ +static UINT +BisectListSortedByValueEx( + IN HWND hWndList, + IN ULONG_PTR Value, + IN UINT itemStart, + IN UINT itemEnd, + OUT PUINT pValueItem OPTIONAL, + IN BOOL BisectRightOrLeft) +{ + UINT iItemStart, iItemEnd, iItem; + ULONG_PTR itemData; + + /* Sanity checks */ + if (itemStart > itemEnd) + return CB_ERR; // Fail + + /* Initialize */ + iItemStart = itemStart; + iItemEnd = itemEnd; + iItem = iItemStart; + + if (pValueItem) + *pValueItem = CB_ERR; + + while (iItemStart <= iItemEnd) + { + /* + * Bisect. Note the following: + * - if iItemEnd == iItemStart + 1, then iItem == iItemStart; + * - if iItemStart == iItemEnd, then iItemStart == iItem == iItemEnd. + * In all but the last case, iItemStart <= iItem < iItemEnd. + */ + iItem = (iItemStart + iItemEnd) / 2; + + itemData = (ULONG_PTR)SendMessageW(hWndList, CB_GETITEMDATA, (WPARAM)iItem, 0); + if (itemData == CB_ERR) + return CB_ERR; // Fail + + if (Value == itemData) + { + /* Found a candidate */ + if (pValueItem) + *pValueItem = iItem; + + /* + * Try to find the last element (if BisectRightOrLeft == TRUE) + * or the first element (if BisectRightOrLeft == FALSE). + */ + if (BisectRightOrLeft) + { + iItemStart = iItem + 1; // iItemStart may be > iItemEnd + } + else + { + if (iItem <= itemStart) break; + iItemEnd = iItem - 1; // iItemEnd may be < iItemStart, i.e. iItemStart may be > iItemEnd + } + } + else if (Value < itemData) + { + if (iItem <= itemStart) break; + /* The value should be before iItem */ + iItemEnd = iItem - 1; // iItemEnd may be < iItemStart, i.e. iItemStart may be > iItemEnd, if iItem == iItemStart. + } + else // if (itemData < Value) + { + /* The value should be after iItem */ + iItemStart = iItem + 1; // iItemStart may be > iItemEnd, if iItem == iItemEnd. + } + + /* Here, iItemStart may be == iItemEnd */ + } + + return iItemStart; +} + +static UINT +BisectListSortedByValue( + IN HWND hWndList, + IN ULONG_PTR Value, + OUT PUINT pValueItem OPTIONAL, + IN BOOL BisectRightOrLeft) +{ + INT iItemEnd = (INT)SendMessageW(hWndList, CB_GETCOUNT, 0, 0); + if (iItemEnd == CB_ERR || iItemEnd <= 0) + return CB_ERR; // Fail + + return BisectListSortedByValueEx(hWndList, Value, + 0, (UINT)(iItemEnd - 1), + pValueItem, + BisectRightOrLeft); +} + + +static VOID +AddCodePage( + IN HWND hWndList, + IN UINT CodePage) +{ + UINT iItem, iDupItem; + CPINFOEXW CPInfo; + + /* + * Add only valid code pages, that is: + * - If the CodePage is one of the reserved (alias) values: + * CP_ACP == 0 ; CP_OEMCP == 1 ; CP_MACCP == 2 ; CP_THREAD_ACP == 3 ; + * or the deprecated CP_SYMBOL == 42 (see http://archives.miloush.net/michkap/archive/2005/11/08/490495.html) + * it is considered invalid. + * - If IsValidCodePage() fails because the code page is listed but + * not installed on the system, it is also considered invalid. + */ + if (CodePage == CP_ACP || CodePage == CP_OEMCP || CodePage == CP_MACCP || + CodePage == CP_THREAD_ACP || CodePage == CP_SYMBOL || !IsValidCodePage(CodePage)) + { + return; + } + + /* Retrieve the code page display name */ + if (!GetCPInfoExW(CodePage, 0, &CPInfo)) + { + /* We failed, just use the code page value as its name */ + // _ultow(CodePage, CPInfo.CodePageName, 10); + _snwprintf(CPInfo.CodePageName, ARRAYSIZE(CPInfo.CodePageName), L"%lu", CodePage); + } + + /* Add the code page into the list, sorted by code page value. Avoid any duplicates. */ + iDupItem = CB_ERR; + iItem = BisectListSortedByValue(hWndList, CodePage, &iDupItem, TRUE); + if (iItem == CB_ERR) + iItem = 0; + if (iDupItem != CB_ERR) + return; + iItem = (INT)SendMessageW(hWndList, CB_INSERTSTRING, iItem, (LPARAM)CPInfo.CodePageName); + if (iItem != CB_ERR && iItem != CB_ERRSPACE) + iItem = SendMessageW(hWndList, CB_SETITEMDATA, iItem, CodePage); +} + +static VOID +BuildCodePageList(IN HWND hDlg) +{ + HWND hWndList; + HKEY hKey; + DWORD dwIndex, dwSize, dwType; + UINT CodePage; + WCHAR szValueName[MAX_VALUE_NAME]; + + // #define REGSTR_PATH_CODEPAGE TEXT("System\\CurrentControlSet\\Control\\Nls\\CodePage") + /* Open the Nls\CodePage key */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Nls\\CodePage", + 0, + KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + return; + } + + hWndList = GetDlgItem(hDlg, IDL_CODEPAGE); + + /* Enumerate all the available code pages on the system */ + dwSize = ARRAYSIZE(szValueName); + dwIndex = 0; + while (RegEnumValueW(hKey, dwIndex, szValueName, &dwSize, + NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) // != ERROR_NO_MORE_ITEMS + { + /* Ignore these parameters, prepare for next iteration */ + dwSize = ARRAYSIZE(szValueName); + ++dwIndex; + + /* Check the value type validity */ + if (dwType != REG_SZ) + continue; + + /* + * Add the code page into the list. + * If _wtol fails and returns 0, the code page is considered invalid + * (and indeed this value corresponds to the CP_ACP alias too). + */ + CodePage = (UINT)_wtol(szValueName); + if (CodePage == 0) continue; + AddCodePage(hWndList, CodePage); + } + + RegCloseKey(hKey); + + /* Add the special UTF-7 (CP_UTF7 65000) and UTF-8 (CP_UTF8 65001) code pages */ + AddCodePage(hWndList, CP_UTF7); + AddCodePage(hWndList, CP_UTF8); + + /* Find and select the current code page in the sorted list */ + if (BisectListSortedByValue(hWndList, ConInfo->CodePage, &CodePage, FALSE) == CB_ERR || + CodePage == CB_ERR) + { + /* Not found, select the first element */ + CodePage = 0; + } + SendMessageW(hWndList, CB_SETCURSEL, (WPARAM)CodePage, 0); +} static VOID UpdateDialogElements(HWND hwndDlg, PCONSOLE_STATE_INFO pConInfo) @@ -21,42 +247,42 @@ { /* Small cursor */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (pConInfo->CursorSize <= 50) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else /* if (pConInfo->CursorSize <= 100) */ { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } /* Update num buffers */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); + SendMessageW(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); SetDlgItemInt(hwndDlg, IDC_EDIT_NUM_BUFFER, pConInfo->NumberOfHistoryBuffers, FALSE); /* Update buffer size */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); + SendMessageW(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG(999, 1)); SetDlgItemInt(hwndDlg, IDC_EDIT_BUFFER_SIZE, pConInfo->HistoryBufferSize, FALSE); /* Update discard duplicates */ @@ -67,18 +293,18 @@ if (pConInfo->FullScreen) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } /* Update quick edit */ @@ -101,6 +327,7 @@ { case WM_INITDIALOG: { + BuildCodePageList(hwndDlg); UpdateDialogElements(hwndDlg, ConInfo); return TRUE; } @@ -172,48 +399,48 @@ } case IDC_CHECK_QUICK_EDIT: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + lResult = SendMessageW((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { ConInfo->QuickEdit = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { ConInfo->QuickEdit = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_INSERT_MODE: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + lResult = SendMessageW((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { ConInfo->InsertMode = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { ConInfo->InsertMode = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_DISCARD_DUPLICATES: { - lResult = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + lResult = SendMessageW((HWND)lParam, BM_GETCHECK, 0, 0); if (lResult == BST_CHECKED) { ConInfo->HistoryNoDup = FALSE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } else if (lResult == BST_UNCHECKED) { ConInfo->HistoryNoDup = TRUE; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SendMessageW((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -243,6 +470,26 @@ ConInfo->NumberOfHistoryBuffers = numBuff; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + case IDL_CODEPAGE: + { + if (HIWORD(wParam) == CBN_SELENDOK) + { + INT iItem; + UINT CodePage; + + iItem = (INT)SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); + if (iItem != CB_ERR) + { + CodePage = (UINT)SendMessageW((HWND)lParam, CB_GETITEMDATA, iItem, 0); + if (CodePage != CB_ERR) + { + ConInfo->CodePage = CodePage; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + } } break; } Modified: trunk/reactos/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/console/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/resource.h [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -21,9 +21,10 @@ #define IDC_UPDOWN_NUM_BUFFER 206 #define IDC_RADIO_SMALL_CURSOR 207 #define IDC_RADIO_MEDIUM_CURSOR 208 -#define IDC_RADIO_LARGE_CURSOR 209 -#define IDC_RADIO_DISPLAY_WINDOW 210 +#define IDC_RADIO_LARGE_CURSOR 209 +#define IDC_RADIO_DISPLAY_WINDOW 210 #define IDC_RADIO_DISPLAY_FULL 211 +#define IDL_CODEPAGE 212 /* Apply dialog */ #define IDC_RADIO_APPLY_ALL 300 Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -217,7 +217,8 @@ } /* Set-up the code page */ - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; + if (IsValidCodePage(ConsoleInfo->CodePage)) + Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; /* Initialize a new text-mode screen buffer with default settings */ ScreenBufferInfo.ScreenBufferSize = ConsoleInfo->ScreenBufferSize; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -156,7 +156,9 @@ pSharedInfo->ScreenAttributes = DEFAULT_SCREEN_ATTRIB; pSharedInfo->PopupAttributes = DEFAULT_POPUP_ATTRIB ; } - /// pSharedInfo->CodePage; + + /* We display the output code page only */ + pSharedInfo->CodePage = Console->OutputCodePage; /* GUI Information */ wcsncpy(pSharedInfo->FaceName, GuiData->GuiInfo.FaceName, LF_FACESIZE); @@ -317,7 +319,7 @@ ConInfo.HistoryBufferSize = pConInfo->HistoryBufferSize; ConInfo.NumberOfHistoryBuffers = pConInfo->NumberOfHistoryBuffers; ConInfo.HistoryNoDup = !!pConInfo->HistoryNoDup; - ConInfo.CodePage = pConInfo->CodePage; + ConInfo.CodePage = pConInfo->CodePage; // Done in ConSrvApplyUserSettings #endif /* Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Mon Apr 24 00:24:34 2017 @@ -51,6 +51,15 @@ /* Apply cursor size */ ActiveBuffer->CursorInfo.bVisible = (ConsoleInfo->CursorSize != 0); ActiveBuffer->CursorInfo.dwSize = min(max(ConsoleInfo->CursorSize, 0), 100); + + /* Update the code page */ + if ((Console->OutputCodePage != ConsoleInfo->CodePage) && + IsValidCodePage(ConsoleInfo->CodePage)) + { + Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; + // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, TRUE); // Output + // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, FALSE); // Input + } // FIXME: Check ConsoleInfo->WindowSize with respect to // TermGetLargestConsoleWindowSize(...).

1 0

[ekohl] 74396: [SYSETUP] Update the shown date and time on the Date and Time page until the user changes the date or time. CORE-11896
by ekohl＠svn.reactos.org 23 Apr '17

23 Apr '17

Author: ekohl Date: Sun Apr 23 21:56:36 2017 New Revision: 74396 URL: http://svn.reactos.org/svn/reactos?rev=74396&view=rev Log: [SYSETUP] Update the shown date and time on the Date and Time page until the user changes the date or time. CORE-11896 Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Apr 23 21:56:36 2017 @@ -1476,11 +1476,24 @@ return Ret; } + +static VOID +UpdateLocalSystemTime(HWND hwnd) +{ + SYSTEMTIME LocalTime; + + GetLocalTime(&LocalTime); + DateTime_SetSystemtime(GetDlgItem(hwnd, IDC_DATEPICKER), GDT_VALID, &LocalTime); + DateTime_SetSystemtime(GetDlgItem(hwnd, IDC_TIMEPICKER), GDT_VALID, &LocalTime); +} + + static BOOL WriteDateTimeSettings(HWND hwndDlg, PSETUPDATA SetupData) { WCHAR Title[64]; WCHAR ErrorLocalTime[256]; + GetLocalSystemTime(hwndDlg, SetupData); SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), SetupData); @@ -1503,6 +1516,7 @@ return TRUE; } + static INT_PTR CALLBACK DateTimePageDlgProc(HWND hwndDlg, @@ -1518,7 +1532,6 @@ switch (uMsg) { case WM_INITDIALOG: - { /* Save pointer to the global setup data */ SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); @@ -1542,16 +1555,14 @@ SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } - - } - break; - + break; + + case WM_TIMER: + UpdateLocalSystemTime(hwndDlg); + break; case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - - switch (lpnm->code) + switch (((LPNMHDR)lParam)->code) { case PSN_SETACTIVE: /* Enable the Back and Next buttons */ @@ -1561,13 +1572,17 @@ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, SetupData->uFirstNetworkWizardPage); return TRUE; } + SetTimer(hwndDlg, 1, 1000, NULL); + break; + + case PSN_KILLACTIVE: + case DTN_DATETIMECHANGE: + KillTimer(hwndDlg, 1); break; case PSN_WIZNEXT: - { WriteDateTimeSettings(hwndDlg, SetupData); - } - break; + break; case PSN_WIZBACK: SetupData->UnattendSetup = FALSE; @@ -1576,8 +1591,7 @@ default: break; } - } - break; + break; case WM_DESTROY: DestroyTimeZoneList(SetupData);

1 0

[tfaber] 74395: [CRYPTNET] - Fix ROS-Diff. Spotted by CRLF. CORE-13117 #resolve
by tfaber＠svn.reactos.org 23 Apr '17

23 Apr '17

Author: tfaber Date: Sun Apr 23 17:59:25 2017 New Revision: 74395 URL: http://svn.reactos.org/svn/reactos?rev=74395&view=rev Log: [CRYPTNET] - Fix ROS-Diff. Spotted by CRLF. CORE-13117 #resolve Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sun Apr 23 17:59:25 2017 @@ -1028,7 +1028,7 @@ #ifdef __REACTOS__ if ((hFile == INVALID_HANDLE_VALUE) && (lstrlenW(components.lpszUrlPath) > 1) && (components.lpszUrlPath[1] != ':')) #else - if ((hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) #endif { /* Try again on the current drive */

1 0

[ekohl] 74394: [SERVMAN] - Make a copy of the service list where service and display name strings are separately allocated. We need this to update the service names rather than reload the list when...
by ekohl＠svn.reactos.org 23 Apr '17

23 Apr '17

Author: ekohl Date: Sun Apr 23 17:39:26 2017 New Revision: 74394 URL: http://svn.reactos.org/svn/reactos?rev=74394&view=rev Log: [SERVMAN] - Make a copy of the service list where service and display name strings are separately allocated. We need this to update the service names rather than reload the list when the display name is changed. - Write the display name, description or binary path to the registry when the user changed them. - Disable the Edit button after it has been clicked. - Do not add the service name to the argument vector in the call to StartServiceW. Services.exe already add the service name to the vector. CORE-12743 Modified: trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet_general.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -248,7 +248,6 @@ { ENUM_SERVICE_STATUS_PROCESS *pService; LVITEMW lvItem; - DWORD NumServices; DWORD Index; SendMessage (Info->hListView, @@ -258,9 +257,9 @@ (void)ListView_DeleteAllItems(Info->hListView); - if (GetServiceList(Info, &NumServices)) - { - for (Index = 0; Index < NumServices; Index++) + if (GetServiceList(Info)) + { + for (Index = 0; Index < Info->NumServices; Index++) { INT i; Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -880,10 +880,7 @@ case WM_CLOSE: { - HeapFree(ProcessHeap, - 0, - Info->pAllServices); - + FreeServiceList(Info); DestroyMenu(Info->hShortcutMenu); DestroyWindow(hwnd); } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -54,6 +54,7 @@ ENUM_SERVICE_STATUS_PROCESS *pAllServices; ENUM_SERVICE_STATUS_PROCESS *pCurrentService; + DWORD NumServices; INT SelectedItem;/* selection number in the list view */ INT SortSelection; @@ -115,9 +116,10 @@ LPWSTR GetServiceDescription(LPWSTR lpServiceName); BOOL SetServiceDescription(LPWSTR lpServiceName, LPWSTR lpDescription); LPWSTR GetExecutablePath(LPWSTR lpServiceName); +VOID FreeServiceList(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); -BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices); +BOOL GetServiceList(PMAIN_WND_INFO Info); /* propsheet.c */ Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -13,7 +13,10 @@ typedef struct _PAGEDATA { PSERVICEPROPSHEET dlgInfo; - BOOL bPageChanged; + BOOL bDisplayNameChanged; + BOOL bDescriptionChanged; + BOOL bBinaryPathChanged; + BOOL bStartTypeChanged; } PAGEDATA, *PPAGEDATA; @@ -53,11 +56,11 @@ EnableWindow (hButton, TRUE); } - if(lpServiceConfig) + hButton = GetDlgItem(hwndDlg, IDC_START_PARAM); + EnableWindow(hButton, (State == SERVICE_STOPPED && lpServiceConfig && lpServiceConfig->dwStartType != SERVICE_DISABLED)); + + if (lpServiceConfig) HeapFree(GetProcessHeap(), 0, lpServiceConfig); - - hButton = GetDlgItem(hwndDlg, IDC_START_PARAM); - EnableWindow(hButton, (State == SERVICE_STOPPED)); /* set the main toolbar */ SetMenuAndButtonStates(dlgInfo->Info); @@ -210,11 +213,13 @@ } VOID -SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, +SaveDlgInfo(PPAGEDATA pPageData, HWND hwndDlg) { LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; - HWND hList; + PWSTR pDisplayName = NULL; + PWSTR pDescription; + INT nLength; DWORD StartUp; pServiceConfig = HeapAlloc(ProcessHeap, @@ -224,31 +229,93 @@ { pServiceConfig->dwServiceType = SERVICE_NO_CHANGE; pServiceConfig->dwErrorControl = SERVICE_NO_CHANGE; - - hList = GetDlgItem(hwndDlg, IDC_START_TYPE); - StartUp = SendMessage(hList, - CB_GETCURSEL, - 0, - 0); - switch (StartUp) - { - case 0: pServiceConfig->dwStartType = SERVICE_AUTO_START; break; - case 1: pServiceConfig->dwStartType = SERVICE_DEMAND_START; break; - case 2: pServiceConfig->dwStartType = SERVICE_DISABLED; break; + pServiceConfig->dwStartType = SERVICE_NO_CHANGE; + + if (pPageData->bStartTypeChanged) + { + StartUp = SendDlgItemMessageW(hwndDlg, IDC_START_TYPE, CB_GETCURSEL, 0, 0); + switch (StartUp) + { + case 0: + pServiceConfig->dwStartType = SERVICE_AUTO_START; + break; + + case 1: + pServiceConfig->dwStartType = SERVICE_DEMAND_START; + break; + case 2: + pServiceConfig->dwStartType = SERVICE_DISABLED; + break; + } + } + + if (pPageData->bBinaryPathChanged) + { + nLength = SendDlgItemMessageW(hwndDlg, IDC_EXEPATH, WM_GETTEXTLENGTH, 0, 0); + pServiceConfig->lpBinaryPathName = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + (nLength + 1) * sizeof(WCHAR)); + if (pServiceConfig->lpBinaryPathName != NULL) + SendDlgItemMessageW(hwndDlg, IDC_EXEPATH, WM_GETTEXT, nLength + 1, (LPARAM)pServiceConfig->lpBinaryPathName); + } + + if (pPageData->bDisplayNameChanged) + { + nLength = SendDlgItemMessageW(hwndDlg, IDC_DISP_NAME, WM_GETTEXTLENGTH, 0, 0); + pDisplayName = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + (nLength + 1) * sizeof(WCHAR)); + if (pDisplayName != NULL) + { + SendDlgItemMessageW(hwndDlg, IDC_DISP_NAME, WM_GETTEXT, nLength + 1, (LPARAM)pDisplayName); + + if (pPageData->dlgInfo->pService->lpDisplayName) + HeapFree(ProcessHeap, 0, pPageData->dlgInfo->pService->lpDisplayName); + + pPageData->dlgInfo->pService->lpDisplayName = pDisplayName; + pServiceConfig->lpDisplayName = pDisplayName; + } } if (SetServiceConfig(pServiceConfig, - dlgInfo->pService->lpServiceName, + pPageData->dlgInfo->pService->lpServiceName, NULL)) { - ChangeListViewText(dlgInfo->Info, - dlgInfo->pService, - LVSTARTUP); - } - - HeapFree(ProcessHeap, - 0, - pServiceConfig); + if (pPageData->bDisplayNameChanged) + ChangeListViewText(pPageData->dlgInfo->Info, + pPageData->dlgInfo->pService, + LVNAME); + + if (pPageData->bStartTypeChanged) + ChangeListViewText(pPageData->dlgInfo->Info, + pPageData->dlgInfo->pService, + LVSTARTUP); + } + + if (pServiceConfig->lpBinaryPathName != NULL) + HeapFree(ProcessHeap, 0, pServiceConfig->lpBinaryPathName); + + HeapFree(ProcessHeap, 0, pServiceConfig); + } + + if (pPageData->bDescriptionChanged) + { + nLength = SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); + pDescription = HeapAlloc(ProcessHeap, HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + if (pDescription != NULL) + { + SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_GETTEXT, nLength + 1, (LPARAM)pDescription); + + if (SetServiceDescription(pPageData->dlgInfo->pService->lpServiceName, + pDescription)) + { + ChangeListViewText(pPageData->dlgInfo->Info, + pPageData->dlgInfo->pService, + LVDESC); + } + + HeapFree(ProcessHeap, 0, pDescription); + } } } @@ -301,7 +368,31 @@ case IDC_START_TYPE: if (HIWORD(wParam) == CBN_SELCHANGE) { - pPageData->bPageChanged = TRUE; + pPageData->bStartTypeChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_DISP_NAME: + if (HIWORD(wParam) == EN_CHANGE) + { + pPageData->bDisplayNameChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_DESCRIPTION: + if (HIWORD(wParam) == EN_CHANGE) + { + pPageData->bDescriptionChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_EXEPATH: + if (HIWORD(wParam) == EN_CHANGE) + { + pPageData->bBinaryPathChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -313,6 +404,8 @@ if (GetDlgItemText(hwndDlg, IDC_START_PARAM, szStartParams, 256) > 0) lpStartParams = szStartParams; + + EnableWindow(GetDlgItem(hwndDlg, IDC_START_PARAM), FALSE); RunActionWithProgress(hwndDlg, pPageData->dlgInfo->pService->lpServiceName, @@ -370,17 +463,7 @@ SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, EM_SETREADONLY, FALSE, 0); SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, EM_SETREADONLY, FALSE, 0); SendDlgItemMessage(hwndDlg, IDC_EXEPATH, EM_SETREADONLY, FALSE, 0); - break; - - case IDC_DISP_NAME: - case IDC_DESCRIPTION: - case IDC_EXEPATH: - case IDC_START_PARAM: - if (HIWORD(wParam) == EN_CHANGE) - { - pPageData->bPageChanged = TRUE; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT), FALSE); break; } break; @@ -389,11 +472,17 @@ switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - if (pPageData->bPageChanged) + if (pPageData->bDisplayNameChanged || + pPageData->bDescriptionChanged || + pPageData->bBinaryPathChanged || + pPageData->bStartTypeChanged) { - SaveDlgInfo(pPageData->dlgInfo, hwndDlg); + SaveDlgInfo(pPageData, hwndDlg); SetButtonStates(pPageData->dlgInfo, hwndDlg); - pPageData->bPageChanged = FALSE; + pPageData->bDisplayNameChanged = FALSE; + pPageData->bDescriptionChanged = FALSE; + pPageData->bBinaryPathChanged = FALSE; + pPageData->bStartTypeChanged = FALSE; } break; } Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -253,25 +253,41 @@ return bRet; } +VOID +FreeServiceList(PMAIN_WND_INFO Info) +{ + DWORD i; + + if (Info->pAllServices != NULL) + { + for (i = 0; i < Info->NumServices; i++) + { + if (Info->pAllServices[i].lpServiceName) + HeapFree(ProcessHeap, 0, Info->pAllServices[i].lpServiceName); + + if (Info->pAllServices[i].lpDisplayName) + HeapFree(ProcessHeap, 0, Info->pAllServices[i].lpDisplayName); + } + + HeapFree(ProcessHeap, 0, Info->pAllServices); + Info->pAllServices = NULL; + Info->NumServices = 0; + } +} + BOOL -GetServiceList(PMAIN_WND_INFO Info, - DWORD *NumServices) -{ +GetServiceList(PMAIN_WND_INFO Info) +{ + ENUM_SERVICE_STATUS_PROCESS *pServices = NULL; SC_HANDLE ScHandle; BOOL bRet = FALSE; DWORD BytesNeeded = 0; DWORD ResumeHandle = 0; - - *NumServices = 0; - - if (Info->pAllServices != NULL) - { - HeapFree(ProcessHeap, - 0, - Info->pAllServices); - Info->pAllServices = NULL; - } + DWORD NumServices = 0; + DWORD i; + + FreeServiceList(Info); ScHandle = OpenSCManagerW(NULL, NULL, @@ -285,7 +301,7 @@ NULL, 0, &BytesNeeded, - NumServices, + &NumServices, &ResumeHandle, 0)) { @@ -293,20 +309,20 @@ if (GetLastError() == ERROR_MORE_DATA) { /* reserve memory for service info array */ - Info->pAllServices = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(ProcessHeap, - 0, - BytesNeeded); - if (Info->pAllServices) + pServices = (ENUM_SERVICE_STATUS_PROCESS *)HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (pServices) { /* fill array with service info */ if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, - (LPBYTE)Info->pAllServices, + (LPBYTE)pServices, BytesNeeded, &BytesNeeded, - NumServices, + &NumServices, &ResumeHandle, 0)) { @@ -320,12 +336,35 @@ if (ScHandle) CloseServiceHandle(ScHandle); - if (!bRet && Info->pAllServices) - { - HeapFree(ProcessHeap, - 0, - Info->pAllServices); - } + Info->pAllServices = (ENUM_SERVICE_STATUS_PROCESS *)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + NumServices * sizeof(ENUM_SERVICE_STATUS_PROCESS)); + if (Info->pAllServices != NULL) + { + Info->NumServices = NumServices; + + for (i = 0; i < NumServices; i++) + { + Info->pAllServices[i].lpServiceName = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + (wcslen(pServices[i].lpServiceName) + 1) * sizeof(WCHAR)); + if (Info->pAllServices[i].lpServiceName) + wcscpy(Info->pAllServices[i].lpServiceName, pServices[i].lpServiceName); + + Info->pAllServices[i].lpDisplayName = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + (wcslen(pServices[i].lpDisplayName) + 1) * sizeof(WCHAR)); + if (Info->pAllServices[i].lpDisplayName) + wcscpy(Info->pAllServices[i].lpDisplayName, pServices[i].lpDisplayName); + + CopyMemory(&Info->pAllServices[i].ServiceStatusProcess, + &pServices[i].ServiceStatusProcess, + sizeof(SERVICE_STATUS_PROCESS)); + } + } + + if (pServices) + HeapFree(ProcessHeap, 0, pServices); return bRet; } Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c [iso-8859-1] Sun Apr 23 17:39:26 2017 @@ -53,16 +53,16 @@ lpChar++; } - /* Allocate the arguments vector and add one for the service name */ - lpArgsVector = LocalAlloc(LMEM_FIXED, (dwArgsCount + 1) * sizeof(LPCWSTR)); + /* + * Allocate the arguments vector. + * Do not add the service name here because services.exe does it for us! + */ + lpArgsVector = LocalAlloc(LMEM_FIXED, dwArgsCount * sizeof(LPCWSTR)); if (!lpArgsVector) return FALSE; - /* Make the service name the first argument */ - lpArgsVector[0] = ServiceName; - /* Fill the arguments vector */ - dwArgsCount = 1; + dwArgsCount = 0; bWhiteSpace = TRUE; lpChar = lpStartParams; while (*lpChar != 0)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs