Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 01/01: [IMM32] s/CLIENTIMC_UNKNOWN1/CLIENTIMC_DESTROY/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ba810c08e7060d00c9ef… commit 6ba810c08e7060d00c9efb84f56fd85a7db0c5e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 3 16:17:07 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 3 16:17:07 2022 +0900 [IMM32] s/CLIENTIMC_UNKNOWN1/CLIENTIMC_DESTROY/ CORE-11700 --- dll/win32/imm32/imm.c | 8 ++++---- win32ss/include/ntuser.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 2a22fc18671..a4e48cb88ce 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -657,7 +657,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) return FALSE; } - if (pClientImc->dwFlags & CLIENTIMC_UNKNOWN1) + if (pClientImc->dwFlags & CLIENTIMC_DESTROY) return TRUE; InterlockedIncrement(&pClientImc->cLockObj); @@ -689,7 +689,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) ImmUnlockIMC(hIMC); Quit: - pClientImc->dwFlags |= CLIENTIMC_UNKNOWN1; + pClientImc->dwFlags |= CLIENTIMC_DESTROY; ImmUnlockClientImc(pClientImc); Finish: @@ -931,7 +931,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) } else { - if (pClientImc->dwFlags & CLIENTIMC_UNKNOWN1) + if (pClientImc->dwFlags & CLIENTIMC_DESTROY) return NULL; } @@ -950,7 +950,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc) TRACE("(%p)\n", pClientImc); cLocks = InterlockedDecrement(&pClientImc->cLockObj); - if (cLocks != 0 || !(pClientImc->dwFlags & CLIENTIMC_UNKNOWN1)) + if (cLocks != 0 || !(pClientImc->dwFlags & CLIENTIMC_DESTROY)) return; hInputContext = pClientImc->hInputContext; diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 326bc9aefbe..846750ca64e 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1316,7 +1316,7 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34); #define CLIENTIMC_WIDE 0x1 #define CLIENTIMC_UNKNOWN5 0x2 #define CLIENTIMC_UNKNOWN4 0x20 -#define CLIENTIMC_UNKNOWN1 0x40 +#define CLIENTIMC_DESTROY 0x40 #define CLIENTIMC_UNKNOWN3 0x80 #define CLIENTIMC_UNKNOWN2 0x100

2 years, 9 months

[reactos] 01/01: [RUNAS] de-DE.rc Fix typo

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6b544fe37de6a71269e5… commit a6b544fe37de6a71269e53bd97bc4d72bbe2130f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Mar 3 04:17:43 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Mar 3 04:17:43 2022 +0100 [RUNAS] de-DE.rc Fix typo An addendum to 0.4.15-dev-3876-g 4109072bc835f3c66d694c428b38a03ef7d4349c which had no JIRA-ticket. --- base/applications/runas/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/runas/lang/de-DE.rc b/base/applications/runas/lang/de-DE.rc index 01b3d2cdd59..4d012747f39 100644 --- a/base/applications/runas/lang/de-DE.rc +++ b/base/applications/runas/lang/de-DE.rc @@ -21,7 +21,7 @@ BEGIN IDS_USAGE17 " Programm Befehlszeile einer ausführbaren Datei. Siehe unten\n aufgeführte Beispiele.\n\n" IDS_USAGE18 "Beispiel:\n" IDS_USAGE19 "> runas /noprofile /user:mymachine\\administrator cmd\n\n" - IDS_USAGE20 "HINWEIS: /profile is nicht kompatibel mit /netonly.\n" + IDS_USAGE20 "HINWEIS: /profile ist nicht kompatibel mit /netonly.\n" IDS_START "Es wird versucht, %s als Benutzer ""%s\\%s"" zu starten...\n" IDS_RUN_ERROR "RUNAS-FEHLER: %s kann nicht ausgeführt werden\n"

2 years, 9 months

[reactos] 01/01: [MSCONFIG_NEW] Exclude from the iso, for the time being CORE-18067

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6de6098fb1ec1798f6c9… commit e6de6098fb1ec1798f6c94150ea092dd3030a0a2 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Mar 3 03:33:40 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Mar 3 03:33:40 2022 +0100 [MSCONFIG_NEW] Exclude from the iso, for the time being CORE-18067 Since more than 10 years we do ship two binaries for the very same purpose in our isos: msconfig and msconfig_new. msconfig_new was an attempt to refactor the old tool, but it got stuck rather soon and is bloating our isos since then, and consuming build-time. My testing shows that the older version is superior in many ways compared to that refactoring attempt: see CORE-18067 for examples of some bugs. Personally I think focusing on the older tool exclusively would make more sense than trying to improve that refactoring proposal. But since one never knows what the future might bring and I did not want to step on anyones toes, I decided to just disable the build and iso-integration of the unfinished one meanwhile, instead of dumping it entirely. Although my feeling is that after 10years of waiting it's not worth waiting another 10 years with that. --- base/applications/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index c363430f0cb..7679233e5f2 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -21,7 +21,7 @@ add_subdirectory(magnify) add_subdirectory(mmc) add_subdirectory(mplay32) add_subdirectory(msconfig) -add_subdirectory(msconfig_new) +#add_subdirectory(msconfig_new) #excluded from the build because it is significantly more buggy than the old msconfig. see CORE-18067 for examples add_subdirectory(mscutils) add_subdirectory(mshta) add_subdirectory(mspaint)

2 years, 9 months

[reactos] 01/01: [IMM32] Silence "invalid HIMC" in Imm32CleanupContext

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6317405f68a825396c90… commit f6317405f68a825396c90f9e04e35271ab09e1fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 3 10:21:49 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 3 10:21:49 2022 +0900 [IMM32] Silence "invalid HIMC" in Imm32CleanupContext CORE-18049 --- dll/win32/imm32/imm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 1d80bf28232..2a22fc18671 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -638,10 +638,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) PIMC pIMC; if (!IS_IMM_MODE() || hIMC == NULL) - { - ERR("invalid HIMC\n"); return FALSE; - } pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT); if (!pIMC || pIMC->head.pti != Imm32CurrentPti())

2 years, 9 months

[reactos] 01/01: [IMM32_APITEST] Fix ImmGetImeInfoEx for Win2k3

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c097babff25e0637acbf… commit 1c097babff25e0637acbf824538e74b0587da598 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 3 10:10:46 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Mar 3 10:10:46 2022 +0900 [IMM32_APITEST] Fix ImmGetImeInfoEx for Win2k3 CORE-11700 --- modules/rostests/apitests/imm32/ImmGetImeInfoEx.c | 33 ++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c b/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c index 3a7451e00ab..5eef2658904 100644 --- a/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c +++ b/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c @@ -81,11 +81,11 @@ START_TEST(ImmGetImeInfoEx) ok(InfoEx.wszImeFile[0] != 0, "wszImeFile was empty\n"); hKL = hOldKL; - // ImeInfoExImeWindow + // ImeInfoExKeyboardLayoutTFS hOldKL = hKL; FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); InfoEx.wszUIClass[0] = InfoEx.wszImeFile[0] = 0; - ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExImeWindow, &hKL); + ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExKeyboardLayoutTFS, &hKL); PrintInfoEx(&InfoEx); ok_int(ret, TRUE); if (IS_IME_HKL(InfoEx.hkl)) @@ -103,7 +103,34 @@ START_TEST(ImmGetImeInfoEx) ok(InfoEx.wszImeFile[0] != 0, "wszImeFile was empty\n"); hKL = hOldKL; - // TODO: ImeInfoExImeFileName + // ImeInfoExImeWindow + hOldKL = hKL; + FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); + ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExImeWindow, &hKL); + ok_int(ret, FALSE); + bMatch = TRUE; + for (ib = 0; ib < sizeof(InfoEx); ++ib) + { + if (((LPBYTE)&InfoEx)[ib] != 0xCC) + { + bMatch = FALSE; + break; + } + } + ok_int(bMatch, TRUE); + + // ImeInfoExImeFileName + hOldKL = hKL; + FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); + InfoEx.wszUIClass[0] = InfoEx.wszImeFile[0] = 0; + ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExImeFileName, L"THISISTEST"); + PrintInfoEx(&InfoEx); + ok_int(ret, FALSE); + ok(InfoEx.ImeInfo.dwPrivateDataSize >= 4, "\n"); + ok_wstr(InfoEx.wszUIClass, L""); + ok_long(InfoEx.dwImeWinVersion, 0xCCCCCCCC); + ok_wstr(InfoEx.wszImeFile, L"THISISTEST"); + hKL = hOldKL; // 4 hOldKL = hKL;

2 years, 9 months

[reactos] 01/01: [NTUSER][IMM32] Fix ValidateHandleNoErr (#4377)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfeb498e4f2ed0eaef6d2… commit cfeb498e4f2ed0eaef6d29cd4332c60120347b10 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 3 09:43:05 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 3 09:43:05 2022 +0900 [NTUSER][IMM32] Fix ValidateHandleNoErr (#4377) - Add DesktopPtrToUser helper function. - Fix imm32.ValidateHandleNoErr function. - Use DesktopHeapAlloc to allocate the IMC, instead of ExAllocatePoolWithTag. - Use DesktopHeapFree to free the IMC, instead of ExFreePoolWithTag. CORE-11700, CORE-18049 --- dll/win32/imm32/utils.c | 27 ++++++++++++++++++++++++--- win32ss/user/ntuser/ime.c | 11 ++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 8c3d8ad3c11..e96f80528ae 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -149,12 +149,26 @@ VOID APIENTRY LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA) plfA->lfFaceName[cch] = 0; } +static PVOID FASTCALL DesktopPtrToUser(PVOID ptr) +{ + PCLIENTINFO pci = GetWin32ClientInfo(); + PDESKTOPINFO pdi = pci->pDeskInfo; + + ASSERT(ptr != NULL); + ASSERT(pdi != NULL); + if (pdi->pvDesktopBase <= ptr && ptr < pdi->pvDesktopLimit) + return (PVOID)((ULONG_PTR)ptr - pci->ulClientDelta); + else + return (PVOID)NtUserCallOneParam((DWORD_PTR)ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING); +} + LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) { - INT index; + UINT index; PUSER_HANDLE_TABLE ht; PUSER_HANDLE_ENTRY he; WORD generation; + LPVOID ptr; if (!NtUserValidateHandleSecure(hObject)) return NULL; @@ -166,14 +180,21 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta); index = (LOWORD(hObject) - FIRST_USER_HANDLE) >> 1; - if (index < 0 || ht->nb_handles <= index || he[index].type != uType) + if ((INT)index < 0 || ht->nb_handles <= index || he[index].type != uType) + return NULL; + + if (he[index].flags & HANDLEENTRY_DESTROY) return NULL; generation = HIWORD(hObject); if (generation != he[index].generation && generation && generation != 0xFFFF) return NULL; - return &he[index]; + ptr = he[index].ptr; + if (ptr) + ptr = DesktopPtrToUser(ptr); + + return ptr; } PWND FASTCALL ValidateHwndNoErr(HWND hwnd) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index f29f4e4cfa4..124e5667c88 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1200,7 +1200,10 @@ AllocInputContextObject(PDESKTOP pDesk, ASSERT(Size > sizeof(*ObjHead)); ASSERT(pti != NULL); - ObjHead = ExAllocatePoolWithTag(PagedPool, Size, USERTAG_IME); + if (!pDesk) + pDesk = pti->rpdesk; + + ObjHead = DesktopHeapAlloc(pDesk, Size); if (!ObjHead) return NULL; @@ -1218,6 +1221,8 @@ AllocInputContextObject(PDESKTOP pDesk, VOID UserFreeInputContext(PVOID Object) { + PTHRDESKHEAD ObjHead = Object; + PDESKTOP pDesk = ObjHead->rpdesk; PIMC pIMC = Object, *ppIMC; PTHREADINFO pti; @@ -1235,7 +1240,7 @@ VOID UserFreeInputContext(PVOID Object) } } - ExFreePoolWithTag(pIMC, USERTAG_IME); + DesktopHeapFree(pDesk, Object); pti->ppi->UserHandleCount--; IntDereferenceThreadInfo(pti); @@ -1250,7 +1255,7 @@ BOOLEAN UserDestroyInputContext(PVOID Object) UserMarkObjectDestroy(pIMC); - return UserDeleteObject(pIMC->head.h, TYPE_INPUTCONTEXT); + return UserDeleteObject(UserHMGetHandle(pIMC), TYPE_INPUTCONTEXT); } BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC)

2 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022