Ros-diffs

ros-diffs@reactos.org

20 participants
81109 discussions

[reactos] 01/01: [SHELL32] Strip leftover in CDefView::FillFileMenu() (#5330)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3164a0f557bdc2cc9dfd… commit d3164a0f557bdc2cc9dfd86612131f6cf180d462 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Jun 11 20:53:25 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 11 20:53:25 2023 +0200 [SHELL32] Strip leftover in CDefView::FillFileMenu() (#5330) In 0.4.14-dev-955-g 1cf564c25f532c32f9fae891f17a70e62d5c1c14 Katayama experimented with populating explorers file-menu when no object is selected. Later we found out, that none of the new entries introduced by that commit really made sense and even created duplicates. So the commit was reverted by 0.4.15-dev-6039-g 0fa4edebd9125b9ca7a4256edbea7675e2152c7e 'Revert CDefView::FillFileMenu (#5278)' CORE-18429 But it seems that not all parts were properly reverted back then, maybe because 6 lines of new code were written between the two lines in the meantime. --- dll/win32/shell32/CDefView.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 880afa6e457..ebcfa767090 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1348,8 +1348,6 @@ HRESULT CDefView::FillFileMenu() DeleteMenu(hFileMenu, i, MF_BYPOSITION); } - m_cidl = m_ListView.GetSelectedCount(); - /* In case we still have this left over, clean it up! */ if (m_pFileMenu) {

1 year, 7 months

[reactos] 01/01: [WIN32K:NTUSER] Fix an unintialized user's token variable case

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f9be539856b392b99dae… commit 0f9be539856b392b99dae3d8bdecedb0b9de44fd Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 11 00:00:03 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 11 18:14:02 2023 +0200 [WIN32K:NTUSER] Fix an unintialized user's token variable case And remove the "!NT_SUCCESS(Status)" check which is excessive, the expected status will always be STATUS_BUFFER_TOO_SMALL anyway. This should fix some compilation warnings spotted by GCC. Courtesy goes to Hermes for letting me know of these warnings. --- win32ss/user/ntuser/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/security.c b/win32ss/user/ntuser/security.c index 276d01bfe16..2ed4e1b66a0 100644 --- a/win32ss/user/ntuser/security.c +++ b/win32ss/user/ntuser/security.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS Win32k subsystem * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Security infrastructure of NTUSER component of Win32k - * COPYRIGHT: Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * COPYRIGHT: Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -170,7 +170,7 @@ IntQueryUserSecurityIdentification( _Out_ PTOKEN_USER *User) { NTSTATUS Status; - PTOKEN_USER UserToken; + PTOKEN_USER UserToken = NULL; HANDLE Token; ULONG BufferLength; @@ -196,7 +196,7 @@ IntQueryUserSecurityIdentification( NULL, 0, &BufferLength); - if (!NT_SUCCESS(Status) && Status == STATUS_BUFFER_TOO_SMALL) + if (Status == STATUS_BUFFER_TOO_SMALL) { /* * Allocate some memory for the buffer @@ -212,6 +212,12 @@ IntQueryUserSecurityIdentification( return STATUS_NO_MEMORY; } } + else if (!NT_SUCCESS(Status)) + { + ERR("IntQueryUserSecurityIdentification(): Failed to query the necessary length for the buffer (Status 0x%08lx)!\n", Status); + ZwClose(Token); + return Status; + } /* Query the user now as we have plenty of space to hold it */ Status = ZwQueryInformationToken(Token,

1 year, 7 months

[reactos] 01/01: [NTOS:PNP] Assign correct PnP IDs to the devices detected by bootloader

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d5e1591313df39d0b2a8… commit 7d5e1591313df39d0b2a81c20ab2af9e8d76252a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat May 20 15:56:52 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 11 16:19:02 2023 +0300 [NTOS:PNP] Assign correct PnP IDs to the devices detected by bootloader Based on a commit by Vadim Galyant: https://github.com/vgalnt/reactos/commit/5ef5c11e7fcca44ab31606ab762e3700f1… Also fix a minor type conversion warning. CORE-18963 CORE-17977 Co-authored-by: Vadim Galyant <vgal(a)rambler.ru> --- boot/bootdata/hivesys.inf | 3 ++ boot/bootdata/txtsetup.sif | 1 + media/inf/keyboard.inf | 23 +++------- ntoskrnl/io/pnpmgr/pnpmap.c | 105 ++++++++++++++++++++++++++++++++++++-------- 4 files changed, 96 insertions(+), 36 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index b67028d6423..418b568f5e2 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -98,6 +98,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Clas HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0303","Service",0x00000000,"i8042prt" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0303","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP030B","Service",0x00000000,"i8042prt" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP030B","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F0E","Service",0x00000000,"i8042prt" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0F0E","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 96c55492e38..ed359f99bbe 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -176,6 +176,7 @@ GenDisk = disk,{4D36E967-E325-11CE-BFC1-08002BE10318} USB\Class_03 = hidusb GENERIC_HID_DEVICE = hidusb *PNP0303 = i8042prt,{4D36E96B-E325-11CE-BFC1-08002BE10318} +*PNP030B = i8042prt,{4D36E96B-E325-11CE-BFC1-08002BE10318} *nEC1F00 = inport,{4D36E96F-E325-11CE-BFC1-08002BE10318} ROOT\SWENUM = swenum diff --git a/media/inf/keyboard.inf b/media/inf/keyboard.inf index 05c78c1c9ce..87defce7a04 100644 --- a/media/inf/keyboard.inf +++ b/media/inf/keyboard.inf @@ -29,6 +29,7 @@ HKR, , UpperFilters, 0x00010000, "kbdclass" [StdMfg] %*PNP0303.DeviceDesc% = PS2_Inst.NT,*PNP0303 +%*PNP030B.DeviceDesc% = PS2_Inst.NT,*PNP030B %HID.KeyboardDevice% = HID_Keyboard_Inst,,HID_DEVICE_SYSTEM_KEYBOARD ;------------------------------ HID DRIVER ------------------------------ @@ -105,7 +106,8 @@ ReactOS = "ReactOS Project" KeyboardClassName = "Keyboards" StdMfg = "(Standard keyboards)" -*PNP0303.DeviceDesc = "IBM PC/AT keyboard" +*PNP0303.DeviceDesc = "Standard 101/102-key or Microsoft Natural PS/2 keyboard" +*PNP030B.DeviceDesc = "PC/AT Enhanced PS/2 keyboard (101/102-key)" LocationOverride = "plugged in to keyboard port" HID.KeyboardDevice = "HID-Keyboard" @@ -113,7 +115,6 @@ HID.KeyboardDevice = "HID-Keyboard" KeyboardClassName = "鍵盤" StdMfg = "(標準鍵盤)" -*PNP0303.DeviceDesc = "IBM PC/AT 鍵盤" HID.KeyboardDevice = "HID 鍵盤" [Strings.0405] @@ -128,7 +129,6 @@ HID.KeyboardDevice = "Klávesnice standardu HID" KeyboardClassName = "Tastaturen" StdMfg = "(Standard-Tastaturen)" -*PNP0303.DeviceDesc = "IBM PC/AT Tastatur" LocationOverride = "eingesteckt in Tastaturanschluss" HID.KeyboardDevice = "HID-Tastatur" @@ -136,33 +136,28 @@ HID.KeyboardDevice = "HID-Tastatur" KeyboardClassName = "Πληκτρολόγια" StdMfg = "(Πρότυπα πληκτρολόγια)" -*PNP0303.DeviceDesc = "IBM PC/AT πληκτρολόγιο" [Strings.0a] KeyboardClassName = "Teclados" StdMfg = "(Teclado estándar)" -*PNP0303.DeviceDesc = "Teclado IBM PC/AT" LocationOverride = "se conecta al puerto de teclado" [Strings.040C] KeyboardClassName = "Claviers" StdMfg = "(Claviers standards)" -*PNP0303.DeviceDesc = "Clavier IBM PC/AT" LocationOverride = "Branché sur le port clavier" [Strings.0411] KeyboardClassName = "キーボード" StdMfg = "(スタンダードキーボード)" -*PNP0303.DeviceDesc = "IBM PC/AT キーボード" [Strings.0415] KeyboardClassName = "Klawiatury" StdMfg = "(Klawiatury standardowe)" -*PNP0303.DeviceDesc = "Klawiatura IBM PC/AT" LocationOverride = "podłaczone do portu klawiatury" HID.KeyboardDevice = "Klawiatura HID" @@ -170,13 +165,11 @@ HID.KeyboardDevice = "Klawiatura HID" KeyboardClassName = "Teclados" StdMfg = "(Teclado padrão)" -*PNP0303.DeviceDesc = "Teclado IBM PC/AT" [Strings.0418] KeyboardClassName = "Tastaturi" StdMfg = "(tastatură standard)" -*PNP0303.DeviceDesc = "Tastatură IBM PC/AT" LocationOverride = "conectat la portul de tastatură" HID.KeyboardDevice = "Tastatură-dispozitiv de interfațare umană" @@ -184,7 +177,8 @@ HID.KeyboardDevice = "Tastatură-dispozitiv de interfațare umană" KeyboardClassName = "Клавиатуры" StdMfg = "(Стандартные клавиатуры)" -*PNP0303.DeviceDesc = "Клавиатура IBM PC/AT" +*PNP0303.DeviceDesc = "Стандартная (101/102 клавиши) или клавиатура PS/2 Microsoft Natural" +*PNP030B.DeviceDesc = "Расширенная клавиатура PS/2 PC/AT (101/102 клавиши)" LocationOverride = "подключено к порту клавиатуры" HID.KeyboardDevice = "Клавиатура HID" @@ -192,13 +186,11 @@ HID.KeyboardDevice = "Клавиатура HID" KeyboardClassName = "Klávesnice" StdMfg = "(Štandardné klávesnice)" -*PNP0303.DeviceDesc = "Klávesnica IBM PC/AT" [Strings.041f] KeyboardClassName = "Klavyeler" StdMfg = "(Standart Klavyeler)" -*PNP0303.DeviceDesc = "IBM PC/AT Klavye" LocationOverride = "klavye girişine takılı" HID.KeyboardDevice = "HID Klavyeler" @@ -206,7 +198,6 @@ HID.KeyboardDevice = "HID Klavyeler" KeyboardClassName = "Клавіатури" StdMfg = "(Стандартні клавіатури)" -*PNP0303.DeviceDesc = "Клавіатура IBM PC/AT" LocationOverride = "приєднано до порту клавітури" HID.KeyboardDevice = "HID-Клавіатура" @@ -214,23 +205,19 @@ HID.KeyboardDevice = "HID-Клавіатура" KeyboardClassName = "Klaviatūros" StdMfg = "(Standartinė klaviatūra)" -*PNP0303.DeviceDesc = "IBM PC/AT klaviatūra" [Strings.0804] HID.KeyboardDevice = "HID 键盘" StdMfg = "(标准键盘)" -*PNP0303.DeviceDesc = "IBM PC/AT 键盘" [Strings.0816] KeyboardClassName = "Teclados" StdMfg = "(Teclado padrão)" -*PNP0303.DeviceDesc = "Teclado IBM PC/AT" [Strings.0C04] KeyboardClassName = "鍵盤" StdMfg = "(標準鍵盤)" -*PNP0303.DeviceDesc = "IBM PC/AT 鍵盤" HID.KeyboardDevice = "HID 鍵盤" diff --git a/ntoskrnl/io/pnpmgr/pnpmap.c b/ntoskrnl/io/pnpmgr/pnpmap.c index 36a7f5bbedf..e6e881912d5 100644 --- a/ntoskrnl/io/pnpmgr/pnpmap.c +++ b/ntoskrnl/io/pnpmgr/pnpmap.c @@ -14,10 +14,17 @@ /* TYPES *********************************************************************/ +typedef struct _PNP_MAPPER_DEVICE_ID +{ + PCWSTR TypeName; + PWSTR PnPId; +} PNP_MAPPER_DEVICE_ID, *PPNP_MAPPER_DEVICE_ID; + typedef struct _PNP_DETECT_IDENTIFIER_MAP { - PWSTR DetectId; + PCWSTR DetectId; PWSTR PnPId; + PPNP_MAPPER_DEVICE_ID PeripheralMap; ULONG Counter; } PNP_DETECT_IDENTIFIER_MAP; @@ -29,33 +36,92 @@ static UNICODE_STRING ConfigurationDataU = RTL_CONSTANT_STRING(L"Configuration D 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. - */ +/* FIXME: Trailing \0 in structures below are hacks, should be removed. + * Hardware identifiers also can be mapped using "LegacyXlate" sections + * of driver INF files. */ + +DATA_SEG("INITDATA") +static +PNP_MAPPER_DEVICE_ID KeyboardMap[] = +{ + { L"XT_83KEY", L"*PNP0300\0" }, + { L"PCAT_86KEY", L"*PNP0301\0" }, + { L"PCXT_84KEY", L"*PNP0302\0" }, + { L"XT_84KEY", L"*PNP0302\0" }, + { L"101-KEY", L"*PNP0303\0" }, + { L"OLI_83KEY", L"*PNP0304\0" }, + { L"ATT_301", L"*PNP0304\0" }, + { L"OLI_102KEY", L"*PNP0305\0" }, + { L"OLI_86KEY", L"*PNP0306\0" }, + { L"OLI_A101_102KEY", L"*PNP0309\0" }, + { L"ATT_302", L"*PNP030a\0" }, + { L"PCAT_ENHANCED", L"*PNP030b\0" }, + { L"PC98_106KEY", L"*nEC1300\0" }, + { L"PC98_LaptopKEY", L"*nEC1300\0" }, + { L"PC98_N106KEY", L"*PNP0303\0" }, + { NULL, NULL } +}; +DATA_SEG("INITDATA") +static +PNP_MAPPER_DEVICE_ID PointerMap[] = +{ + { L"PS2 MOUSE", L"*PNP0F0E\0" }, + { L"SERIAL MOUSE", L"*PNP0F0C\0" }, + { L"MICROSOFT PS2 MOUSE", L"*PNP0F03\0" }, + { L"LOGITECH PS2 MOUSE", L"*PNP0F12\0" }, + { L"MICROSOFT INPORT MOUSE", L"*PNP0F02\0" }, + { L"MICROSOFT SERIAL MOUSE", L"*PNP0F01\0" }, + { L"MICROSOFT BALLPOINT SERIAL MOUSE", L"*PNP0F09\0" }, + { L"LOGITECH SERIAL MOUSE", L"*PNP0F08\0" }, + { L"MICROSOFT BUS MOUSE", L"*PNP0F00\0" }, + { L"NEC PC-9800 BUS MOUSE", L"*nEC1F00\0" }, + { NULL, NULL } +}; + +DATA_SEG("INITDATA") 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 } + { L"SerialController", L"*PNP0501\0", NULL, 0 }, + //{ L"KeyboardController", L"*PNP0303\0", NULL, 0 }, + //{ L"PointerController", L"*PNP0F13\0", NULL, 0 }, + { L"KeyboardPeripheral", NULL, KeyboardMap, 0 }, + { L"PointerPeripheral", NULL, PointerMap, 0 }, + { L"ParallelController", L"*PNP0400\0", NULL, 0 }, + { L"FloppyDiskPeripheral", L"*PNP0700\0", NULL, 0 }, + { NULL, NULL, NULL, 0 } }; /* FUNCTIONS *****************************************************************/ +static +CODE_SEG("INIT") +PWSTR +IopMapPeripheralId( + _In_ PCUNICODE_STRING Value, + _In_ PPNP_MAPPER_DEVICE_ID DeviceList) +{ + ULONG i; + UNICODE_STRING CmpId; + + for (i = 0; DeviceList[i].TypeName; i++) + { + RtlInitUnicodeString(&CmpId, DeviceList[i].TypeName); + + if (RtlCompareUnicodeString(Value, &CmpId, FALSE) == 0) + break; + } + + return DeviceList[i].PnPId; +} + static CODE_SEG("INIT") PWSTR IopMapDetectedDeviceId( _In_ PUNICODE_STRING DetectId, + _In_ PUNICODE_STRING Value, _Out_ PULONG DeviceIndex) { ULONG i; @@ -71,6 +137,9 @@ IopMapDetectedDeviceId( if (RtlCompareUnicodeString(DetectId, &CmpId, FALSE) == 0) { *DeviceIndex = PnPMap[i].Counter++; + + if (PnPMap[i].PeripheralMap) + return IopMapPeripheralId(Value, PnPMap[i].PeripheralMap); break; } } @@ -370,16 +439,16 @@ IopEnumerateDetectedDevices( ValueName.Length -= sizeof(WCHAR); } - pHardwareId = IopMapDetectedDeviceId(RelativePath, &DeviceIndex); + pHardwareId = IopMapDetectedDeviceId(RelativePath, &ValueName, &DeviceIndex); if (!pHardwareId) { /* Unknown key path */ - DPRINT("Unknown key path '%wZ'\n", RelativePath); + DPRINT("Unknown key path '%wZ' value '%wZ'\n", RelativePath, &ValueName); goto nextdevice; } /* Prepare hardware id key (hardware id value without final \0) */ - HardwareIdKey.Length = wcslen(pHardwareId) * sizeof(WCHAR); + HardwareIdKey.Length = (USHORT)wcslen(pHardwareId) * sizeof(WCHAR); HardwareIdKey.MaximumLength = HardwareIdKey.Length + sizeof(UNICODE_NULL) * 2; HardwareIdKey.Buffer = pHardwareId;

1 year, 7 months

[reactos] 01/01: [NTGDI][NTUSER] Load DirectX graphics driver at system startup (#4551)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=114bc2b96e48e991e5cff… commit 114bc2b96e48e991e5cff01bee9c12f2f31f2dd5 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Jun 18 20:35:17 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jun 11 13:44:56 2023 +0200 [NTGDI][NTUSER] Load DirectX graphics driver at system startup (#4551) CORE-18221 Load the DirectX graphics kernel driver (dxg.sys) by win32k at WINSRV initialization time, in NtUserInitialize(). Keep it always loaded in memory, as on Windows, instead of loading it only by DirectX dlls. This fixes the problem of acessing this driver: we need only to call DxDdEnableDirectDraw() and do other stuff when DirectDraw/Direct3D is required by anything. In other cases, it is called from win32k PDEV functions when changing display mode (as in Windows). Since it's used by other things too, it needs to be always loaded. Otherwise, if it's not loaded, its APIs are not accessible when needed, and execution fails. For example, it fixes display mode change problem in VMWare, when a new mode fails to be applied. Indeed, when it manages DirectDraw stuff, it calls DXG routines, and therefore fails if dxg.sys isn't loaded in memory at this moment. - Implement InitializeGreCSRSS() initialization routine, that initializes supplemental NTGDI/GRE data once CSRSS and WINSRV are loaded: * Call DxDdStartupDxGraphics() inside it, which loads dxg.sys. * Additionally, move fonts and language ID initialization there, from win32k!DriverEntry. Confirmed by analysis on Windows. - Call InitializeGreCSRSS() in NtUserInitialize() main initialization routine (called by WINSRV initialization). Moved to NTGDI from previously NTUSER place: Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- win32ss/gdi/ntgdi/init.c | 28 +++++++++++++++++++++++++--- win32ss/gdi/ntgdi/misc.h | 2 ++ win32ss/user/ntuser/main.c | 10 ---------- win32ss/user/ntuser/ntuser.c | 9 +++------ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/win32ss/gdi/ntgdi/init.c b/win32ss/gdi/ntgdi/init.c index 35bab0f6029..44afa1219df 100644 --- a/win32ss/gdi/ntgdi/init.c +++ b/win32ss/gdi/ntgdi/init.c @@ -7,10 +7,9 @@ */ #include <win32k.h> +DBG_DEFAULT_CHANNEL(UserMisc); -#define NDEBUG -#include <debug.h> -#include <kdros.h> +USHORT gusLanguageID; BOOL NTAPI GDI_CleanupForProcess(struct _EPROCESS *Process); @@ -77,6 +76,29 @@ GdiThreadDestroy(PETHREAD Thread) } +BOOL +InitializeGreCSRSS(VOID) +{ + /* Initialize DirectX graphics driver */ + if (DxDdStartupDxGraphics(0, NULL, 0, NULL, NULL, gpepCSRSS) != STATUS_SUCCESS) + { + ERR("Unable to initialize DirectX graphics\n"); + return FALSE; + } + + /* Get global language ID */ + gusLanguageID = UserGetLanguageID(); + + /* Initialize FreeType library */ + if (!InitFontSupport()) + { + ERR("Unable to initialize font support\n"); + return FALSE; + } + + return TRUE; +} + /* * @implemented */ diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 6757acce4c0..06fa17b8255 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -23,7 +23,9 @@ extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); extern HGDIOBJ StockObjects[]; extern USHORT gusLanguageID; +BOOL InitializeGreCSRSS(VOID); USHORT FASTCALL UserGetLanguageID(VOID); + PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index bdb36d45236..235e8aee696 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -26,7 +26,6 @@ NTSTATUS GdiThreadDestroy(PETHREAD Thread); PSERVERINFO gpsi = NULL; // Global User Server Information. -USHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; PPROCESSINFO gppiList = NULL; @@ -1051,15 +1050,6 @@ DriverEntry( NT_ROF(InitTimerImpl()); NT_ROF(InitDCEImpl()); - gusLanguageID = UserGetLanguageID(); - - /* Initialize FreeType library */ - if (!InitFontSupport()) - { - DPRINT1("Unable to initialize font support\n"); - return Status; - } - return STATUS_SUCCESS; } diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index fd2f5f97e93..6643495606d 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -198,12 +198,9 @@ NtUserInitialize( // Initialize Power Request List (use hPowerRequestEvent). // Initialize Media Change (use hMediaRequestEvent). -// InitializeGreCSRSS(); -// { -// Startup DxGraphics. -// calls ** UserGetLanguageID() and sets it **. -// Enables Fonts drivers, Initialize Font table & Stock Fonts. -// } + /* Initialize various GDI stuff (DirectX, fonts, language ID etc.) */ + if (!InitializeGreCSRSS()) + return STATUS_UNSUCCESSFUL; /* Initialize USER */ Status = UserInitialize();

1 year, 7 months

[reactos] 01/01: [NTOS:PNP] Fix bug causing all devices be considered as already existing

by Sophie Lemos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29a706fc5ad0a1b169688… commit 29a706fc5ad0a1b169688b86d19f12ef1552c07a Author: Sophie Lemos <slemos(a)fastmail.com> AuthorDate: Fri May 26 17:42:36 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 11 13:13:11 2023 +0300 [NTOS:PNP] Fix bug causing all devices be considered as already existing We should compare against DeviceObject as DeviceInstance is never NULL. Fix a resource leak as well. The bug CORE-18983 seems to lay somewhere else though, I just stumbled upon this one while researching it. Note there is a BSOD in the PnP manager on reboot after the driver installation failure, but it seems it was uncovered by the fix as opposed to caused by it. --- ntoskrnl/io/pnpmgr/plugplay.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 46585458b84..461328c8651 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -218,15 +218,14 @@ IopInitializeDevice( /* Leave, if the device already exists */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); - if (DeviceInstance.Buffer != NULL) + if (DeviceObject != NULL) { DPRINT1("Device %wZ already exists!\n", &DeviceInstance); + ObDereferenceObject(DeviceObject); Status = STATUS_SUCCESS; goto done; } - ObDereferenceObject(DeviceObject); - DPRINT("Device %wZ does not exist!\n", &DeviceInstance); /* Create a device node for the device instance */

1 year, 7 months

[reactos] 01/01: [GETUNAME] Update Romanian translation (#5323)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa388640ca3391a708b7c… commit fa388640ca3391a708b7c7a10907efda86556d88 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jun 10 23:03:23 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 10 20:03:23 2023 +0000 [GETUNAME] Update Romanian translation (#5323)

1 year, 7 months

[reactos] 01/01: [MSPAINT] Update Portuguese (pt-PT) translation (#5319)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed22908780f18d1f3a8ff… commit ed22908780f18d1f3a8ff7f6f2f6325ee69c71c0 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Jun 10 12:21:54 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 10 16:21:54 2023 +0000 [MSPAINT] Update Portuguese (pt-PT) translation (#5319) --- base/applications/mspaint/lang/pt-PT.rc | 72 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f0bcb79dd53..f67a2339464 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -19,19 +19,19 @@ BEGIN MENUITEM "&Guardar\tCtrl+G", IDM_FILESAVE MENUITEM "Guardar &como...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Scaner ou Câmera...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR - MENUITEM "Page View", IDM_FILEPAGEVIEW - MENUITEM "Page Setup...", IDM_FILEPAGESETUP - MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT + MENUITEM "Pré-visualizar", IDM_FILEPAGEVIEW + MENUITEM "Configurar página...", IDM_FILEPAGESETUP + MENUITEM "Imprimir...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Send...", IDM_FILESEND + MENUITEM "Enviar para...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Definir como fundo (Mosaico)", IDM_FILEASWALLPAPERPLANE MENUITEM "Definir como fundo (Centrado)", IDM_FILEASWALLPAPERCENTERED MENUITEM "Definir como fundo (Esticado)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "Recente", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR MENUITEM "Sai&r\tAlt+F4", IDM_FILEEXIT END @@ -43,9 +43,9 @@ BEGIN MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY MENUITEM "Co&lar\tCtrl+V", IDM_EDITPASTE - MENUITEM "Limpar &seleção\tDel", IDM_EDITDELETESELECTION - MENUITEM "&Inverter seleção", IDM_EDITINVERTSELECTION - MENUITEM "Selecionar &tudo\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Limpar &selecção\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Inverter selecção", IDM_EDITINVERTSELECTION + MENUITEM "Seleccionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "C&opiar para...", IDM_EDITCOPYTO MENUITEM "Colar &de...", IDM_EDITPASTEFROM @@ -59,7 +59,7 @@ BEGIN MENUITEM SEPARATOR POPUP "&Zoom" BEGIN - POPUP "User defined" + POPUP "Personalizado" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -70,8 +70,8 @@ BEGIN MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid\tCtrl+M", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Mostrar grelha\tCtrl+M", IDM_VIEWSHOWGRID + MENUITEM "Mostrar miniatura", IDM_VIEWSHOWMINIATURE END MENUITEM "&Ver mapa de bits\tCtrl+B", IDM_VIEWFULLSCREEN END @@ -89,8 +89,8 @@ BEGIN BEGIN MENUITEM "&Editar cores...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "Palete moderna", IDM_COLORSMODERNPALETTE + MENUITEM "Palete antiga", IDM_COLORSOLDPALETTE END POPUP "&Ajuda" BEGIN @@ -148,8 +148,8 @@ BEGIN EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 LTEXT "Altura:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Data do arquivo:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Tamanho do arquivo:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Data do ficheiro:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Tamanho no disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "Resolução:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 @@ -169,9 +169,9 @@ END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" +CAPTION "Esticar e inclinar imagem" BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 + GROUPBOX "Esticar", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -180,21 +180,21 @@ BEGIN LTEXT "Vertical:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "Inclinar", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "graus", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "Vertical:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "graus", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 END IDD_FONTS DIALOG 0, 0, 225, 25 -CAPTION "Fonts" +CAPTION "Tipos de letra" STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW FONT 8, "MS Shell Dlg" @@ -212,9 +212,9 @@ BEGIN IDS_INFOTEXT "Disponível sob a licença GNU Lesser General Public License (LGPL, visite www.gnu.org)" IDS_SAVEPROMPTTEXT "Pretende guardar as alterações a %s?" IDS_DEFAULTFILENAME "Imagem" - IDS_MINIATURETITLE "Miniature" - IDS_TOOLTIP1 "Selecionar forma livre" - IDS_TOOLTIP2 "Selecionar" + IDS_MINIATURETITLE "Miniatura" + IDS_TOOLTIP1 "Seleccionar forma livre" + IDS_TOOLTIP2 "Seleccionar" IDS_TOOLTIP3 "Borracha/Apagar cor" IDS_TOOLTIP4 "Preencher com cor" IDS_TOOLTIP5 "Escolher cor" @@ -223,23 +223,23 @@ BEGIN IDS_TOOLTIP8 "Pincel" IDS_TOOLTIP9 "Aerógrafo" IDS_TOOLTIP10 "Texto" - IDS_TOOLTIP11 "Linnha" + IDS_TOOLTIP11 "Linha" IDS_TOOLTIP12 "Curva" IDS_TOOLTIP13 "Retângulo" IDS_TOOLTIP14 "Polígono" IDS_TOOLTIP15 "Elipse" IDS_TOOLTIP16 "Retângulo arredondado" - IDS_ALLFILES "Todos os arquivos" - IDS_ALLPICTUREFILES "All Picture Files" + IDS_ALLFILES "Todos os ficheiros" + IDS_ALLPICTUREFILES "Todos os ficheiros de imagem" IDS_FILESIZE "%d bytes" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." - IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" - IDS_BOLD "Bold" - IDS_ITALIC "Italic" - IDS_UNDERLINE "Underline" + IDS_INTNUMBERS "Por favor, introduza apenas números inteiros!" + IDS_PERCENTAGE "A percentagem deve estar entre 1 e 500." + IDS_ANGLE "O ângulo deve estar entre -89 e 89." + IDS_LOADERRORTEXT "O ficheiro %s não pôde ser carregado." + IDS_ENLARGEPROMPTTEXT "A imagem na área de transferência é maior que o bitmap.\nDeseja ampliar o bitmap?" + IDS_BOLD "Negrito" + IDS_ITALIC "Itálico" + IDS_UNDERLINE "Sublinhado" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" END

1 year, 7 months

[reactos] 01/01: [TRANSLATION] Improve Dutch (nl-NL) translation (#4765)

by Milan Raymakers

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4782c314d4fe53c5fff81… commit 4782c314d4fe53c5fff81e02b76b325ef7515d41 Author: Milan Raymakers <milan.raymakers(a)gmail.com> AuthorDate: Sat Oct 8 16:10:56 2022 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jun 10 18:32:03 2023 +0300 [TRANSLATION] Improve Dutch (nl-NL) translation (#4765) - [NOTEPAD] Improve Dutch (nl-NL) translation - [TASKMGR] Improve Dutch (nl-NL) translation - [WELCOME] Improve Dutch (nl-NL) translation - [EXPLORER] Improve Dutch (nl-NL) translation Reviewed-by: Mark Jansen <mark.jansen(a)reactos.org> --- base/applications/notepad/lang/nl-NL.rc | 16 ++++++++-------- base/applications/taskmgr/lang/nl-NL.rc | 20 ++++++++++---------- base/setup/welcome/lang/nl-NL.rc | 2 +- base/shell/explorer/lang/nl-NL.rc | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index f3ec9a79fb1..066028754f9 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -25,7 +25,7 @@ BEGIN POPUP "&Bestand" BEGIN MENUITEM "&Nieuw\tCtrl+N", CMD_NEW - MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Nieuw &venster\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Openen\tCtrl+O", CMD_OPEN MENUITEM "O&pslaan\tCtrl+S", CMD_SAVE MENUITEM "Ops&laan als...", CMD_SAVE_AS @@ -46,8 +46,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace...\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM "Vervangen...\tCtrl+H", CMD_REPLACE + MENUITEM "Ga naar...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE @@ -65,7 +65,7 @@ BEGIN BEGIN MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Over Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -122,12 +122,12 @@ END DIALOG_GOTO DIALOGEX 0, 0, 165, 50 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Goto line" +CAPTION "Ga naar regel" BEGIN - LTEXT "Line number:", 0x155, 5, 12, 41, 12 + LTEXT "Lijn nummer:", 0x155, 5, 12, 41, 12 EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 + PUSHBUTTON "Annuleer", IDCANCEL, 120, 30, 40, 15 END DIALOG_PRINTING DIALOG 0, 0, 160, 100 @@ -138,7 +138,7 @@ BEGIN CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 CTEXT "Pagina %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 - PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 + PUSHBUTTON "Annuleer", IDCANCEL, 50, 75, 60, 20 END STRINGTABLE diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 163e534191e..fddf92fe818 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -46,17 +46,17 @@ BEGIN MENUITEM "&Trapsgewijs", ID_WINDOWS_CASCADE MENUITEM "Naar &voorgrond", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" + POPUP "Afsl&uiten" BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Uitzetten", ID_SHUTDOWN_POWEROFF + MENUITEM "&Opnieuw Opstarten", ID_SHUTDOWN_REBOOT + MENUITEM "%s &afmelden", ID_SHUTDOWN_LOGOFF + MENUITEM "&Verander van gebruiker\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN diff --git a/base/setup/welcome/lang/nl-NL.rc b/base/setup/welcome/lang/nl-NL.rc index 3f8152d136a..78c324c9480 100644 --- a/base/setup/welcome/lang/nl-NL.rc +++ b/base/setup/welcome/lang/nl-NL.rc @@ -7,7 +7,7 @@ STRINGTABLE BEGIN IDS_APPTITLE "ReactOS - Welkom" IDS_DEFAULT_TOPIC_TITLE "ReactOS" - IDS_DEFAULT_TOPIC_DESC "Welkom bij het ReactOS Operation System.\n\nKlik links op een onderwerp." + IDS_DEFAULT_TOPIC_DESC "Welkom bij het ReactOS besturingssysteem.\n\nKlik links op een onderwerp." IDS_FONTNAME "Tahoma" IDS_CHECKTEXT "&Ga terug naar dit scherm" IDS_CLOSETEXT "&Afsluiten" diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index 7434245e6c2..f79fd75e3d8 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -5,14 +5,14 @@ BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "Ver&ander Datum/Tijd", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Meldingen aanpassen...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "&Bureaublad Weergeven", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&Ongedaan maken", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "Taakbeheer", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR

1 year, 7 months

[reactos] 01/01: [ADVAPI32][SECLOGON] CreateProcessWithLogonW: Pass the environment to the callee

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3db5e9c8e1847562d94e… commit c3db5e9c8e1847562d94eb5bf8adaaac736597ee Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 10 14:10:14 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 10 14:10:14 2023 +0200 [ADVAPI32][SECLOGON] CreateProcessWithLogonW: Pass the environment to the callee --- base/services/seclogon/rpcserver.c | 4 ++- dll/win32/advapi32/wine/security.c | 56 ++++++++++++++++++++++++++++++++++++ sdk/include/reactos/idl/seclogon.idl | 2 ++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/base/services/seclogon/rpcserver.c b/base/services/seclogon/rpcserver.c index 17671e08801..e728f0a9a00 100644 --- a/base/services/seclogon/rpcserver.c +++ b/base/services/seclogon/rpcserver.c @@ -126,11 +126,13 @@ SeclCreateProcessWithLogonW( } } + /* Initialize the startup information */ ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); /* FIXME: Get startup info from the caller */ + /* Initialize the process information */ ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); /* Create Process */ @@ -141,7 +143,7 @@ SeclCreateProcessWithLogonW( NULL, // lpThreadAttributes, FALSE, // bInheritHandles, pRequest->dwCreationFlags, - NULL, // lpEnvironment, + pRequest->Environment, // lpEnvironment, pRequest->CurrentDirectory, &StartupInfo, &ProcessInfo); diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index ce31d7fb474..88f122d6d97 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -3472,6 +3472,53 @@ ConvertSidToStringSidA(PSID Sid, return TRUE; } + +static +DWORD +GetUnicodeEnvironmentSize( + PVOID pEnvironment) +{ + INT Length, TotalLength = 0; + PWCHAR Ptr; + + if (pEnvironment == NULL) + return 0; + + Ptr = (PWCHAR)pEnvironment; + while (*Ptr != UNICODE_NULL) + { + Length = wcslen(Ptr) + 1; + TotalLength += Length; + Ptr = Ptr + Length; + } + + return (TotalLength + 1) * sizeof(WCHAR); +} + + +static +DWORD +GetAnsiEnvironmentSize( + PVOID pEnvironment) +{ + INT Length, TotalLength = 0; + PCHAR Ptr; + + if (pEnvironment == NULL) + return 0; + + Ptr = (PCHAR)pEnvironment; + while (*Ptr != ANSI_NULL) + { + Length = strlen(Ptr) + 1; + TotalLength += Length; + Ptr = Ptr + Length; + } + + return TotalLength + 1; +} + + /* * @unimplemented */ @@ -3535,6 +3582,15 @@ CreateProcessWithLogonW( Request.CommandLine = (LPWSTR)lpCommandLine; Request.CurrentDirectory = (LPWSTR)lpCurrentDirectory; + if (dwCreationFlags & CREATE_UNICODE_ENVIRONMENT) + Request.dwEnvironmentSize = GetUnicodeEnvironmentSize(lpEnvironment); + else + Request.dwEnvironmentSize = GetAnsiEnvironmentSize(lpEnvironment); + Request.Environment = lpEnvironment; + + TRACE("Request.dwEnvironmentSize %lu\n", Request.dwEnvironmentSize); + TRACE("Request.Environment %p\n", Request.Environment); + Request.dwLogonFlags = dwLogonFlags; Request.dwCreationFlags = dwCreationFlags; diff --git a/sdk/include/reactos/idl/seclogon.idl b/sdk/include/reactos/idl/seclogon.idl index d76689463a7..8386f62db9f 100644 --- a/sdk/include/reactos/idl/seclogon.idl +++ b/sdk/include/reactos/idl/seclogon.idl @@ -12,6 +12,8 @@ typedef struct _SECL_REQUEST [string] WCHAR *ApplicationName; [string] WCHAR *CommandLine; [string] WCHAR *CurrentDirectory; + [size_is(dwEnvironmentSize)] BYTE *Environment; + DWORD dwEnvironmentSize; DWORD dwLogonFlags; DWORD dwCreationFlags; DWORD dwProcessId;

1 year, 7 months

[reactos] 03/03: [NTOS:SE] Refactor SeTokenCanImpersonate

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59e74584ac5c48e9edb2b… commit 59e74584ac5c48e9edb2bf494c2224bd5ca6fa90 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Jun 6 19:06:11 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Jun 9 11:53:56 2023 +0200 [NTOS:SE] Refactor SeTokenCanImpersonate - Refactor most of the code, since there's quite some stuff that don't make much sense. For instance ImpersonationLevel is basically the requested impersonation level a server asks for. PsImpersonateClient doesn't explicitly say that SecurityAnonymous and SecurityIdentification are not allowed. If the server was to give such levels it simply means it doesn't want to impersonate the client. Another thing that doesn't make much sense is that we check if the client is associated with an anonymous token, then avoid impersonating regular anonymous tokens that weren't created by the system. Only system can create such tokens and an anonymous token basically means a token with hidden security info. - Check that the server is within the same client logon session. - If the server is granted the SeImpersonatePrivilege privilege, allow impersonation regardless of the conditions we want to check for. - Update the documentation and code comments. --- ntoskrnl/se/token.c | 127 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 44 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index bdb360e8672..dae5a411dff 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -2158,22 +2158,47 @@ SeTokenIsWriteRestricted( /** * @brief - * Ensures that client impersonation can occur by checking if the token - * we're going to assign as the impersonation token can be actually impersonated - * in the first place. The routine is used primarily by PsImpersonateClient. + * Determines whether the server is allowed to impersonate on behalf + * of a client or not. For further details, see Remarks. * * @param[in] ProcessToken - * Token from a process. + * A pointer to the primary access token of the server process + * that requests impersonation of the client target. * * @param[in] TokenToImpersonate - * Token that we are going to impersonate. + * A pointer to an access token that represents a client that is to + * be impersonated. * * @param[in] ImpersonationLevel - * Security impersonation level grade. + * The requested impersonation level. * * @return * Returns TRUE if the conditions checked are met for token impersonation, * FALSE otherwise. + * + * @remarks + * The server has to meet the following criteria in order to impersonate + * a client, that is: + * + * - The server must not impersonate a client beyond the level that + * the client imposed on itself. + * + * - The server must be authenticated on the same logon session of + * the target client. + * + * - IF NOT then the server's user ID has to match to that of the + * target client. + * + * - The server must not be restricted in order to impersonate a + * client that is not restricted. + * + * If the associated access token that represents the security properties + * of the server is granted the SeImpersonatePrivilege privilege the server + * is given immediate impersonation, regardless of the conditions above. + * If the client in question is associated with an anonymous token then + * the server is given immediate impersonation. Or if the server simply + * doesn't ask for impersonation but instead it wants to get the security + * identification of a client, the server is given immediate impersonation. */ BOOLEAN NTAPI @@ -2186,73 +2211,87 @@ SeTokenCanImpersonate( PAGED_CODE(); /* - * SecurityAnonymous and SecurityIdentification levels do not - * allow impersonation. + * The server may want to obtain identification details of a client + * instead of impersonating so just give the server a pass. */ - if (ImpersonationLevel == SecurityAnonymous || - ImpersonationLevel == SecurityIdentification) + if (ImpersonationLevel < SecurityIdentification) { - return FALSE; + DPRINT("The server doesn't ask for impersonation\n"); + return TRUE; } /* Time to lock our tokens */ SepAcquireTokenLockShared(ProcessToken); SepAcquireTokenLockShared(TokenToImpersonate); - /* What kind of authentication ID does the token have? */ + /* + * As the name implies, an anonymous token has invisible security + * identification details. By the general rule these tokens do not + * pose a danger in terms of power escalation so give the server a pass. + */ if (RtlEqualLuid(&TokenToImpersonate->AuthenticationId, &SeAnonymousAuthenticationId)) { - /* - * OK, it looks like the token has an anonymous - * authentication. Is that token created by the system? - */ - if (TokenToImpersonate->TokenSource.SourceName != SeSystemTokenSource.SourceName && - !RtlEqualLuid(&TokenToImpersonate->TokenSource.SourceIdentifier, &SeSystemTokenSource.SourceIdentifier)) - { - /* It isn't, we can't impersonate regular tokens */ - DPRINT("SeTokenCanImpersonate(): Token has an anonymous authentication ID, can't impersonate!\n"); - CanImpersonate = FALSE; - goto Quit; - } + DPRINT("The token to impersonate has an anonymous authentication ID, allow impersonation either way\n"); + CanImpersonate = TRUE; + goto Quit; } - /* Are the SID values from both tokens equal? */ - if (!RtlEqualSid(ProcessToken->UserAndGroups->Sid, - TokenToImpersonate->UserAndGroups->Sid)) + /* Allow impersonation for the process server if it's granted the impersonation privilege */ + if ((ProcessToken->TokenFlags & TOKEN_HAS_IMPERSONATE_PRIVILEGE) != 0) { - /* They aren't, bail out */ - DPRINT("SeTokenCanImpersonate(): Tokens SIDs are not equal!\n"); - CanImpersonate = FALSE; + DPRINT("The process is granted the impersonation privilege, allow impersonation\n"); + CanImpersonate = TRUE; goto Quit; } /* - * Make sure the tokens aren't diverged in terms of - * restrictions, that is, one token is restricted - * but the other one isn't. + * Deny impersonation for the server if it wants to impersonate a client + * beyond what the impersonation level originally permits. */ - if (SeTokenIsRestricted(ProcessToken) != - SeTokenIsRestricted(TokenToImpersonate)) + if (ImpersonationLevel > TokenToImpersonate->ImpersonationLevel) { - /* - * One token is restricted so we cannot - * continue further at this point, bail out. - */ - DPRINT("SeTokenCanImpersonate(): One token is restricted, can't continue!\n"); + DPRINT1("Cannot impersonate a client above the permitted impersonation level!\n"); CanImpersonate = FALSE; goto Quit; } + /* Is the server authenticated on the same client originating session? */ + if (!RtlEqualLuid(&ProcessToken->AuthenticationId, + &TokenToImpersonate->OriginatingLogonSession)) + { + /* It's not, check that at least both the server and client are the same user */ + if (!RtlEqualSid(ProcessToken->UserAndGroups[0].Sid, + TokenToImpersonate->UserAndGroups[0].Sid)) + { + DPRINT1("Server and client aren't the same user!\n"); + CanImpersonate = FALSE; + goto Quit; + } + + /* + * Make sure the tokens haven't diverged in terms of restrictions + * that is one token is restricted but the other one isn't. If that + * would have been the case then the server would have impersonated + * a less restricted client thus potentially triggering an elevation, + * which is not what we want. + */ + if (SeTokenIsRestricted(ProcessToken) != + SeTokenIsRestricted(TokenToImpersonate)) + { + DPRINT1("Attempting to impersonate a less restricted client token, bail out!\n"); + CanImpersonate = FALSE; + goto Quit; + } + } + /* If we've reached that far then we can impersonate! */ - DPRINT("SeTokenCanImpersonate(): We can impersonate.\n"); + DPRINT("We can impersonate\n"); CanImpersonate = TRUE; Quit: - /* We're done, unlock the tokens now */ - SepReleaseTokenLock(ProcessToken); SepReleaseTokenLock(TokenToImpersonate); - + SepReleaseTokenLock(ProcessToken); return CanImpersonate; }

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs