Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KBDJA] Enable VK_CONVERT/VK_NONCONVERT keys (#4505)
by Katayama Hirofumi MZ 12 May '22

12 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c3474be48186a3592ef6… commit 1c3474be48186a3592ef636743685e402e8a6f3b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 12 12:48:29 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 12 12:48:29 2022 +0900 [KBDJA] Enable VK_CONVERT/VK_NONCONVERT keys (#4505) Enable VK_CONVERT/VK_NONCONVERT keys for Japanese keyboard. - ScanCode 121 (0x79) --> VK_CONVERT. - ScanCode 123 (0x7B) --> VK_NONCONVERT. CORE-11700 --- dll/keyboard/kbdja/kbdja.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index ee44d941a1a..110333a820a 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -102,8 +102,8 @@ ROSDATA USHORT scancode_to_vk[] = { /* One more f-key */ VK_F24, /* - 77 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - VK_EMPTY, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ + VK_EMPTY, VK_EMPTY, VK_CONVERT, VK_EMPTY, + VK_NONCONVERT, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ VK_EMPTY, /* - 80 - */ 0

1 0

[reactos] 01/01: [USER32][KBDJA] Implement CliImmSetHotKey (#4504)
by Katayama Hirofumi MZ 11 May '22

11 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcc4384554a92d9fd3f2c… commit fcc4384554a92d9fd3f2ce021a363e71c4b5fc45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 11 21:42:32 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 11 21:42:32 2022 +0900 [USER32][KBDJA] Implement CliImmSetHotKey (#4504) - Fix Japanese keyboard about [Shift]+[0] and [半/全] (VK_PROCESSKEY). - Add user32!CliSaveImeHotKey helper function. - Implement user32!CliImmSetHotKey function. This function is forwarded from imm32!ImmSetHotKey. - Fix user32!TranslateMessage by using imm32!ImmTranslateMessage. CORE-11700, CORE-18183, CORE-18182 --- dll/keyboard/kbdja/kbdja.c | 4 +- win32ss/user/user32/misc/imm.c | 9 --- win32ss/user/user32/windows/input.c | 103 ++++++++++++++++++++++++++++++++++ win32ss/user/user32/windows/message.c | 27 ++++----- 4 files changed, 119 insertions(+), 24 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index b250b9a1118..ee44d941a1a 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -54,7 +54,7 @@ ROSDATA USHORT scancode_to_vk[] = { VK_LCONTROL, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', - 'L', SC_40, SC_41, VK_EMPTY, + 'L', SC_40, SC_41, VK_PROCESSKEY, VK_LSHIFT, VK_OEM_6, /* - 2c - */ /* Third letters row */ @@ -211,7 +211,7 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { { '7', 0, {'7', '\''} }, { '8', 0, {'8', '('} }, { '9', 0, {'9', ')'} }, - { '0', 0, {'0', 0xff} }, + { '0', 0, {'0', 0 } }, /*Japanese Keys*/ { SC_13, 0, { '^','~'} }, diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 9099235c8ee..83b6b492777 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -1054,15 +1054,6 @@ RegisterIMEClass(VOID) return TRUE; } -/* - * @unimplemented - */ -BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @implemented */ diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 4cd7832d7b3..50189f831f4 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -143,6 +143,109 @@ Failure: return FALSE; } +BOOL APIENTRY +CliSaveImeHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKL, BOOL bDelete) +{ + WCHAR szName[MAX_PATH]; + LONG error; + HKEY hControlPanel = NULL, hInputMethod = NULL, hHotKeys = NULL, hKey = NULL; + BOOL ret = FALSE, bRevertOnFailure = FALSE; + + if (bDelete) + { + StringCchPrintfW(szName, _countof(szName), + L"Control Panel\\Input Method\\Hot Keys\\%08lX", dwID); + error = RegDeleteKeyW(HKEY_CURRENT_USER, szName); + return (error == ERROR_SUCCESS); + } + + // Open "Control Panel" + error = RegCreateKeyExW(HKEY_CURRENT_USER, L"Control Panel", 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &hControlPanel, NULL); + if (error == ERROR_SUCCESS) + { + // Open "Input Method" + error = RegCreateKeyExW(hControlPanel, L"Input Method", 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &hInputMethod, NULL); + if (error == ERROR_SUCCESS) + { + // Open "Hot Keys" + error = RegCreateKeyExW(hInputMethod, L"Hot Keys", 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &hHotKeys, NULL); + if (error == ERROR_SUCCESS) + { + // Open "Key" + StringCchPrintfW(szName, _countof(szName), L"%08lX", dwID); + error = RegCreateKeyExW(hHotKeys, szName, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &hKey, NULL); + if (error == ERROR_SUCCESS) + { + bRevertOnFailure = TRUE; + + // Set "Virtual Key" + error = RegSetValueExW(hKey, L"Virtual Key", 0, REG_BINARY, + (LPBYTE)&uVirtualKey, sizeof(uVirtualKey)); + if (error == ERROR_SUCCESS) + { + // Set "Key Modifiers" + error = RegSetValueExW(hKey, L"Key Modifiers", 0, REG_BINARY, + (LPBYTE)&uModifiers, sizeof(uModifiers)); + if (error == ERROR_SUCCESS) + { + // Set "Target IME" + error = RegSetValueExW(hKey, L"Target IME", 0, REG_BINARY, + (LPBYTE)&hKL, sizeof(hKL)); + if (error == ERROR_SUCCESS) + { + // Success! + ret = TRUE; + bRevertOnFailure = FALSE; + } + } + } + RegCloseKey(hKey); + } + RegCloseKey(hHotKeys); + } + RegCloseKey(hInputMethod); + } + RegCloseKey(hControlPanel); + } + + if (bRevertOnFailure) + CliSaveImeHotKey(dwID, uVirtualKey, uModifiers, hKL, TRUE); + + return ret; +} + +/* + * @implemented + * Same as imm32!ImmSetHotKey. + */ +BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKL) +{ + BOOL ret; + + if (uVirtualKey == 0) // Delete? + { + ret = CliSaveImeHotKey(dwID, uModifiers, uVirtualKey, hKL, TRUE); + if (ret) + CliImmSetHotKeyWorker(dwID, uModifiers, uVirtualKey, hKL, SETIMEHOTKEY_DELETE); + return ret; + } + + // Add + ret = CliImmSetHotKeyWorker(dwID, uModifiers, uVirtualKey, hKL, SETIMEHOTKEY_ADD); + if (ret) + { + ret = CliSaveImeHotKey(dwID, uModifiers, uVirtualKey, hKL, FALSE); + if (!ret) // Failure? + CliImmSetHotKeyWorker(dwID, uModifiers, uVirtualKey, hKL, SETIMEHOTKEY_DELETE); + } + + return ret; +} + BOOL FASTCALL CliSetSingleHotKey(LPCWSTR pszSubKey, HANDLE hKey) { LONG error; diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 1c745cb4584..2740f2e632f 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -2825,20 +2825,21 @@ TranslateMessageEx(CONST MSG *lpMsg, UINT Flags) BOOL WINAPI TranslateMessage(CONST MSG *lpMsg) { - BOOL Ret = FALSE; + BOOL ret; -// Ref: msdn ImmGetVirtualKey: -// http://msdn.microsoft.com/en-us/library/aa912145.aspx -/* - if ( (LOWORD(lpMsg->wParam) != VK_PROCESSKEY) || - !(Ret = IMM_ImmTranslateMessage( lpMsg->hwnd, - lpMsg->message, - lpMsg->wParam, - lpMsg->lParam)) )*/ - { - Ret = TranslateMessageEx((LPMSG)lpMsg, 0); - } - return Ret; + // http://msdn.microsoft.com/en-us/library/aa912145.aspx + if (LOWORD(lpMsg->wParam) == VK_PROCESSKEY) + { + ret = IMM_FN(ImmTranslateMessage)(lpMsg->hwnd, + lpMsg->message, + lpMsg->wParam, + lpMsg->lParam); + if (ret) + return ret; + } + + ret = TranslateMessageEx((LPMSG)lpMsg, 0); + return ret; }

1 0

[reactos] 01/01: [USER32] Implement UnloadKeyboardLayout (#4503)
by Katayama Hirofumi MZ 11 May '22

11 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7396ba84ce54f48419132… commit 7396ba84ce54f4841913289da17e3cb9a98edbb4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 11 10:03:02 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 11 10:03:02 2022 +0900 [USER32] Implement UnloadKeyboardLayout (#4503) - Add IntSetFeKeyboardFlags, CliImmSetHotKeyWorker, CliSetDefaultImeHotKeys, CliGetPreloadKeyboardLayouts, CliGetImeHotKeysFromRegistry, CliImmInitializeHotKeys, CliSetSingleHotKey, and CliReadRegistryValue helper functions. CORE-11700 --- win32ss/user/user32/user32.spec | 2 +- win32ss/user/user32/windows/input.c | 285 ++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index 9e87f95c49f..c026984892a 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -703,7 +703,7 @@ 694 stdcall UnhookWindowsHook(long ptr) 695 stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx 696 stdcall UnionRect(ptr ptr ptr) -697 stdcall UnloadKeyboardLayout(long) NtUserUnloadKeyboardLayout +697 stdcall UnloadKeyboardLayout(ptr) 698 stdcall UnlockWindowStation(long) NtUserUnlockWindowStation 699 stdcall UnpackDDElParam(long long ptr ptr) 700 stdcall UnregisterClassA(str long) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index aa398d7dcc5..4cd7832d7b3 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -31,6 +31,279 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); +typedef struct tagIMEHOTKEYENTRY +{ + DWORD dwHotKeyId; + UINT uVirtualKey; + UINT uModifiers; + HKL hKL; +} IMEHOTKEYENTRY, *PIMEHOTKEYENTRY; + +// Japanese +IMEHOTKEYENTRY DefaultHotKeyTableJ[] = +{ + { IME_JHOTKEY_CLOSE_OPEN, VK_KANJI, MOD_IGNORE_ALL_MODIFIER, NULL }, +}; + +// Chinese Traditional +IMEHOTKEYENTRY DefaultHotKeyTableT[] = +{ + { IME_THOTKEY_IME_NONIME_TOGGLE, VK_SPACE, MOD_LEFT | MOD_RIGHT | MOD_CONTROL, NULL }, + { IME_THOTKEY_SHAPE_TOGGLE, VK_SPACE, MOD_LEFT | MOD_RIGHT | MOD_SHIFT, NULL }, +}; + +// Chinese Simplified +IMEHOTKEYENTRY DefaultHotKeyTableC[] = +{ + { IME_CHOTKEY_IME_NONIME_TOGGLE, VK_SPACE, MOD_LEFT | MOD_RIGHT | MOD_CONTROL, NULL }, + { IME_CHOTKEY_SHAPE_TOGGLE, VK_SPACE, MOD_LEFT | MOD_RIGHT | MOD_SHIFT, NULL }, +}; + +// The far-east flags +#define FE_JAPANESE (1 << 0) +#define FE_CHINESE_TRADITIONAL (1 << 1) +#define FE_CHINESE_SIMPLIFIED (1 << 2) +#define FE_KOREAN (1 << 3) + +// Sets the far-east flags +// Win: SetFeKeyboardFlags +VOID FASTCALL IntSetFeKeyboardFlags(LANGID LangID, PBYTE pbFlags) +{ + switch (LangID) + { + case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT): + *pbFlags |= FE_JAPANESE; + break; + + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL): + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG): + *pbFlags |= FE_CHINESE_TRADITIONAL; + break; + + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED): + case MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE): + *pbFlags |= FE_CHINESE_SIMPLIFIED; + break; + + case MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN): + *pbFlags |= FE_KOREAN; + break; + + default: + break; + } +} + +DWORD FASTCALL CliReadRegistryValue(HANDLE hKey, LPCWSTR pszName) +{ + DWORD dwValue, cbValue; + LONG error; + + cbValue = sizeof(dwValue); + error = RegQueryValueExW(hKey, pszName, NULL, NULL, (LPBYTE)&dwValue, &cbValue); + if (error != ERROR_SUCCESS || cbValue < sizeof(DWORD)) + return 0; + + return dwValue; +} + +BOOL APIENTRY +CliImmSetHotKeyWorker(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DWORD dwAction) +{ + if (dwAction == SETIMEHOTKEY_ADD) + { + if (IME_HOTKEY_DSWITCH_FIRST <= dwHotKeyId && dwHotKeyId <= IME_HOTKEY_DSWITCH_LAST) + { + if (!hKL) + goto Failure; + } + else + { + if (hKL) + goto Failure; + + if (IME_KHOTKEY_SHAPE_TOGGLE <= dwHotKeyId && + dwHotKeyId < IME_THOTKEY_IME_NONIME_TOGGLE) + { + // The Korean cannot set the IME hotkeys + goto Failure; + } + } + +#define MOD_ALL_MODS (MOD_ALT | MOD_CONTROL | MOD_SHIFT | MOD_WIN) + if ((uModifiers & MOD_ALL_MODS) && !(uModifiers & (MOD_LEFT | MOD_RIGHT))) + goto Failure; +#undef MOD_ALL_MODS + } + + return NtUserSetImeHotKey(dwHotKeyId, uModifiers, uVirtualKey, hKL, dwAction); + +Failure: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + +BOOL FASTCALL CliSetSingleHotKey(LPCWSTR pszSubKey, HANDLE hKey) +{ + LONG error; + HKEY hSubKey; + DWORD dwHotKeyId = 0; + UINT uModifiers = 0, uVirtualKey = 0; + HKL hKL = NULL; + UNICODE_STRING ustrName; + + error = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_READ, &hSubKey); + if (error != ERROR_SUCCESS) + return FALSE; + + RtlInitUnicodeString(&ustrName, pszSubKey); + RtlUnicodeStringToInteger(&ustrName, 16, &dwHotKeyId); + + uModifiers = CliReadRegistryValue(hSubKey, L"Key Modifiers"); + hKL = (HKL)(ULONG_PTR)CliReadRegistryValue(hSubKey, L"Target IME"); + uVirtualKey = CliReadRegistryValue(hSubKey, L"Virtual Key"); + + RegCloseKey(hSubKey); + + return CliImmSetHotKeyWorker(dwHotKeyId, uModifiers, uVirtualKey, hKL, SETIMEHOTKEY_ADD); +} + +BOOL FASTCALL CliGetImeHotKeysFromRegistry(VOID) +{ + HKEY hKey; + LONG error; + BOOL ret = FALSE; + DWORD dwIndex, cchKeyName; + WCHAR szKeyName[16]; + + error = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Control Panel\\Input Method\\Hot Keys", + 0, + KEY_ALL_ACCESS, + &hKey); + if (error != ERROR_SUCCESS) + return ret; + + for (dwIndex = 0; ; ++dwIndex) + { + cchKeyName = _countof(szKeyName); + error = RegEnumKeyExW(hKey, dwIndex, szKeyName, &cchKeyName, NULL, NULL, NULL, NULL); + if (error == ERROR_NO_MORE_ITEMS || error != ERROR_SUCCESS) + break; + + szKeyName[_countof(szKeyName) - 1] = 0; + + if (CliSetSingleHotKey(szKeyName, hKey)) + ret = TRUE; + } + + RegCloseKey(hKey); + return ret; +} + +VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) +{ + WCHAR szValueName[8], szValue[16]; + UNICODE_STRING ustrValue; + DWORD dwKL, cbValue, dwType; + UINT iNumber; + HKEY hKey; + LONG error; + + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_READ, &hKey); + if (error != ERROR_SUCCESS) + return; + + for (iNumber = 1; iNumber < 1000; ++iNumber) + { + StringCchPrintfW(szValueName, _countof(szValueName), L"%u", iNumber); + + cbValue = sizeof(szValue); + error = RegQueryValueExW(hKey, szValueName, NULL, &dwType, (LPBYTE)szValue, &cbValue); + if (error != ERROR_SUCCESS || dwType != REG_SZ) + break; + + szValue[_countof(szValue) - 1] = 0; + + RtlInitUnicodeString(&ustrValue, szValue); + RtlUnicodeStringToInteger(&ustrValue, 16, &dwKL); + + IntSetFeKeyboardFlags(LOWORD(dwKL), pbFlags); + } + + RegCloseKey(hKey); +} + +VOID APIENTRY CliSetDefaultImeHotKeys(PIMEHOTKEYENTRY pEntries, UINT nCount, BOOL bCheck) +{ + UINT uVirtualKey, uModifiers; + HKL hKL; + + while (nCount-- > 0) + { + if (!bCheck || !NtUserGetImeHotKey(pEntries->dwHotKeyId, &uModifiers, &uVirtualKey, &hKL)) + { + CliImmSetHotKeyWorker(pEntries->dwHotKeyId, + pEntries->uModifiers, + pEntries->uVirtualKey, + pEntries->hKL, + SETIMEHOTKEY_ADD); + } + ++pEntries; + } +} + +VOID APIENTRY CliImmInitializeHotKeys(DWORD dwAction, HKL hKL) +{ + UINT nCount; + LPHKL pList; + UINT iIndex; + LANGID LangID; + BYTE bFlags = 0; + BOOL bCheck; + + NtUserSetImeHotKey(0, 0, 0, NULL, SETIMEHOTKEY_DELETEALL); + + bCheck = CliGetImeHotKeysFromRegistry(); + + if (dwAction == SETIMEHOTKEY_DELETEALL) + { + LangID = LANGIDFROMLCID(GetUserDefaultLCID()); + IntSetFeKeyboardFlags(LangID, &bFlags); + + CliGetPreloadKeyboardLayouts(&bFlags); + } + else + { + nCount = NtUserGetKeyboardLayoutList(0, NULL); + if (!nCount) + return; + + pList = RtlAllocateHeap(RtlGetProcessHeap(), 0, nCount * sizeof(HKL)); + if (!pList) + return; + + NtUserGetKeyboardLayoutList(nCount, pList); + + for (iIndex = 0; iIndex < nCount; ++iIndex) + { + LangID = LOWORD(pList[iIndex]); + IntSetFeKeyboardFlags(LangID, &bFlags); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, pList); + } + + if (bFlags & FE_JAPANESE) + CliSetDefaultImeHotKeys(DefaultHotKeyTableJ, _countof(DefaultHotKeyTableJ), bCheck); + + if (bFlags & FE_CHINESE_TRADITIONAL) + CliSetDefaultImeHotKeys(DefaultHotKeyTableT, _countof(DefaultHotKeyTableT), bCheck); + + if (bFlags & FE_CHINESE_SIMPLIFIED) + CliSetDefaultImeHotKeys(DefaultHotKeyTableC, _countof(DefaultHotKeyTableC), bCheck); +} + /* * @implemented */ @@ -330,6 +603,18 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID, dwhkl, Flags); } +/* + * @implemented + */ +BOOL WINAPI UnloadKeyboardLayout(HKL hKL) +{ + if (!NtUserUnloadKeyboardLayout(hKL)) + return FALSE; + + CliImmInitializeHotKeys(SETIMEHOTKEY_DELETE, hKL); + return TRUE; +} + /* * @implemented */

1 0

[reactos] 03/03: [NTOS:KE] Fix CPU extended family and model detection
by Marcus Boillat 09 May '22

09 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa52f2fae0b73ca10e18f… commit fa52f2fae0b73ca10e18fe187b0dff16cfaabfc8 Author: Marcus Boillat <marcus.boillat(a)gmail.com> AuthorDate: Sun May 8 19:27:27 2022 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 9 21:50:24 2022 +0300 [NTOS:KE] Fix CPU extended family and model detection Based on documentation from Geoff Chappell: https://www.geoffchappell.com/studies/windows/km/cpu/cpuid/00000001h/eax.htm CORE-17974 --- ntoskrnl/ke/amd64/cpu.c | 29 +++++++++++++++++++++++++++-- ntoskrnl/ke/i386/cpu.c | 23 +++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 4ed7e5470fe..d4a8888c664 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -98,7 +98,11 @@ KiSetProcessorType(VOID) { CPU_INFO CpuInfo; CPU_SIGNATURE CpuSignature; - ULONG Stepping, Type; + BOOLEAN ExtendModel; + ULONG Stepping, Type, Vendor; + + /* This initializes Prcb->CpuVendor */ + Vendor = KiGetCpuVendor(); /* Do CPUID 1 now */ KiCpuId(&CpuInfo, 1); @@ -111,8 +115,29 @@ KiSetProcessorType(VOID) */ CpuSignature.AsULONG = CpuInfo.Eax; Stepping = CpuSignature.Model; + ExtendModel = (CpuSignature.Family == 15); +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + if (CpuSignature.Family == 6) + { + ExtendModel |= (Vendor == CPU_INTEL); +#if (NTDDI_VERSION >= NTDDI_WIN8) + ExtendModel |= (Vendor == CPU_CENTAUR); +#endif + } +#endif + if (ExtendModel) + { + /* Add ExtendedModel to distinguish from non-extended values. */ + Stepping |= (CpuSignature.ExtendedModel << 4); + } Stepping = (Stepping << 8) | CpuSignature.Step; Type = CpuSignature.Family; + if (CpuSignature.Family == 15) + { + /* Add ExtendedFamily to distinguish from non-extended values. + * It must not be larger than 0xF0 to avoid overflow. */ + Type += min(CpuSignature.ExtendedFamily, 0xF0); + } /* Save them in the PRCB */ KeGetCurrentPrcb()->CpuID = TRUE; @@ -130,7 +155,7 @@ KiGetFeatureBits(VOID) CPU_INFO CpuInfo; /* Get the Vendor ID */ - Vendor = KiGetCpuVendor(); + Vendor = Prcb->CpuVendor; /* Make sure we got a valid vendor ID at least. */ if (!Vendor) return FeatureBits; diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 711070eeb07..0e4b8fa8468 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -159,6 +159,7 @@ KiSetProcessorType(VOID) { CPU_INFO CpuInfo; CPU_SIGNATURE CpuSignature; + BOOLEAN ExtendModel; ULONG Stepping, Type; /* Do CPUID 1 now */ @@ -172,8 +173,30 @@ KiSetProcessorType(VOID) */ CpuSignature.AsULONG = CpuInfo.Eax; Stepping = CpuSignature.Model; + ExtendModel = (CpuSignature.Family == 15); +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + if (CpuSignature.Family == 6) + { + ULONG Vendor = KiGetCpuVendor(); + ExtendModel |= (Vendor == CPU_INTEL); +#if (NTDDI_VERSION >= NTDDI_WIN8) + ExtendModel |= (Vendor == CPU_CENTAUR); +#endif + } +#endif + if (ExtendModel) + { + /* Add ExtendedModel to distinguish from non-extended values. */ + Stepping |= (CpuSignature.ExtendedModel << 4); + } Stepping = (Stepping << 8) | CpuSignature.Step; Type = CpuSignature.Family; + if (CpuSignature.Family == 15) + { + /* Add ExtendedFamily to distinguish from non-extended values. + * It must not be larger than 0xF0 to avoid overflow. */ + Type += min(CpuSignature.ExtendedFamily, 0xF0); + } /* Save them in the PRCB */ KeGetCurrentPrcb()->CpuID = TRUE;

1 0

[reactos] 02/03: [NTOS:KE] Use bitfield structure for x86 CPU signature in EAX register
by Marcus Boillat 09 May '22

09 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00b3e4bc689519d67a81b… commit 00b3e4bc689519d67a81b59a8dad8dfe5fafdb5d Author: Marcus Boillat <marcus.boillat(a)gmail.com> AuthorDate: Sat May 7 23:27:25 2022 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 9 21:50:24 2022 +0300 [NTOS:KE] Use bitfield structure for x86 CPU signature in EAX register This makes code a lot more readable. CORE-17974 --- ntoskrnl/ke/amd64/cpu.c | 29 +++++++++++++++++++++-------- ntoskrnl/ke/i386/cpu.c | 29 +++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index cbce873f619..4ed7e5470fe 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -35,6 +35,21 @@ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; static const CHAR CmpCentaurID[] = "CentaurHauls"; +typedef union _CPU_SIGNATURE +{ + struct + { + ULONG Step : 4; + ULONG Model : 4; + ULONG Family : 4; + ULONG Unused : 4; + ULONG ExtendedModel : 4; + ULONG ExtendedFamily : 8; + ULONG Unused2 : 4; + }; + ULONG AsULONG; +} CPU_SIGNATURE; + /* FUNCTIONS *****************************************************************/ ULONG @@ -82,6 +97,7 @@ NTAPI KiSetProcessorType(VOID) { CPU_INFO CpuInfo; + CPU_SIGNATURE CpuSignature; ULONG Stepping, Type; /* Do CPUID 1 now */ @@ -89,17 +105,14 @@ KiSetProcessorType(VOID) /* * Get the Stepping and Type. The stepping contains both the - * Model and the Step, while the Type contains the returned Type. - * We ignore the family. + * Model and the Step, while the Type contains the returned Family. * * For the stepping, we convert this: zzzzzzxy into this: x0y */ - Stepping = CpuInfo.Eax & 0xF0; - Stepping <<= 4; - Stepping += (CpuInfo.Eax & 0xFF); - Stepping &= 0xF0F; - Type = CpuInfo.Eax & 0xF00; - Type >>= 8; + CpuSignature.AsULONG = CpuInfo.Eax; + Stepping = CpuSignature.Model; + Stepping = (Stepping << 8) | CpuSignature.Step; + Type = CpuSignature.Family; /* Save them in the PRCB */ KeGetCurrentPrcb()->CpuID = TRUE; diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 4a53f407800..711070eeb07 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -60,6 +60,21 @@ static const CHAR CmpTransmetaID[] = "GenuineTMx86"; static const CHAR CmpCentaurID[] = "CentaurHauls"; static const CHAR CmpRiseID[] = "RiseRiseRise"; +typedef union _CPU_SIGNATURE +{ + struct + { + ULONG Step : 4; + ULONG Model : 4; + ULONG Family : 4; + ULONG Unused : 4; + ULONG ExtendedModel : 4; + ULONG ExtendedFamily : 8; + ULONG Unused2 : 4; + }; + ULONG AsULONG; +} CPU_SIGNATURE; + /* SUPPORT ROUTINES FOR MSVC COMPATIBILITY ***********************************/ /* NSC/Cyrix CPU configuration register index */ @@ -143,6 +158,7 @@ NTAPI KiSetProcessorType(VOID) { CPU_INFO CpuInfo; + CPU_SIGNATURE CpuSignature; ULONG Stepping, Type; /* Do CPUID 1 now */ @@ -150,17 +166,14 @@ KiSetProcessorType(VOID) /* * Get the Stepping and Type. The stepping contains both the - * Model and the Step, while the Type contains the returned Type. - * We ignore the family. + * Model and the Step, while the Type contains the returned Family. * * For the stepping, we convert this: zzzzzzxy into this: x0y */ - Stepping = CpuInfo.Eax & 0xF0; - Stepping <<= 4; - Stepping += (CpuInfo.Eax & 0xFF); - Stepping &= 0xF0F; - Type = CpuInfo.Eax & 0xF00; - Type >>= 8; + CpuSignature.AsULONG = CpuInfo.Eax; + Stepping = CpuSignature.Model; + Stepping = (Stepping << 8) | CpuSignature.Step; + Type = CpuSignature.Family; /* Save them in the PRCB */ KeGetCurrentPrcb()->CpuID = TRUE;

1 0

[reactos] 01/03: [NTOS:KE] Move KiGet/SetProcessorType function below KiGetCpuVendor
by Stanislav Motylkov 09 May '22

09 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc82bc14e2efd08e92ec7… commit cc82bc14e2efd08e92ec7b532020d0a330003091 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 9 20:38:02 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 9 21:50:19 2022 +0300 [NTOS:KE] Move KiGet/SetProcessorType function below KiGetCpuVendor CORE-17974 --- ntoskrnl/ke/amd64/cpu.c | 60 +++++++++++++++++++++++------------------------ ntoskrnl/ke/i386/cpu.c | 62 ++++++++++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 659264cde30..cbce873f619 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -37,36 +37,6 @@ static const CHAR CmpCentaurID[] = "CentaurHauls"; /* FUNCTIONS *****************************************************************/ -VOID -NTAPI -KiSetProcessorType(VOID) -{ - CPU_INFO CpuInfo; - ULONG Stepping, Type; - - /* Do CPUID 1 now */ - KiCpuId(&CpuInfo, 1); - - /* - * Get the Stepping and Type. The stepping contains both the - * Model and the Step, while the Type contains the returned Type. - * We ignore the family. - * - * For the stepping, we convert this: zzzzzzxy into this: x0y - */ - Stepping = CpuInfo.Eax & 0xF0; - Stepping <<= 4; - Stepping += (CpuInfo.Eax & 0xFF); - Stepping &= 0xF0F; - Type = CpuInfo.Eax & 0xF00; - Type >>= 8; - - /* Save them in the PRCB */ - KeGetCurrentPrcb()->CpuID = TRUE; - KeGetCurrentPrcb()->CpuType = (UCHAR)Type; - KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; -} - ULONG NTAPI KiGetCpuVendor(VOID) @@ -107,6 +77,36 @@ KiGetCpuVendor(VOID) return Prcb->CpuVendor; } +VOID +NTAPI +KiSetProcessorType(VOID) +{ + CPU_INFO CpuInfo; + ULONG Stepping, Type; + + /* Do CPUID 1 now */ + KiCpuId(&CpuInfo, 1); + + /* + * Get the Stepping and Type. The stepping contains both the + * Model and the Step, while the Type contains the returned Type. + * We ignore the family. + * + * For the stepping, we convert this: zzzzzzxy into this: x0y + */ + Stepping = CpuInfo.Eax & 0xF0; + Stepping <<= 4; + Stepping += (CpuInfo.Eax & 0xFF); + Stepping &= 0xF0F; + Type = CpuInfo.Eax & 0xF00; + Type >>= 8; + + /* Save them in the PRCB */ + KeGetCurrentPrcb()->CpuID = TRUE; + KeGetCurrentPrcb()->CpuType = (UCHAR)Type; + KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; +} + ULONG NTAPI KiGetFeatureBits(VOID) diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index e627efe228a..4a53f407800 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -85,37 +85,6 @@ setCx86(UCHAR reg, UCHAR data) /* FUNCTIONS *****************************************************************/ -CODE_SEG("INIT") -VOID -NTAPI -KiSetProcessorType(VOID) -{ - CPU_INFO CpuInfo; - ULONG Stepping, Type; - - /* Do CPUID 1 now */ - KiCpuId(&CpuInfo, 1); - - /* - * Get the Stepping and Type. The stepping contains both the - * Model and the Step, while the Type contains the returned Type. - * We ignore the family. - * - * For the stepping, we convert this: zzzzzzxy into this: x0y - */ - Stepping = CpuInfo.Eax & 0xF0; - Stepping <<= 4; - Stepping += (CpuInfo.Eax & 0xFF); - Stepping &= 0xF0F; - Type = CpuInfo.Eax & 0xF00; - Type >>= 8; - - /* Save them in the PRCB */ - KeGetCurrentPrcb()->CpuID = TRUE; - KeGetCurrentPrcb()->CpuType = (UCHAR)Type; - KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; -} - CODE_SEG("INIT") ULONG NTAPI @@ -168,6 +137,37 @@ KiGetCpuVendor(VOID) return CPU_UNKNOWN; } +CODE_SEG("INIT") +VOID +NTAPI +KiSetProcessorType(VOID) +{ + CPU_INFO CpuInfo; + ULONG Stepping, Type; + + /* Do CPUID 1 now */ + KiCpuId(&CpuInfo, 1); + + /* + * Get the Stepping and Type. The stepping contains both the + * Model and the Step, while the Type contains the returned Type. + * We ignore the family. + * + * For the stepping, we convert this: zzzzzzxy into this: x0y + */ + Stepping = CpuInfo.Eax & 0xF0; + Stepping <<= 4; + Stepping += (CpuInfo.Eax & 0xFF); + Stepping &= 0xF0F; + Type = CpuInfo.Eax & 0xF00; + Type >>= 8; + + /* Save them in the PRCB */ + KeGetCurrentPrcb()->CpuID = TRUE; + KeGetCurrentPrcb()->CpuType = (UCHAR)Type; + KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; +} + CODE_SEG("INIT") ULONG NTAPI

1 0

[reactos] 01/01: [SHELL32] Fix visual glitch appeared after fixing CORE-18137 (#4488)
by Raymond Czerny 09 May '22

09 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74ceb655957ede39a4b6… commit d74ceb655957ede39a4b63084c065e1eaaa905a8 Author: Raymond Czerny <chip(a)raymisoft.de> AuthorDate: Mon May 9 20:36:23 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 9 21:36:23 2022 +0300 [SHELL32] Fix visual glitch appeared after fixing CORE-18137 (#4488) - Check if the parent window of RunDLL is the desktop, only in this case add the system control applet to the taskbar. - Try loading small 16x16 icon for the taskbar button. CORE-18175 --- dll/win32/shell32/wine/control.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 6044b736fdb..6103af4136c 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -819,10 +819,35 @@ Control_EnumWinProc( static void Control_ShowAppletInTaskbar(CPlApplet* applet, UINT index) { + HICON hSmallIcon; ITaskbarList* pTaskbar = NULL; + /* Try to add a taskbar button only if the applet's parent window is the desktop */ + if (GetParent(applet->hWnd) != NULL) + { + return; + } + SetWindowTextW(applet->hWnd, applet->info[index].name); - SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)applet->info[index].icon); + + /* Try loading the small icon for the taskbar button */ + hSmallIcon = (HICON)LoadImageW(applet->hModule, + MAKEINTRESOURCEW(applet->info[index].idIcon), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hSmallIcon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon); + } + else + { + if (applet->info[index].icon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)applet->info[index].icon); + } + } /* Add button to the taskbar */ ShowWindow(applet->hWnd, SW_SHOWMINNOACTIVE);

1 0

[reactos] 01/01: [IMM32] Silence two debug prints
by George Bișoc 08 May '22

08 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=081ffbeb4f02f000aa6ae… commit 081ffbeb4f02f000aa6aedd9177bf81b62684716 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 21:49:14 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 21:49:14 2022 +0200 [IMM32] Silence two debug prints These two debug prints are spammy as fuck and it makes shit harder to debug ReactOS, apart that these prints barely serve any purpose. --- dll/win32/imm32/ctf.c | 2 +- dll/win32/imm32/imm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index b894c4498e3..153d4c5e5fa 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -41,7 +41,7 @@ HRESULT APIENTRY CtfImmTIMDestroyInputContext(HIMC hIMC) // Win: CtfImmTIMCreateInputContext HRESULT APIENTRY CtfImmTIMCreateInputContext(HIMC hIMC) { - FIXME("(%p)\n", hIMC); + TRACE("(%p)\n", hIMC); return E_NOTIMPL; } diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e2e1e639689..c4cb95a1da1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -491,7 +491,7 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { - FIXME("We have to do something\n"); + TRACE("We have to do something\n"); } /***********************************************************************

1 0

[reactos] 02/02: [WINLOGON] Let Winlogon assign security to desktop when a user logs in now
by George Bișoc 08 May '22

08 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07227562c0731d847fe73… commit 07227562c0731d847fe73569fdcab180e567e7e1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 00:51:54 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 20:16:18 2022 +0200 [WINLOGON] Let Winlogon assign security to desktop when a user logs in now --- base/system/winlogon/security.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/base/system/winlogon/security.c b/base/system/winlogon/security.c index 4045496abb2..d2a845ffbd6 100644 --- a/base/system/winlogon/security.c +++ b/base/system/winlogon/security.c @@ -1446,21 +1446,12 @@ AllowAccessOnSession( goto Quit; } -/* - * FIXME: Desktop security management is broken. The application desktop gets created - * with CreateDesktopW() API call with an initial and defined security descriptor for it yet - * when we are giving access to the logged in user, SetUserObjectSecurity() API call fails to set - * new security because the desktop in question has no prior security descriptor (when it's - * been assigned even before!!!). This chunk of code must be enabled when this gets fixed. - */ -#if 0 /* Allow application desktop access to this user within this session */ if (!AllowDesktopAccessToUser(Session->ApplicationDesktop, LogonSid)) { ERR("AllowAccessOnSession(): Failed to allow application desktop access to the logon user!\n"); goto Quit; } -#endif /* Get the length of this logon SID */ SidLength = GetLengthSid(LogonSid);

1 0

[reactos] 01/02: [WIN32K:NTUSER] Assign a security descriptor when parsing the desktop object
by George Bișoc 08 May '22

08 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa815e1cfa66f65e1964b… commit aa815e1cfa66f65e1964bbb4cce917c04d56f631 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 00:39:44 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 20:16:15 2022 +0200 [WIN32K:NTUSER] Assign a security descriptor when parsing the desktop object The problem ReactOS currently faces is this -- whenever the desktop is being parsed we aren't assigning a security descriptor to it. As a matter of fact when Winlogon tries to assign new security information to the application desktop when a user logs in, Winlogon fails because no prior descriptor has been created for it even though we already do this when initializing security buffers in Winlogon. With that said, we must assign a descriptor when parsing the desktop as well. This fixes a hack in Winlogon where security assigning of application desktop during a log in is disabled (which we can now enable such code path back). --- win32ss/user/ntuser/desktop.c | 8 +++++ win32ss/user/ntuser/security.c | 66 ++++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/security.h | 7 +++++ 3 files changed, 81 insertions(+) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index fb8d6ed96cd..fcb3a8aa009 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -128,6 +128,14 @@ IntDesktopObjectParse(IN PVOID ParseObject, (PVOID*)&Desktop); if (!NT_SUCCESS(Status)) return Status; + /* Assign security to the desktop we have created */ + Status = IntAssignDesktopSecurityOnParse(WinStaObject, Desktop, AccessState); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Desktop); + return Status; + } + /* Initialize the desktop */ Status = UserInitializeDesktop(Desktop, RemainingName, WinStaObject); if (!NT_SUCCESS(Status)) diff --git a/win32ss/user/ntuser/security.c b/win32ss/user/ntuser/security.c index 0286a76f5e3..276d01bfe16 100644 --- a/win32ss/user/ntuser/security.c +++ b/win32ss/user/ntuser/security.c @@ -235,6 +235,72 @@ IntQueryUserSecurityIdentification( return STATUS_SUCCESS; } +/** + * @brief + * Assigns a security descriptor to the desktop + * object during a desktop object parse procedure. + * + * @param[in] WinSta + * A pointer to a window station object, of which + * such object contains its own security descriptor + * that will be captured. + * + * @param[in] Desktop + * A pointer to a desktop object that is created + * during a parse procedure. + * + * @param[in] AccessState + * A pointer to an access state structure that + * describes the progress state of an access in + * action. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * assigned new security descriptor to the desktop object. + * A NTSTATUS failure code is returned otherwise. + */ +NTSTATUS +NTAPI +IntAssignDesktopSecurityOnParse( + _In_ PWINSTATION_OBJECT WinSta, + _In_ PDESKTOP Desktop, + _In_ PACCESS_STATE AccessState) +{ + NTSTATUS Status; + PSECURITY_DESCRIPTOR CapturedDescriptor; + BOOLEAN MemoryAllocated; + + /* + * Capture the security descriptor from + * the window station. The window station + * in question has a descriptor that is + * inheritable and contains desktop access + * rights as well. + */ + Status = ObGetObjectSecurity(WinSta, + &CapturedDescriptor, + &MemoryAllocated); + if (!NT_SUCCESS(Status)) + { + ERR("IntAssignDesktopSecurityOnParse(): Failed to capture the security descriptor from window station (Status 0x%08lx)\n", Status); + return Status; + } + + /* Assign new security to the desktop */ + Status = ObAssignSecurity(AccessState, + CapturedDescriptor, + Desktop, + ExDesktopObjectType); + if (!NT_SUCCESS(Status)) + { + ERR("IntAssignDesktopSecurityOnParse(): Failed to assign security information to the desktop object (Status 0x%08lx)\n", Status); + } + + /* Release the descriptor that we have captured */ + ObReleaseObjectSecurity(CapturedDescriptor, MemoryAllocated); + return Status; +} + /** * @brief * Creates a security descriptor for the service. diff --git a/win32ss/user/ntuser/security.h b/win32ss/user/ntuser/security.h index f719beccc8a..1bbf185ac30 100644 --- a/win32ss/user/ntuser/security.h +++ b/win32ss/user/ntuser/security.h @@ -84,6 +84,13 @@ NTSTATUS IntQueryUserSecurityIdentification( _Out_ PTOKEN_USER *User); +NTSTATUS +NTAPI +IntAssignDesktopSecurityOnParse( + _In_ PWINSTATION_OBJECT WinSta, + _In_ PDESKTOP Desktop, + _In_ PACCESS_STATE AccessState); + NTSTATUS NTAPI IntCreateServiceSecurity(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs