Ros-diffs May 2023

ros-diffs@reactos.org

16 participants
69 discussions

[reactos] 02/04: [RAPPS] Add /APPWIZ command-line key to open "Installed" section
by Stanislav Motylkov 27 May '23

27 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff1fa4f38ab9424891eb3… commit ff1fa4f38ab9424891eb350e57268b755a1b0d48 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 22 01:34:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat May 27 15:36:53 2023 +0300 [RAPPS] Add /APPWIZ command-line key to open "Installed" section Addendum to ab7ddc44. CORE-18981 --- base/applications/rapps/gui.cpp | 4 ++-- base/applications/rapps/include/gui.h | 3 ++- base/applications/rapps/include/unattended.h | 1 + base/applications/rapps/unattended.cpp | 10 ++++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 2d5eb7e098a..9073b7bf957 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -82,7 +82,7 @@ CSideTreeView::~CSideTreeView() // **** CMainWindow **** -CMainWindow::CMainWindow(CAppDB *db) : m_ClientPanel(NULL), m_Db(db), SelectedEnumType(ENUM_ALL_INSTALLED) +CMainWindow::CMainWindow(CAppDB *db, BOOL bAppwiz) : m_ClientPanel(NULL), m_Db(db), bAppwizMode(bAppwiz), SelectedEnumType(ENUM_ALL_INSTALLED) { } @@ -123,7 +123,7 @@ CMainWindow::InitCategoriesList() m_TreeView->SetImageList(); m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND); m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND); - m_TreeView->SelectItem(hRootItemAvailable); + m_TreeView->SelectItem(bAppwizMode ? hRootItemInstalled : hRootItemAvailable); } BOOL diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index ee136f48133..07a07356475 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -57,12 +57,13 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> CAtlList<CAppInfo *> m_Selected; BOOL bUpdating = FALSE; + BOOL bAppwizMode; CStringW szSearchPattern; AppsCategories SelectedEnumType; public: - CMainWindow(CAppDB *db); + explicit CMainWindow(CAppDB *db, BOOL bAppwiz = FALSE); ~CMainWindow(); diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index 83aa2e06b9f..8eaaf93c244 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -1,5 +1,6 @@ #pragma once +#define CMD_KEY_APPWIZ L"APPWIZ" #define CMD_KEY_INSTALL L"INSTALL" #define CMD_KEY_SETUP L"SETUP" #define CMD_KEY_FIND L"FIND" diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 9a5fa2a3fa5..a8a21d698aa 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -222,6 +222,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) { INT argc; LPWSTR *argv = CommandLineToArgvW(lpCmdLine, &argc); + BOOL bAppwizMode = FALSE; if (!argv) { @@ -232,6 +233,11 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) GetStorageDirectory(Directory); CAppDB db(Directory); + if (argc > 1 && MatchCmdOption(argv[1], CMD_KEY_APPWIZ)) + { + bAppwizMode = TRUE; + } + if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch) { db.RemoveCached(); @@ -239,7 +245,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) db.UpdateAvailable(); db.UpdateInstalled(); - if (argc == 1) // RAPPS is launched without options + if (argc == 1 || bAppwizMode) // RAPPS is launched without options or APPWIZ mode is requested { // Check whether the RAPPS MainWindow is already launched in another process HANDLE hMutex; @@ -256,7 +262,7 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) return FALSE; } - CMainWindow wnd(&db); + CMainWindow wnd(&db, bAppwizMode); MainWindowLoop(&wnd, nCmdShow); if (hMutex)

1 0

[reactos] 01/04: [RAPPS] Move CMainWindow creation to upper function
by Stanislav Motylkov 27 May '23

27 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6fecc52d13ed96020a64… commit d6fecc52d13ed96020a64946499de60fb88a2abf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 23 23:50:04 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat May 27 15:31:03 2023 +0300 [RAPPS] Move CMainWindow creation to upper function --- base/applications/rapps/gui.cpp | 8 +------- base/applications/rapps/include/dialogs.h | 4 ---- base/applications/rapps/include/gui.h | 4 ++++ base/applications/rapps/unattended.cpp | 5 +++-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 353dd3bcbce..2d5eb7e098a 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -781,15 +781,11 @@ CMainWindow::HandleTabOrder(int direction) // **** CMainWindow **** VOID -MainWindowLoop(CAppDB *db, INT nShowCmd) +MainWindowLoop(CMainWindow *wnd, INT nShowCmd) { HACCEL KeyBrd; MSG Msg; - CMainWindow *wnd = new CMainWindow(db); - if (!wnd) - return; - hMainWnd = wnd->Create(); if (!hMainWnd) return; @@ -819,6 +815,4 @@ MainWindowLoop(CAppDB *db, INT nShowCmd) DispatchMessageW(&Msg); } } - - delete wnd; } diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index ba94025b4a3..93b8720f497 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -8,10 +8,6 @@ VOID CreateSettingsDlg(HWND hwnd); -// Main window -VOID -MainWindowLoop(class CAppDB *db, INT nShowCmd); - // Download dialogs VOID DownloadApplicationsDB(LPCWSTR lpUrl, BOOL IsOfficial); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 4cbd6d267fd..ee136f48133 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -131,3 +131,7 @@ class CMainWindow : public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits> void HandleTabOrder(int direction); }; + +// Main window +VOID +MainWindowLoop(CMainWindow *wnd, INT nShowCmd); diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 94fecfbeea7..9a5fa2a3fa5 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -6,7 +6,7 @@ * Copyright 2020 He Yang (1160386205(a)qq.com) */ -#include "rapps.h" +#include "gui.h" #include "unattended.h" #include <setupapi.h> #include <conutils.h> @@ -256,7 +256,8 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) return FALSE; } - MainWindowLoop(&db, nCmdShow); + CMainWindow wnd(&db); + MainWindowLoop(&wnd, nCmdShow); if (hMutex) CloseHandle(hMutex);

1 0

[reactos] 01/01: [NTOS:PNP] IopEnumerateDetectedDevices(): General refactoring
by Stanislav Motylkov 27 May '23

27 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85ca8afb6038d15de75f7… commit 85ca8afb6038d15de75f7af00a7f9d9035d520e1 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed May 10 20:31:10 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat May 27 12:22:57 2023 +0200 [NTOS:PNP] IopEnumerateDetectedDevices(): General refactoring CORE-18962 - Deduplicate a while-loop by adding one more recursive call. - Add IopMapDetectedDeviceId() helper function with a structure in order to reduce hardcoded constants and checks. --- ntoskrnl/io/pnpmgr/pnpmap.c | 285 ++++++++++++++++++++++---------------------- 1 file changed, 140 insertions(+), 145 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmap.c b/ntoskrnl/io/pnpmgr/pnpmap.c index 613e95a20c6..36a7f5bbedf 100644 --- a/ntoskrnl/io/pnpmgr/pnpmap.c +++ b/ntoskrnl/io/pnpmgr/pnpmap.c @@ -12,8 +12,72 @@ #define NDEBUG #include <debug.h> +/* TYPES *********************************************************************/ + +typedef struct _PNP_DETECT_IDENTIFIER_MAP +{ + PWSTR DetectId; + PWSTR PnPId; + ULONG Counter; +} PNP_DETECT_IDENTIFIER_MAP; + +/* DATA **********************************************************************/ + +static UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); +static UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); +static UNICODE_STRING ConfigurationDataU = RTL_CONSTANT_STRING(L"Configuration Data"); +static UNICODE_STRING BootConfigU = RTL_CONSTANT_STRING(L"BootConfig"); +static UNICODE_STRING LogConfU = RTL_CONSTANT_STRING(L"LogConf"); + +/* FIXME: There should be two sets of hardcoded PnP identifiers + * for the keyboard and pointer peripherals (see CORE-18963). + * They also can be parsed from a LegacyXlate sections of driver INF files. + */ + +static +PNP_DETECT_IDENTIFIER_MAP PnPMap[] = +{ + { L"SerialController", L"*PNP0501\0", 0 }, + { L"KeyboardController", L"*PNP0303\0", 0 }, +#if defined(SARCH_PC98) + { L"PointerController", L"*nEC1F00\0", 0 }, +#else + { L"PointerController", L"*PNP0F13\0", 0 }, +#endif + { L"ParallelController", L"*PNP0400\0", 0 }, + { L"FloppyDiskPeripheral", L"*PNP0700\0", 0 }, + { NULL, NULL, 0 } +}; + /* FUNCTIONS *****************************************************************/ +static +CODE_SEG("INIT") +PWSTR +IopMapDetectedDeviceId( + _In_ PUNICODE_STRING DetectId, + _Out_ PULONG DeviceIndex) +{ + ULONG i; + UNICODE_STRING CmpId; + + if (!DetectId) + return NULL; + + for (i = 0; PnPMap[i].DetectId; i++) + { + RtlInitUnicodeString(&CmpId, PnPMap[i].DetectId); + + if (RtlCompareUnicodeString(DetectId, &CmpId, FALSE) == 0) + { + *DeviceIndex = PnPMap[i].Counter++; + break; + } + } + + return PnPMap[i].PnPId; +} + static CODE_SEG("INIT") NTSTATUS @@ -22,62 +86,18 @@ IopEnumerateDetectedDevices( _In_opt_ PUNICODE_STRING RelativePath, _In_ HANDLE hRootKey, _In_ BOOLEAN EnumerateSubKeys, + _In_opt_ PCM_FULL_RESOURCE_DESCRIPTOR BootResources, + _In_opt_ ULONG BootResourcesLength, _In_ PCM_FULL_RESOURCE_DESCRIPTOR ParentBootResources, _In_ ULONG ParentBootResourcesLength) { - UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); - UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); - UNICODE_STRING ConfigurationDataU = RTL_CONSTANT_STRING(L"Configuration Data"); - UNICODE_STRING BootConfigU = RTL_CONSTANT_STRING(L"BootConfig"); - UNICODE_STRING LogConfU = RTL_CONSTANT_STRING(L"LogConf"); - OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDevicesKey = NULL; - HANDLE hDeviceKey = NULL; - HANDLE hLevel1Key, hLevel2Key = NULL, hLogConf; - UNICODE_STRING Level2NameU; - WCHAR Level2Name[5]; - ULONG IndexDevice = 0; - ULONG IndexSubKey; + ULONG KeyIndex = 0; PKEY_BASIC_INFORMATION pDeviceInformation = NULL; ULONG DeviceInfoLength = sizeof(KEY_BASIC_INFORMATION) + 50 * sizeof(WCHAR); - PKEY_VALUE_PARTIAL_INFORMATION pValueInformation = NULL; - ULONG ValueInfoLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 50 * sizeof(WCHAR); - UNICODE_STRING DeviceName, ValueName; - ULONG RequiredSize; - PCM_FULL_RESOURCE_DESCRIPTOR BootResources = NULL; - ULONG BootResourcesLength; NTSTATUS Status; - const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); - UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); - static ULONG DeviceIndexSerial = 0; - const UNICODE_STRING IdentifierKeyboard = RTL_CONSTANT_STRING(L"KeyboardController"); - UNICODE_STRING HardwareIdKeyboard = RTL_CONSTANT_STRING(L"*PNP0303\0"); - static ULONG DeviceIndexKeyboard = 0; - const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); - /* FIXME: IopEnumerateDetectedDevices() should be rewritten. - * The PnP identifiers can either be hardcoded or parsed from a LegacyXlate - * sections of driver INF files. - */ -#if defined(SARCH_PC98) - UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*nEC1F00\0"); -#else - UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); -#endif - static ULONG DeviceIndexMouse = 0; - const UNICODE_STRING IdentifierParallel = RTL_CONSTANT_STRING(L"ParallelController"); - UNICODE_STRING HardwareIdParallel = RTL_CONSTANT_STRING(L"*PNP0400\0"); - static ULONG DeviceIndexParallel = 0; - const UNICODE_STRING IdentifierFloppy = RTL_CONSTANT_STRING(L"FloppyDiskPeripheral"); - UNICODE_STRING HardwareIdFloppy = RTL_CONSTANT_STRING(L"*PNP0700\0"); - static ULONG DeviceIndexFloppy = 0; - UNICODE_STRING HardwareIdKey; - PUNICODE_STRING pHardwareId; - ULONG DeviceIndex = 0; - PUCHAR CmResourceList; - ULONG ListCount; - - if (RelativePath) + if (!BootResources && RelativePath) { Status = IopOpenRegistryKeyEx(&hDevicesKey, hBaseKey, RelativePath, KEY_ENUMERATE_SUB_KEYS); @@ -98,18 +118,24 @@ IopEnumerateDetectedDevices( goto cleanup; } - pValueInformation = ExAllocatePool(PagedPool, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - while (TRUE) { + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hDeviceKey = NULL; + HANDLE hLevel1Key, hLevel2Key = NULL, hLogConf; + UNICODE_STRING Level2NameU; + WCHAR Level2Name[5]; + PKEY_VALUE_PARTIAL_INFORMATION pValueInformation = NULL; + ULONG ValueInfoLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 50 * sizeof(WCHAR); + UNICODE_STRING DeviceName, ValueName; + ULONG RequiredSize; + + UNICODE_STRING HardwareIdKey; + PWSTR pHardwareId; + ULONG DeviceIndex = 0; + Status = ZwEnumerateKey(hDevicesKey, - IndexDevice, + KeyIndex, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, @@ -130,7 +156,12 @@ IopEnumerateDetectedDevices( goto cleanup; } - Status = ZwEnumerateKey(hDevicesKey, IndexDevice, KeyBasicInformation, pDeviceInformation, DeviceInfoLength, &RequiredSize); + Status = ZwEnumerateKey(hDevicesKey, + KeyIndex, + KeyBasicInformation, + pDeviceInformation, + DeviceInfoLength, + &RequiredSize); } if (!NT_SUCCESS(Status)) @@ -138,12 +169,38 @@ IopEnumerateDetectedDevices( DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); goto cleanup; } - IndexDevice++; + KeyIndex++; /* Open device key */ DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; + if (BootResources) + { + Status = IopEnumerateDetectedDevices( + hDevicesKey, + &DeviceName, + hRootKey, + TRUE, + NULL, + 0, + BootResources, + BootResourcesLength); + + if (!NT_SUCCESS(Status)) + goto cleanup; + + continue; + } + + pValueInformation = ExAllocatePool(PagedPool, ValueInfoLength); + if (!pValueInformation) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + Status = IopOpenRegistryKeyEx(&hDeviceKey, hDevicesKey, &DeviceName, KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0)); @@ -247,60 +304,18 @@ IopEnumerateDetectedDevices( if (EnumerateSubKeys) { - IndexSubKey = 0; + Status = IopEnumerateDetectedDevices( + hDeviceKey, + RelativePath, + hRootKey, + TRUE, + BootResources, + BootResourcesLength, + ParentBootResources, + ParentBootResourcesLength); - while (TRUE) - { - Status = ZwEnumerateKey(hDeviceKey, - IndexSubKey, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - ExFreePool(pDeviceInformation); - DeviceInfoLength = RequiredSize; - pDeviceInformation = ExAllocatePool(PagedPool, DeviceInfoLength); - - if (!pDeviceInformation) - { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - Status = ZwEnumerateKey(hDeviceKey, - IndexSubKey, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - IndexSubKey++; - DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; - DeviceName.Buffer = pDeviceInformation->Name; - - Status = IopEnumerateDetectedDevices( - hDeviceKey, - &DeviceName, - hRootKey, - TRUE, - BootResources, - BootResourcesLength); - - if (!NT_SUCCESS(Status)) - goto cleanup; - } + if (!NT_SUCCESS(Status)) + goto cleanup; } /* Read identifier */ @@ -355,32 +370,8 @@ IopEnumerateDetectedDevices( ValueName.Length -= sizeof(WCHAR); } - if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierSerial, FALSE) == 0) - { - pHardwareId = &HardwareIdSerial; - DeviceIndex = DeviceIndexSerial++; - } - else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierKeyboard, FALSE) == 0) - { - pHardwareId = &HardwareIdKeyboard; - DeviceIndex = DeviceIndexKeyboard++; - } - else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierMouse, FALSE) == 0) - { - pHardwareId = &HardwareIdMouse; - DeviceIndex = DeviceIndexMouse++; - } - else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierParallel, FALSE) == 0) - { - pHardwareId = &HardwareIdParallel; - DeviceIndex = DeviceIndexParallel++; - } - else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierFloppy, FALSE) == 0) - { - pHardwareId = &HardwareIdFloppy; - DeviceIndex = DeviceIndexFloppy++; - } - else + pHardwareId = IopMapDetectedDeviceId(RelativePath, &DeviceIndex); + if (!pHardwareId) { /* Unknown key path */ DPRINT("Unknown key path '%wZ'\n", RelativePath); @@ -388,8 +379,9 @@ IopEnumerateDetectedDevices( } /* Prepare hardware id key (hardware id value without final \0) */ - HardwareIdKey = *pHardwareId; - HardwareIdKey.Length -= sizeof(UNICODE_NULL); + HardwareIdKey.Length = wcslen(pHardwareId) * sizeof(WCHAR); + HardwareIdKey.MaximumLength = HardwareIdKey.Length + sizeof(UNICODE_NULL) * 2; + HardwareIdKey.Buffer = pHardwareId; /* Add the detected device to Root key */ InitializeObjectAttributes(&ObjectAttributes, &HardwareIdKey, OBJ_KERNEL_HANDLE, hRootKey, NULL); @@ -430,7 +422,7 @@ IopEnumerateDetectedDevices( } DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, &HardwareIdKey); - Status = ZwSetValueKey(hLevel2Key, &HardwareIDU, 0, REG_MULTI_SZ, pHardwareId->Buffer, pHardwareId->MaximumLength); + Status = ZwSetValueKey(hLevel2Key, &HardwareIDU, 0, REG_MULTI_SZ, HardwareIdKey.Buffer, HardwareIdKey.MaximumLength); if (!NT_SUCCESS(Status)) { @@ -460,6 +452,9 @@ IopEnumerateDetectedDevices( if (BootResourcesLength >= sizeof(CM_FULL_RESOURCE_DESCRIPTOR)) { + PUCHAR CmResourceList; + ULONG ListCount; + CmResourceList = ExAllocatePool(PagedPool, BootResourcesLength + sizeof(ULONG)); if (!CmResourceList) { @@ -515,6 +510,8 @@ nextdevice: ZwClose(hDeviceKey); hDeviceKey = NULL; } + if (pValueInformation) + ExFreePool(pValueInformation); } Status = STATUS_SUCCESS; @@ -522,12 +519,8 @@ nextdevice: cleanup: if (hDevicesKey && hDevicesKey != hBaseKey) ZwClose(hDevicesKey); - if (hDeviceKey) - ZwClose(hDeviceKey); if (pDeviceInformation) ExFreePool(pDeviceInformation); - if (pValueInformation) - ExFreePool(pValueInformation); return Status; } @@ -647,6 +640,8 @@ IopUpdateRootKey(VOID) hRoot, TRUE, NULL, + 0, + NULL, 0); ZwClose(hEnum); }

1 0

[reactos] 01/01: [DXDIAG] Fix inconsistent WS_DISABLED style (#5303)
by Nikita Piatygorskiy 26 May '23

26 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eb67000a5d6b6eaa3efa… commit 2eb67000a5d6b6eaa3efaaed8176a7a3e22c6d50 Author: Nikita Piatygorskiy <56937666+NikitaP2001(a)users.noreply.github.com> AuthorDate: Fri May 26 19:47:06 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 26 18:47:06 2023 +0200 [DXDIAG] Fix inconsistent WS_DISABLED style (#5303) Make resource files consistent among different languages. CORE-18903 Add the WS_DISABLED flag for IDC_BUTTON_HELP and IDC_BUTTON_SAVE_INFO, in those places where it was not done. The actions corresponding to those buttons are currently unimplemented, this is why they were disabled. Signed-off-by: Nikita Piatygorskiy <generalhammond16(a)gmail.com> --- base/applications/dxdiag/lang/es-ES.rc | 4 ++-- base/applications/dxdiag/lang/ko-KR.rc | 4 ++-- base/applications/dxdiag/lang/nl-NL.rc | 4 ++-- base/applications/dxdiag/lang/no-NO.rc | 4 ++-- base/applications/dxdiag/lang/pl-PL.rc | 4 ++-- base/applications/dxdiag/lang/pt-BR.rc | 4 ++-- base/applications/dxdiag/lang/ro-RO.rc | 4 ++-- base/applications/dxdiag/lang/sk-SK.rc | 4 ++-- base/applications/dxdiag/lang/sq-AL.rc | 4 ++-- base/applications/dxdiag/lang/sv-SE.rc | 4 ++-- base/applications/dxdiag/lang/tr-TR.rc | 4 ++-- base/applications/dxdiag/lang/uk-UA.rc | 4 ++-- base/applications/dxdiag/lang/zh-CN.rc | 4 ++-- base/applications/dxdiag/lang/zh-HK.rc | 4 ++-- base/applications/dxdiag/lang/zh-TW.rc | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/base/applications/dxdiag/lang/es-ES.rc b/base/applications/dxdiag/lang/es-ES.rc index b6d11687030..3fd4f8aa1f9 100644 --- a/base/applications/dxdiag/lang/es-ES.rc +++ b/base/applications/dxdiag/lang/es-ES.rc @@ -9,9 +9,9 @@ CAPTION "Programa de diagnóstico de ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "Ay&uda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ay&uda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Siguiente página", IDC_BUTTON_NEXT, 107, 260, 80, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Guardar toda la información...", IDC_BUTTON_SAVE_INFO, 201, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Guardar toda la información...", IDC_BUTTON_SAVE_INFO, 201, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Sa&lir", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/ko-KR.rc b/base/applications/dxdiag/lang/ko-KR.rc index 7f6fcd2a7ef..12040555cc3 100644 --- a/base/applications/dxdiag/lang/ko-KR.rc +++ b/base/applications/dxdiag/lang/ko-KR.rc @@ -9,9 +9,9 @@ CAPTION "ReactX 분석 도구" FONT 9, "굴림" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "도움말(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "도움말(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "다음 장(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "모든 정보 저장(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "모든 정보 저장(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "종료(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/nl-NL.rc b/base/applications/dxdiag/lang/nl-NL.rc index aac48ec27b6..00435ad9ee5 100644 --- a/base/applications/dxdiag/lang/nl-NL.rc +++ b/base/applications/dxdiag/lang/nl-NL.rc @@ -7,9 +7,9 @@ CAPTION "Diagnostisch hulpprogramma voor ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Volgende Pagina", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Alle gegevens opslaan...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Alle gegevens opslaan...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Afsluiten", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/no-NO.rc b/base/applications/dxdiag/lang/no-NO.rc index 4d2f99e5a81..0ece30c1906 100644 --- a/base/applications/dxdiag/lang/no-NO.rc +++ b/base/applications/dxdiag/lang/no-NO.rc @@ -7,9 +7,9 @@ CAPTION "ReactX-diagnose program" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Neste side", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Lagre alt informasjon...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Lagre alt informasjon...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Avslutt", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/pl-PL.rc b/base/applications/dxdiag/lang/pl-PL.rc index 103df0c34c0..c16e0dcfba0 100644 --- a/base/applications/dxdiag/lang/pl-PL.rc +++ b/base/applications/dxdiag/lang/pl-PL.rc @@ -16,9 +16,9 @@ CAPTION "Narzędzie diagnostyki ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Następna", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Wyjście", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/pt-BR.rc b/base/applications/dxdiag/lang/pt-BR.rc index fe6d7d12bd8..5966a100b4f 100644 --- a/base/applications/dxdiag/lang/pt-BR.rc +++ b/base/applications/dxdiag/lang/pt-BR.rc @@ -9,9 +9,9 @@ CAPTION "Programa de Diagnóstico ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Ajuda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ajuda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Próxima página", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Sal&var Informações...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Sal&var Informações...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Sai&r", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index f9c28313517..741dd3cb76b 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -13,9 +13,9 @@ CAPTION "Diagnostic ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Păstrare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Păstrare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/sk-SK.rc b/base/applications/dxdiag/lang/sk-SK.rc index 3aff7738377..9d760729ad3 100644 --- a/base/applications/dxdiag/lang/sk-SK.rc +++ b/base/applications/dxdiag/lang/sk-SK.rc @@ -12,9 +12,9 @@ CAPTION "ReactX - diagnostický program" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Pomocník", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Pomocník", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "Ďalšia stra&na", IDC_BUTTON_NEXT, 250, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Uložiť všetky informácie...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Uložiť všetky informácie...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Skončiť", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/sq-AL.rc b/base/applications/dxdiag/lang/sq-AL.rc index 7ad7c4f0a27..50e9e132618 100644 --- a/base/applications/dxdiag/lang/sq-AL.rc +++ b/base/applications/dxdiag/lang/sq-AL.rc @@ -11,9 +11,9 @@ CAPTION "ReactX-Programi i diaknostikimit" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Ndihmë", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ndihmë", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Faqja tjetër", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ruaj të gjithë informacionet...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ruaj të gjithë informacionet...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Dil", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/sv-SE.rc b/base/applications/dxdiag/lang/sv-SE.rc index 9829ecf5fbb..cd5b991e5f4 100644 --- a/base/applications/dxdiag/lang/sv-SE.rc +++ b/base/applications/dxdiag/lang/sv-SE.rc @@ -14,9 +14,9 @@ CAPTION "ReactX-diagnos program" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Hjälp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hjälp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Nästa sida", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Spara all information...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Spara all information...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Avsluta", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/tr-TR.rc b/base/applications/dxdiag/lang/tr-TR.rc index af8c70728cd..a77693aedce 100644 --- a/base/applications/dxdiag/lang/tr-TR.rc +++ b/base/applications/dxdiag/lang/tr-TR.rc @@ -10,9 +10,9 @@ CAPTION "ReactX Tanı Aracı" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Yardım", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Yardım", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "S&onraki Sayfa", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Tüm Bilgileri Sakla...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Tüm Bilgileri Sakla...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Çıkış", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/uk-UA.rc b/base/applications/dxdiag/lang/uk-UA.rc index 8c1b15c0b45..ed4d6b9cd88 100644 --- a/base/applications/dxdiag/lang/uk-UA.rc +++ b/base/applications/dxdiag/lang/uk-UA.rc @@ -15,9 +15,9 @@ CAPTION "Засіб діагностики ReactX" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "&Довідка", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Довідка", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "&Наступна сторінка", IDC_BUTTON_NEXT, 203, 260, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Зберегти всю інформацію...", IDC_BUTTON_SAVE_INFO, 301, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Зберегти всю інформацію...", IDC_BUTTON_SAVE_INFO, 301, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "&Вихід", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/zh-CN.rc b/base/applications/dxdiag/lang/zh-CN.rc index 3febb59f404..bd49820f630 100644 --- a/base/applications/dxdiag/lang/zh-CN.rc +++ b/base/applications/dxdiag/lang/zh-CN.rc @@ -16,9 +16,9 @@ CAPTION "ReactX 诊断工具" FONT 9, "宋体" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "帮助(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "帮助(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "下一页(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "保存所有信息(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "保存所有信息(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "退出(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/zh-HK.rc b/base/applications/dxdiag/lang/zh-HK.rc index 26689193647..d2bbb4e5644 100644 --- a/base/applications/dxdiag/lang/zh-HK.rc +++ b/base/applications/dxdiag/lang/zh-HK.rc @@ -15,9 +15,9 @@ CAPTION "ReactX 診斷程式" FONT 9, "新細明體" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "説明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "説明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "下一頁(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "結束(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END diff --git a/base/applications/dxdiag/lang/zh-TW.rc b/base/applications/dxdiag/lang/zh-TW.rc index ba7c6810ccc..b51d51af1ab 100644 --- a/base/applications/dxdiag/lang/zh-TW.rc +++ b/base/applications/dxdiag/lang/zh-TW.rc @@ -15,9 +15,9 @@ CAPTION "ReactX 診斷程式" FONT 9, "新細明體" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 - PUSHBUTTON "說明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "說明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "下一頁(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED PUSHBUTTON "結束(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

[reactos] 02/02: [WIN32K] Fix WindowExtra for some server-side classes
by Timo Kreuzer 25 May '23

25 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b8c1b0dac33e5a5067f0… commit 2b8c1b0dac33e5a5067f0894670eba2c9e0b24be Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri May 12 16:02:00 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu May 25 18:56:02 2023 +0300 [WIN32K] Fix WindowExtra for some server-side classes These values are based on apitest results. --- win32ss/user/ntuser/class.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/user/ntuser/class.c b/win32ss/user/ntuser/class.c index 9210852dca7..90746db3da2 100644 --- a/win32ss/user/ntuser/class.c +++ b/win32ss/user/ntuser/class.c @@ -34,7 +34,7 @@ static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom); REGISTER_SYSCLASS DefaultServerClasses[] = { - { ((PWSTR)((ULONG_PTR)(WORD)(0x8001))), + { ((PWSTR)WC_DESKTOP), CS_GLOBALCLASS|CS_DBLCLKS, NULL, // Use User32 procs sizeof(ULONG)*2, @@ -43,19 +43,19 @@ REGISTER_SYSCLASS DefaultServerClasses[] = FNID_DESKTOP, ICLS_DESKTOP }, - { ((PWSTR)((ULONG_PTR)(WORD)(0x8003))), + { ((PWSTR)WC_SWITCH), CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS, NULL, // Use User32 procs - sizeof(LONG), + sizeof(LONG_PTR), // See user32_apitest GetClassInfo, 0: Pointer to ALTTABINFO (HICON)OCR_NORMAL, NULL, FNID_SWITCH, ICLS_SWITCH }, - { ((PWSTR)((ULONG_PTR)(WORD)(0x8000))), + { ((PWSTR)WC_MENU), CS_DBLCLKS|CS_SAVEBITS|CS_DROPSHADOW, NULL, // Use User32 procs - sizeof(LONG), + 16, // See user32_apitest GetClassInfo, PopupMenuWndProcW (HICON)OCR_NORMAL, (HBRUSH)(COLOR_MENU + 1), FNID_MENU, @@ -81,7 +81,7 @@ REGISTER_SYSCLASS DefaultServerClasses[] = ICLS_TOOLTIPS }, #endif - { ((PWSTR)((ULONG_PTR)(WORD)(0x8004))), // IconTitle is here for now... + { ((PWSTR)WC_ICONTITLE), // IconTitle is here for now... 0, NULL, // Use User32 procs 0,

1 0

[reactos] 01/02: [USER32] Fix SetWindowWord/Long
by Timo Kreuzer 25 May '23

25 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05cd3406e7ae5040497fc… commit 05cd3406e7ae5040497fc517baa81663802ebc2f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri May 12 15:55:47 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu May 25 18:56:02 2023 +0300 [USER32] Fix SetWindowWord/Long These must use the corresponding NtUserSetWindowWord/Long function and cannot use NtUserSetWindowLongPtr, otherwise the function can fail, when there is only space for a LONG, but not for a LONG_PTR at the specified offset. --- win32ss/user/ntuser/window.c | 2 +- win32ss/user/user32/windows/class.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 7bc57864b78..b4ab2d6e69f 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -4148,7 +4148,7 @@ NtUserSetWindowWord(HWND hWnd, INT Index, WORD NewValue) if ((ULONG)Index > (Window->cbwndExtra - sizeof(WORD))) { - EngSetLastError(ERROR_INVALID_PARAMETER); + EngSetLastError(ERROR_INVALID_INDEX); RETURN( 0); } diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index 6abaf350bc1..63c84a46e60 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1666,7 +1666,8 @@ SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) } break; } - return (WORD)NtUserSetWindowLongPtr(hWnd, nIndex, wNewWord, FALSE); + /* DO NOT USE NtUserSetWindowLong(Ptr)! */ + return NtUserSetWindowWord(hWnd, nIndex, wNewWord); } /* @@ -1680,7 +1681,8 @@ SetWindowLongA( int nIndex, LONG dwNewLong) { - return (LONG)NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, TRUE); + /* DO NOT USE NtUserSetWindowLongPtr! */ + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, TRUE); } /* @@ -1693,7 +1695,8 @@ SetWindowLongW( int nIndex, LONG dwNewLong) { - return (LONG)NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, FALSE); + /* DO NOT USE NtUserSetWindowLongPtr! */ + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); } #ifdef _WIN64

1 0

[reactos] 01/01: [SHELL32] Revert CDefView::FillFileMenu (#5278)
by Katayama Hirofumi MZ 23 May '23

23 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fa4edebd9125b9ca7a42… commit 0fa4edebd9125b9ca7a4256edbea7675e2152c7e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue May 23 17:38:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 23 17:38:12 2023 +0900 [SHELL32] Revert CDefView::FillFileMenu (#5278) CORE-9467, CORE-18429, CORE-11797 --- dll/win32/shell32/CDefView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 7cf9160df58..880afa6e457 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1357,7 +1357,7 @@ HRESULT CDefView::FillFileMenu() m_pFileMenu.Release(); } /* Store the context menu in m_pFileMenu and keep it in order to invoke the selected command later on */ - HRESULT hr = GetItemObject((m_cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND), IID_PPV_ARG(IContextMenu, &m_pFileMenu)); + HRESULT hr = GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IContextMenu, &m_pFileMenu)); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

[reactos] 01/01: [RAPPS] Update Russian (ru-RU) translation
by Stanislav Motylkov 21 May '23

21 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=634415caceee6de005892… commit 634415caceee6de00589247ff961209aadf332e9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun May 21 23:24:05 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun May 21 23:24:05 2023 +0300 [RAPPS] Update Russian (ru-RU) translation --- base/applications/rapps/lang/ru-RU.rc | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 1bcfdc80fc8..97d8b419148 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -66,10 +66,10 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "В&ыбрать", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Удалять инсталляторы программ после установки", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - CONTROL "Use default", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 - CONTROL "Specified source", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 - EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Источник ПО", -1, 4, 118, 240, 46 + CONTROL "По умолчанию", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 81, 10 + CONTROL "Указанный источник", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 81, 10 + EDITTEXT IDC_SOURCE_URL, 103, 147, 134, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Прокси", -1, 4, 166, 240, 76 CONTROL "Системные настройки прокси", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 CONTROL "Без прокси", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 @@ -141,7 +141,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nСтрока для удаления: " IDS_INFO_MODIFYPATH "\nСтрока для изменения: " IDS_INFO_INSTALLDATE "\nДата установки: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nНазвание пакета: " END STRINGTABLE @@ -194,14 +194,14 @@ BEGIN IDS_APPLICATIONS "Приложения" IDS_CHOOSE_FOLDER_TEXT "Выберите папку, которая будет использоваться для загрузки программ:" IDS_CHOOSE_FOLDER_ERROR "Указанная вами папка не существует. Создать?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Указанный вами URL недействителен или не поддерживается. Пожалуйста, исправьте его!" IDS_APP_REG_REMOVE "Вы действительно хотите удалить данные об установленной программе из реестра?" IDS_INFORMATION "Информация" IDS_UNABLE_TO_DOWNLOAD "Не удалось скачать приложение! Не найден адрес!" IDS_UNABLE_TO_DOWNLOAD2 "Не удалось скачать приложение! Проверьте подключение к сети Интернет!" IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!" IDS_UNABLE_TO_INSTALL "Не удалось завершить установку!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" + IDS_UNABLE_TO_QUERY_CERT "Не удалось получить информацию о сертификате.\n\nВы хотите продолжить в любом случае?" IDS_INTEG_CHECK_TITLE "Проверка целостности приложения…" IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется." IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет." @@ -210,11 +210,11 @@ BEGIN IDS_INSTALL_SELECTED "Установить выбранное" IDS_SELECTEDFORINST "Выбрано для установки" IDS_MISMATCH_CERT_INFO "Используемый сертификат не опознан:\nНазначение: %s\nВыдан: %s\nВы хотите продолжить в любом случае?" - IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "Details" - IDS_APP_DISPLAY_LIST "List" - IDS_APP_DISPLAY_TILE "Tile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_UNABLE_PATH "Неправильный формат пути." + IDS_APP_DISPLAY_DETAILS "Таблица" + IDS_APP_DISPLAY_LIST "Список" + IDS_APP_DISPLAY_TILE "Плитка" + IDS_NO_SEARCH_RESULTS "Ничего не найдено" END STRINGTABLE @@ -250,17 +250,17 @@ STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "База данных приложений" IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Обновление базы данных…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Обновление базы данных… (Неофициальный источник)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Использование: " + IDS_CMD_NEED_PACKAGE_NAME "Ошибка: для опции %1 нужно одно или несколько имён пакетов.\n" + IDS_CMD_NEED_FILE_NAME "Ошибка: для опции %1 нужно имя файла.\n" + IDS_CMD_NEED_PARAMS "Ошибка: для опции %1 нужен один или более параметров.\n" + IDS_CMD_INVALID_OPTION "Ошибка: Указан неизвестный или недопустимый параметр командной строки.\n" + IDS_CMD_FIND_RESULT_FOR "Результаты поиска для %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Не удалось найти пакет %1.\n" + IDS_CMD_PACKAGE_INFO "Информация о пакете %1:\n" END

1 0

[reactos] 02/02: [USER32] RegisterClassExWOWW/ExA: NULL or IS_ATOM class are treated the same. (#5291)
by Hermès Bélusca-Maïto 21 May '23

21 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44e1d875963adf4521790… commit 44e1d875963adf4521790b36229950175c5af213 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 18 22:47:26 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 21 19:35:19 2023 +0200 [USER32] RegisterClassExWOWW/ExA: NULL or IS_ATOM class are treated the same. (#5291) CORE-18978 Fixes NULL pointer access when e.g. class.lpszClassName == NULL and the class is registered. The RegisterClass(ExA/W/...) should return 0 instead of throwing an invalid access exception. However, providing an invalid pointer will trigger a crash. --- win32ss/user/user32/windows/class.c | 57 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index df11d1692f1..6abaf350bc1 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1310,32 +1310,28 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx, RtlCopyMemory(&WndClass, lpwcx, sizeof(*lpwcx)); RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0); - if (WndClass.lpszMenuName != NULL) + if (!IS_INTRESOURCE(WndClass.lpszMenuName)) { - if (!IS_INTRESOURCE(WndClass.lpszMenuName)) + if (WndClass.lpszMenuName[0]) { - if (WndClass.lpszMenuName[0]) - { - RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName); - RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE); - } - } - else - { - MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; - AnsiMenuName.Buffer = (PCHAR)WndClass.lpszMenuName; + RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName); + RtlUnicodeStringToAnsiString(&AnsiMenuName, &MenuName, TRUE); } } + else + { + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + AnsiMenuName.Buffer = (PCHAR)WndClass.lpszMenuName; + } - if (IS_ATOM(WndClass.lpszClassName)) + if (WndClass.lpszClassName && !IS_ATOM(WndClass.lpszClassName)) { - ClassName.Length = - ClassName.MaximumLength = 0; - ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; + RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } else { - RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); + ClassName.Length = ClassName.MaximumLength = 0; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; } ClassVersion = ClassName; @@ -1373,35 +1369,36 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx, ATOM WINAPI RegisterClassExA(CONST WNDCLASSEXA *lpwcx) { - RTL_ATOM Atom; + ATOM Atom; WNDCLASSEXW WndClass; WCHAR mname[MAX_BUFFER_LEN]; WCHAR cname[MAX_BUFFER_LEN]; + C_ASSERT(sizeof(WndClass) == sizeof(*lpwcx)); + RtlCopyMemory(&WndClass, lpwcx, sizeof(*lpwcx)); - if (WndClass.lpszMenuName != NULL) + if (WndClass.lpszMenuName && !IS_INTRESOURCE(WndClass.lpszMenuName)) { - if (!IS_INTRESOURCE(WndClass.lpszMenuName)) + if (WndClass.lpszMenuName[0]) { - if (WndClass.lpszMenuName[0]) - { - if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszMenuName, -1, mname, MAX_ATOM_LEN + 1 )) return 0; + if (!MultiByteToWideChar(CP_ACP, 0, lpwcx->lpszMenuName, -1, mname, MAX_ATOM_LEN + 1 )) + return 0; - WndClass.lpszMenuName = mname; - } + WndClass.lpszMenuName = mname; } } - if (!IS_ATOM(WndClass.lpszClassName)) + if (WndClass.lpszClassName && !IS_ATOM(WndClass.lpszClassName)) { - if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszClassName, -1, cname, MAX_ATOM_LEN + 1 )) return 0; + if (!MultiByteToWideChar(CP_ACP, 0, lpwcx->lpszClassName, -1, cname, MAX_ATOM_LEN + 1 )) + return 0; WndClass.lpszClassName = cname; } Atom = RegisterClassExWOWW(&WndClass, - 0, + NULL, 0, CSF_ANSIPROC, TRUE); @@ -1410,7 +1407,7 @@ RegisterClassExA(CONST WNDCLASSEXA *lpwcx) Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); - return (ATOM)Atom; + return Atom; } /* @@ -1421,7 +1418,7 @@ RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { ATOM Atom; - Atom = RegisterClassExWOWW((WNDCLASSEXW *)lpwcx, 0, 0, 0, TRUE); + Atom = RegisterClassExWOWW((WNDCLASSEXW *)lpwcx, NULL, 0, 0, TRUE); TRACE("W atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,

1 0

[reactos] 01/02: [USER32] Minor formatting and dead-code removal.
by Hermès Bélusca-Maïto 21 May '23

21 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f172f98a1061bbfe6c652… commit f172f98a1061bbfe6c652bd56be0b109b415462f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu May 18 22:42:21 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 21 19:28:53 2023 +0200 [USER32] Minor formatting and dead-code removal. Remove dead code CreateSmallIcon from commit e0968c78 (r18764); see also b243445c (r60592). --- win32ss/user/user32/windows/class.c | 229 ++++++------------------------------ 1 file changed, 34 insertions(+), 195 deletions(-) diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index 95b9c262315..df11d1692f1 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -97,7 +97,7 @@ ClassNameToVersion( WCHAR SectionNameBuf[MAX_PATH] = {0}; ACTCTX_SECTION_KEYED_DATA KeyedData = { sizeof(KeyedData) }; - if(!lpszClass) + if (!lpszClass) { ERR("Null class given !\n"); return NULL; @@ -236,7 +236,7 @@ VersionRegisterClass( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Got exception while trying to call RegisterClassNameW!\n"); + ERR("Got exception while trying to call RegisterClassNameW!\n"); } _SEH2_END @@ -725,7 +725,7 @@ IntGetClassLongA(PWND Wnd, PCLS Class, int nIndex) } static ULONG_PTR FASTCALL -IntGetClassLongW (PWND Wnd, PCLS Class, int nIndex) +IntGetClassLongW(PWND Wnd, PCLS Class, int nIndex) { ULONG_PTR Ret = 0; @@ -858,7 +858,7 @@ GetClassLongA(HWND hWnd, int nIndex) * @implemented */ DWORD WINAPI -GetClassLongW ( HWND hWnd, int nIndex ) +GetClassLongW(HWND hWnd, int nIndex) { PWND Wnd; PCLS Class; @@ -1258,157 +1258,6 @@ RealGetWindowClassA( return len; } -/* - * Create a small icon based on a standard icon - */ -#if 0 // Keep vintage code from revision 18764 by GvG! -static HICON -CreateSmallIcon(HICON StdIcon) -{ - HICON SmallIcon = NULL; - ICONINFO StdInfo; - int SmallIconWidth; - int SmallIconHeight; - BITMAP StdBitmapInfo; - HDC hSourceDc = NULL; - HDC hDestDc = NULL; - ICONINFO SmallInfo; - HBITMAP OldSourceBitmap = NULL; - HBITMAP OldDestBitmap = NULL; - - SmallInfo.hbmColor = NULL; - SmallInfo.hbmMask = NULL; - - /* We need something to work with... */ - if (NULL == StdIcon) - { - goto cleanup; - } - - SmallIconWidth = GetSystemMetrics(SM_CXSMICON); - SmallIconHeight = GetSystemMetrics(SM_CYSMICON); - if (! GetIconInfo(StdIcon, &StdInfo)) - { - ERR("Failed to get icon info for icon 0x%x\n", StdIcon); - goto cleanup; - } - if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo)) - { - ERR("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n", - StdIcon, StdInfo.hbmColor); - goto cleanup; - } - if (StdBitmapInfo.bmWidth == SmallIconWidth && - StdBitmapInfo.bmHeight == SmallIconHeight) - { - /* Icon already has the correct dimensions */ - return StdIcon; - } - - hSourceDc = CreateCompatibleDC(NULL); - if (NULL == hSourceDc) - { - ERR("Failed to create source DC\n"); - goto cleanup; - } - hDestDc = CreateCompatibleDC(NULL); - if (NULL == hDestDc) - { - ERR("Failed to create dest DC\n"); - goto cleanup; - } - - OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor); - if (NULL == OldSourceBitmap) - { - ERR("Failed to select source color bitmap\n"); - goto cleanup; - } - SmallInfo.hbmColor = CreateCompatibleBitmap(hSourceDc, SmallIconWidth, - SmallIconHeight); - if (NULL == SmallInfo.hbmColor) - { - ERR("Failed to create color bitmap\n"); - goto cleanup; - } - OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor); - if (NULL == OldDestBitmap) - { - ERR("Failed to select dest color bitmap\n"); - goto cleanup; - } - if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight, - hSourceDc, 0, 0, StdBitmapInfo.bmWidth, - StdBitmapInfo.bmHeight, SRCCOPY)) - { - ERR("Failed to stretch color bitmap\n"); - goto cleanup; - } - - if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask)) - { - ERR("Failed to select source mask bitmap\n"); - goto cleanup; - } - SmallInfo.hbmMask = CreateCompatibleBitmap(hSourceDc, SmallIconWidth, SmallIconHeight); - if (NULL == SmallInfo.hbmMask) - { - ERR("Failed to create mask bitmap\n"); - goto cleanup; - } - if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask)) - { - ERR("Failed to select dest mask bitmap\n"); - goto cleanup; - } - if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight, - hSourceDc, 0, 0, StdBitmapInfo.bmWidth, - StdBitmapInfo.bmHeight, SRCCOPY)) - { - ERR("Failed to stretch mask bitmap\n"); - goto cleanup; - } - - SmallInfo.fIcon = TRUE; - SmallInfo.xHotspot = SmallIconWidth / 2; - SmallInfo.yHotspot = SmallIconHeight / 2; - SmallIcon = CreateIconIndirect(&SmallInfo); - if (NULL == SmallIcon) - { - ERR("Failed to create icon\n"); - goto cleanup; - } - -cleanup: - if (NULL != SmallInfo.hbmMask) - { - DeleteObject(SmallInfo.hbmMask); - } - if (NULL != OldDestBitmap) - { - SelectObject(hDestDc, OldDestBitmap); - } - if (NULL != SmallInfo.hbmColor) - { - DeleteObject(SmallInfo.hbmColor); - } - if (NULL != hDestDc) - { - DeleteDC(hDestDc); - } - if (NULL != OldSourceBitmap) - { - SelectObject(hSourceDc, OldSourceBitmap); - } - if (NULL != hSourceDc) - { - DeleteDC(hSourceDc); - } - - return SmallIcon; -} -#endif - ATOM WINAPI RegisterClassExWOWW(WNDCLASSEXW *lpwcx, LPDWORD pdwWowData, @@ -1425,7 +1274,7 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx, ANSI_STRING AnsiMenuName; LPCWSTR lpszClsVersion; - if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || + if (lpwcx == NULL || lpwcx->cbSize != sizeof(*lpwcx) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || lpwcx->lpszClassName == NULL) { @@ -1458,13 +1307,8 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx, if (lpwcx->hInstance == NULL) ((WNDCLASSEXW*)lpwcx)->hInstance = GetModuleHandleW(NULL); - RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); -/* - if (NULL == WndClass.hIconSm) - { - WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); - } -*/ + RtlCopyMemory(&WndClass, lpwcx, sizeof(*lpwcx)); + RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0); if (WndClass.lpszMenuName != NULL) { @@ -1508,13 +1352,13 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx, clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer; clsMenuName.pusMenuName = &MenuName; - Atom = NtUserRegisterClassExWOW( &WndClass, - &ClassName, - &ClassVersion, - &clsMenuName, - fnID, - dwFlags, - pdwWowData); + Atom = NtUserRegisterClassExWOW(&WndClass, + &ClassName, + &ClassVersion, + &clsMenuName, + fnID, + dwFlags, + pdwWowData); TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, @@ -1534,7 +1378,7 @@ RegisterClassExA(CONST WNDCLASSEXA *lpwcx) WCHAR mname[MAX_BUFFER_LEN]; WCHAR cname[MAX_BUFFER_LEN]; - RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXA)); + RtlCopyMemory(&WndClass, lpwcx, sizeof(*lpwcx)); if (WndClass.lpszMenuName != NULL) { @@ -1556,11 +1400,11 @@ RegisterClassExA(CONST WNDCLASSEXA *lpwcx) WndClass.lpszClassName = cname; } - Atom = RegisterClassExWOWW( &WndClass, - 0, - 0, - CSF_ANSIPROC, - TRUE); + Atom = RegisterClassExWOWW(&WndClass, + 0, + 0, + CSF_ANSIPROC, + TRUE); TRACE("A atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, @@ -1577,7 +1421,7 @@ RegisterClassExW(CONST WNDCLASSEXW *lpwcx) { ATOM Atom; - Atom = RegisterClassExWOWW( (WNDCLASSEXW *)lpwcx, 0, 0, 0, TRUE); + Atom = RegisterClassExWOWW((WNDCLASSEXW *)lpwcx, 0, 0, 0, TRUE); TRACE("W atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, @@ -1610,7 +1454,7 @@ RegisterClassA(CONST WNDCLASSA *lpWndClass) Class.lpszMenuName = lpWndClass->lpszMenuName; Class.lpszClassName = lpWndClass->lpszClassName; - Class.cbSize = sizeof(WNDCLASSEXA); + Class.cbSize = sizeof(Class); Class.hIconSm = NULL; return RegisterClassExA(&Class); @@ -1640,7 +1484,7 @@ RegisterClassW(CONST WNDCLASSW *lpWndClass) Class.lpszMenuName = lpWndClass->lpszMenuName; Class.lpszClassName = lpWndClass->lpszClassName; - Class.cbSize = sizeof(WNDCLASSEXW); + Class.cbSize = sizeof(Class); Class.hIconSm = NULL; return RegisterClassExW(&Class); @@ -1651,9 +1495,9 @@ RegisterClassW(CONST WNDCLASSW *lpWndClass) */ DWORD WINAPI -SetClassLongA (HWND hWnd, - int nIndex, - LONG dwNewLong) +SetClassLongA(HWND hWnd, + int nIndex, + LONG dwNewLong) { PSTR lpStr = (PSTR)(ULONG_PTR)dwNewLong; UNICODE_STRING Value = {0}; @@ -1666,8 +1510,7 @@ SetClassLongA (HWND hWnd, { if (!IS_INTRESOURCE(lpStr)) { - if (!RtlCreateUnicodeStringFromAsciiz(&Value, - lpStr)) + if (!RtlCreateUnicodeStringFromAsciiz(&Value, lpStr)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -1676,7 +1519,9 @@ SetClassLongA (HWND hWnd, Allocated = TRUE; } else + { Value.Buffer = (PWSTR)lpStr; + } dwNewLong = (LONG_PTR)&Value; } @@ -1684,8 +1529,7 @@ SetClassLongA (HWND hWnd, { if (!IS_ATOM(lpStr)) { - if (!RtlCreateUnicodeStringFromAsciiz(&Value, - lpStr)) + if (!RtlCreateUnicodeStringFromAsciiz(&Value, lpStr)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -1694,7 +1538,9 @@ SetClassLongA (HWND hWnd, Allocated = TRUE; } else + { Value.Buffer = (PWSTR)lpStr; + } dwNewLong = (LONG_PTR)&Value; } @@ -1732,10 +1578,7 @@ SetClassLongW(HWND hWnd, if (nIndex == GCL_MENUNAME && lpStr != NULL) { if (!IS_INTRESOURCE(lpStr)) - { - RtlInitUnicodeString(&Value, - lpStr); - } + RtlInitUnicodeString(&Value, lpStr); else Value.Buffer = lpStr; @@ -1744,10 +1587,7 @@ SetClassLongW(HWND hWnd, else if (nIndex == GCW_ATOM && lpStr != NULL) { if (!IS_ATOM(lpStr)) - { - RtlInitUnicodeString(&Value, - lpStr); - } + RtlInitUnicodeString(&Value, lpStr); else Value.Buffer = lpStr; @@ -1931,7 +1771,6 @@ UnregisterClassA( return Ret; } - /* * @implemented */

1 0

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 May 2023