Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 01/01: [IMM32] Renaming: s/g_SharedInfo/gSharedInfo/ (#4418)
by Katayama Hirofumi MZ 31 Mar '22

31 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6dfe032152c9fe7656959… commit 6dfe032152c9fe765695946240be7b55044f7be2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 31 10:00:06 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 31 10:00:06 2022 +0900 [IMM32] Renaming: s/g_SharedInfo/gSharedInfo/ (#4418) CORE-11700 --- dll/win32/imm32/imm.c | 6 +++--- dll/win32/imm32/precomp.h | 2 +- dll/win32/imm32/utils.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 3ad8d10df56..d811cf693c1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HMODULE g_hImm32Inst = NULL; PSERVERINFO gpsi = NULL; -SHAREDINFO g_SharedInfo = { NULL }; +SHAREDINFO gSharedInfo = { NULL }; BYTE g_bClientRegd = FALSE; static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) @@ -42,8 +42,8 @@ static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) */ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) { - g_SharedInfo = *ptr; - gpsi = g_SharedInfo.psi; + gSharedInfo = *ptr; + gpsi = gSharedInfo.psi; return Imm32InitInstance(hMod); } diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 62e2b0f0f8e..832d9bb1e77 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -73,7 +73,7 @@ extern HMODULE g_hImm32Inst; extern RTL_CRITICAL_SECTION g_csImeDpi; extern PIMEDPI g_pImeDpiList; extern PSERVERINFO gpsi; -extern SHAREDINFO g_SharedInfo; +extern SHAREDINFO gSharedInfo; extern BYTE g_bClientRegd; extern HANDLE ghImmHeap; diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index c5ded5470b7..d73eb170a74 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -172,11 +172,11 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType) if (!NtUserValidateHandleSecure(hObject)) return NULL; - ht = g_SharedInfo.aheList; /* handle table */ + ht = gSharedInfo.aheList; /* handle table */ ASSERT(ht); /* ReactOS-Specific! */ - ASSERT(g_SharedInfo.ulSharedDelta != 0); - he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta); + ASSERT(gSharedInfo.ulSharedDelta != 0); + he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - gSharedInfo.ulSharedDelta); index = (LOWORD(hObject) - FIRST_USER_HANDLE) >> 1; if ((INT)index < 0 || ht->nb_handles <= index || he[index].type != uType)

1 0

[reactos] 01/01: [IMM32] Renaming: s/pImmHeap/ghImmHeap/ (#4416)
by Katayama Hirofumi MZ 31 Mar '22

31 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed765b7c3b37c38222aa1… commit ed765b7c3b37c38222aa1a2b29727eb16781b337 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 31 09:11:13 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 31 09:11:13 2022 +0900 [IMM32] Renaming: s/pImmHeap/ghImmHeap/ (#4416) CORE-11700 --- dll/win32/imm32/precomp.h | 4 ++-- dll/win32/imm32/utils.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 07c5c6af4ba..62e2b0f0f8e 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -75,7 +75,7 @@ extern PIMEDPI g_pImeDpiList; extern PSERVERINFO gpsi; extern SHAREDINFO g_SharedInfo; extern BYTE g_bClientRegd; -extern HANDLE pImmHeap; +extern HANDLE ghImmHeap; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); @@ -85,7 +85,7 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType); BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes); -#define ImmLocalFree(lpData) HeapFree(pImmHeap, 0, (lpData)) +#define ImmLocalFree(lpData) HeapFree(ghImmHeap, 0, (lpData)) LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index f19cf6cf1c4..c5ded5470b7 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -13,7 +13,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -HANDLE pImmHeap = NULL; +HANDLE ghImmHeap = NULL; // Win: pImmHeap HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) @@ -220,13 +220,13 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes) { - if (!pImmHeap) + if (!ghImmHeap) { - pImmHeap = RtlGetProcessHeap(); - if (pImmHeap == NULL) + ghImmHeap = RtlGetProcessHeap(); + if (ghImmHeap == NULL) return NULL; } - return HeapAlloc(pImmHeap, dwFlags, dwBytes); + return HeapAlloc(ghImmHeap, dwFlags, dwBytes); } BOOL APIENTRY

1 0

[reactos] 01/01: [REACTOS] Update email in all my copyrights (#4415)
by Oleg Dubinskiy 30 Mar '22

30 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d81de7d5b12fed1f392b… commit 5d81de7d5b12fed1f392b7163633fbb84d46bdc0 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Thu Mar 31 01:53:30 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 31 01:53:30 2022 +0200 [REACTOS] Update email in all my copyrights (#4415) Change it to Gmail, because Yandex disabled ua domain, which was used in my previous email. --- base/applications/utilman/umandlg/lang/ru-RU.rc | 2 +- base/applications/utilman/umandlg/lang/uk-UA.rc | 2 +- dll/shellext/cryptext/lang/uk-UA.rc | 2 +- dll/win32/browseui/CShellTaskScheduler.cpp | 2 +- dll/win32/browseui/CShellTaskScheduler.h | 2 +- dll/win32/browseui/CUserAssist.cpp | 2 +- dll/win32/browseui/CUserAssist.h | 2 +- dll/win32/imm32/compstr.c | 1 - dll/win32/imm32/ime.c | 1 - dll/win32/imm32/imm.c | 1 - dll/win32/imm32/keymsg.c | 1 - dll/win32/imm32/utils.c | 1 - dll/win32/kernel32/client/file/iocompl.c | 2 +- dll/win32/profmap/profmap.c | 2 +- dll/win32/syssetup/lang/ru-RU.rc | 2 +- dll/win32/syssetup/wizard.c | 2 +- win32ss/reactx/ntddraw/dxeng.c | 2 +- 17 files changed, 12 insertions(+), 17 deletions(-) diff --git a/base/applications/utilman/umandlg/lang/ru-RU.rc b/base/applications/utilman/umandlg/lang/ru-RU.rc index 39997fe3ecd..34ae391dbd6 100644 --- a/base/applications/utilman/umandlg/lang/ru-RU.rc +++ b/base/applications/utilman/umandlg/lang/ru-RU.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Russian (Russia) translation resource - * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ LANGUAGE LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA diff --git a/base/applications/utilman/umandlg/lang/uk-UA.rc b/base/applications/utilman/umandlg/lang/uk-UA.rc index eadeda41e10..9bb9e7410a6 100644 --- a/base/applications/utilman/umandlg/lang/uk-UA.rc +++ b/base/applications/utilman/umandlg/lang/uk-UA.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Utility Manager (Accessibility) * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Ukrainian (Ukraine) translation resource - * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ LANGUAGE LANG_UKRAINIAN, SUBLANG_UKRAINIAN_UKRAINE diff --git a/dll/shellext/cryptext/lang/uk-UA.rc b/dll/shellext/cryptext/lang/uk-UA.rc index 5c67761bfa9..6ee031be46d 100644 --- a/dll/shellext/cryptext/lang/uk-UA.rc +++ b/dll/shellext/cryptext/lang/uk-UA.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS CryptExt Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Ukrainian (Ukraine) resource translation - * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/dll/win32/browseui/CShellTaskScheduler.cpp b/dll/win32/browseui/CShellTaskScheduler.cpp index ff1709c3383..7872b5d85a6 100644 --- a/dll/win32/browseui/CShellTaskScheduler.cpp +++ b/dll/win32/browseui/CShellTaskScheduler.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS browseui * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: IShellTaskScheduler implementation - * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #include "precomp.h" diff --git a/dll/win32/browseui/CShellTaskScheduler.h b/dll/win32/browseui/CShellTaskScheduler.h index 42001c18439..f86f65c05b6 100644 --- a/dll/win32/browseui/CShellTaskScheduler.h +++ b/dll/win32/browseui/CShellTaskScheduler.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS browseui * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: IShellTaskScheduler implementation - * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #pragma once diff --git a/dll/win32/browseui/CUserAssist.cpp b/dll/win32/browseui/CUserAssist.cpp index 54e6db7077d..1f9ca46554c 100644 --- a/dll/win32/browseui/CUserAssist.cpp +++ b/dll/win32/browseui/CUserAssist.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS browseui * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: IUserAssist implementation - * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ // See http://www.geoffchappell.com/studies/windows/ie/browseui/interfaces/iuseras… diff --git a/dll/win32/browseui/CUserAssist.h b/dll/win32/browseui/CUserAssist.h index 88bdf6985ae..7b6f5ea3480 100644 --- a/dll/win32/browseui/CUserAssist.h +++ b/dll/win32/browseui/CUserAssist.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS browseui * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: IUserAssist implementation - * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2020 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ // See https://www.geoffchappell.com/studies/windows/ie/browseui/classes/userassis… diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index 50f26af8bbb..95df0e11133 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -6,7 +6,6 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index eec07d540b8..1b78374e07e 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -6,7 +6,6 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 48c742b4cba..3ad8d10df56 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -6,7 +6,6 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 412b9a07d69..b76c40bf327 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -6,7 +6,6 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 2e5ffc4f301..f19cf6cf1c4 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -6,7 +6,6 @@ * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart * Copyright 2017 James Tabor <james.tabor(a)reactos.org> * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/dll/win32/kernel32/client/file/iocompl.c b/dll/win32/kernel32/client/file/iocompl.c index 0d2546be50d..dec1e7c1a81 100644 --- a/dll/win32/kernel32/client/file/iocompl.c +++ b/dll/win32/kernel32/client/file/iocompl.c @@ -4,7 +4,7 @@ * FILE: dll/win32/kernel32/client/file/iocompl.c * PURPOSE: Io Completion functions * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) - * Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) * UPDATE HISTORY: * Created 01/11/98 */ diff --git a/dll/win32/profmap/profmap.c b/dll/win32/profmap/profmap.c index 084963d1748..4ea8cdbb1dc 100644 --- a/dll/win32/profmap/profmap.c +++ b/dll/win32/profmap/profmap.c @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * FILE: dll/win32/profmap/profmap.c * PURPOSE: ReactOS User Profile Mapping API - * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ /* INCLUDES *******************************************************************/ diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 850091d370f..dbd72bbe064 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -3,7 +3,7 @@ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Russian resource file * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> - * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> + * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 5404e3c28a0..233b87aa184 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -7,7 +7,7 @@ * Pierre Schweitzer <heis_spiter(a)hotmail.com> * Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> + * Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> */ /* INCLUDES *****************************************************************/ diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index 8e280f4734b..2b1fe1cbd66 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -4,7 +4,7 @@ * FILE: win32ss/reactx/ntddraw/dxeng.c * PURPOSE: Implementation of DxEng functions * PROGRAMMERS: Magnus Olsen (magnus(a)greatlord.com) - * Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + * Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #include <win32k.h>

1 0

[reactos] 01/01: [IMM32] Renaming: s/Imm32CleanupContext/Imm32DestroyInputContext/
by Katayama Hirofumi MZ 29 Mar '22

29 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8902dc327781761718e2… commit f8902dc327781761718e2ac80feb710c89b332a3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 29 19:02:56 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 29 19:02:56 2022 +0900 [IMM32] Renaming: s/Imm32CleanupContext/Imm32DestroyInputContext/ CORE-11700 --- dll/win32/imm32/imm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5807c78f0f0..48c742b4cba 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -630,7 +630,7 @@ static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC) } } -BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) +BOOL APIENTRY Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep) { PIMEDPI pImeDpi; LPINPUTCONTEXTDX pIC; @@ -890,7 +890,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) return FALSE; hKL = GetKeyboardLayout(0); - return Imm32CleanupContext(hIMC, hKL, FALSE); + return Imm32DestroyInputContext(hIMC, hKL, FALSE); } /*********************************************************************** @@ -1278,7 +1278,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) hKL = GetKeyboardLayout(0); hIMC = (HIMC)NtUserGetThreadState(THREADSTATE_DEFAULTINPUTCONTEXT); - Imm32CleanupContext(hIMC, hKL, TRUE); + Imm32DestroyInputContext(hIMC, hKL, TRUE); break; case DLL_PROCESS_DETACH:

1 0

[reactos] 01/01: [IMM32] Renaming: s/Imm32GetContextEx/ImmGetSaveContext/
by Katayama Hirofumi MZ 29 Mar '22

29 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=720da3b9bef19c2188cec… commit 720da3b9bef19c2188cec479e8ea313ea9ff5ce7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 29 18:05:09 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 29 18:05:09 2022 +0900 [IMM32] Renaming: s/Imm32GetContextEx/ImmGetSaveContext/ CORE-11700 --- dll/win32/imm32/imm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 3dde6656739..5807c78f0f0 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -961,7 +961,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc) ImmLocalFree(pClientImc); } -static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) +static HIMC APIENTRY ImmGetSaveContext(HWND hWnd, DWORD dwContextFlags) { HIMC hIMC; PCLIENTIMC pClientImc; @@ -1002,7 +1002,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) TRACE("(%p)\n", hWnd); if (hWnd == NULL) return NULL; - return Imm32GetContextEx(hWnd, 2); + return ImmGetSaveContext(hWnd, 2); } /*********************************************************************** @@ -1171,7 +1171,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) } else { - hIMC = Imm32GetContextEx(hWnd, 1); + hIMC = ImmGetSaveContext(hWnd, 1); pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC) { @@ -1228,7 +1228,7 @@ BOOL WINAPI ImmWINNLSGetEnableStatus(HWND hWnd) return FALSE; } - return !!Imm32GetContextEx(hWnd, 2); + return !!ImmGetSaveContext(hWnd, 2); } /***********************************************************************

1 0

[reactos] 01/01: [IMM32] Renaming: s/Imm32HeapAlloc/ImmLocalAlloc/
by Katayama Hirofumi MZ 29 Mar '22

29 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46518ad6011ed41b4ade0… commit 46518ad6011ed41b4ade04ada7cc6bed1eba28f5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 29 18:02:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 29 18:02:25 2022 +0900 [IMM32] Renaming: s/Imm32HeapAlloc/ImmLocalAlloc/ s/Imm32HeapFree/ImmLocalFree/ CORE-11700 --- dll/win32/imm32/compstr.c | 36 ++++++++++++++++++------------------ dll/win32/imm32/ime.c | 46 +++++++++++++++++++++++----------------------- dll/win32/imm32/imm.c | 20 ++++++++++---------- dll/win32/imm32/keymsg.c | 30 +++++++++++++++--------------- dll/win32/imm32/precomp.h | 4 ++-- dll/win32/imm32/regword.c | 40 ++++++++++++++++++++-------------------- dll/win32/imm32/utils.c | 22 +++++++++++----------- dll/win32/imm32/win3.c | 4 ++-- 8 files changed, 101 insertions(+), 101 deletions(-) diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index b49b4a5db19..50f26af8bbb 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -582,7 +582,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp if (bAnsiClient) { cbCompNew = Imm32CompStrWideToAnsi(pComp, dwCompLen, NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -591,7 +591,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp else { cbCompNew = Imm32CompStrAnsiToWide(pComp, dwCompLen, NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -604,7 +604,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp if (bAnsiClient) { cbReadNew = Imm32CompStrWideToAnsi(pRead, dwReadLen, NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -613,7 +613,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp else { cbReadNew = Imm32CompStrAnsiToWide(pRead, dwReadLen, NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -631,7 +631,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp CS_StrW(pCS, CompStr), CS_SizeW(pCS, CompStr), NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -645,7 +645,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp CS_StrA(pCS, CompStr), CS_SizeA(pCS, CompStr), NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -663,7 +663,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp CS_StrW(pCS, CompReadStr), CS_SizeW(pCS, CompReadStr), NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -677,7 +677,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp CS_StrA(pCS, CompReadStr), CS_SizeA(pCS, CompReadStr), NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -695,7 +695,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp { cbCompNew = Imm32CompClauseWideToAnsi(pComp, dwCompLen, CS_StrW(pCS, CompStr), NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -706,7 +706,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp { cbCompNew = Imm32CompClauseAnsiToWide(pComp, dwCompLen, CS_StrA(pCS, CompStr), NULL, 0, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -721,7 +721,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp { cbReadNew = Imm32CompClauseWideToAnsi(pRead, dwReadLen, CS_StrW(pCS, CompReadStr), NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -733,7 +733,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp { cbReadNew = Imm32CompClauseAnsiToWide(pRead, dwReadLen, CS_StrA(pCS, CompReadStr), NULL, 0, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -750,7 +750,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp if (bAnsiClient) { cbCompNew = Imm32ReconvertAnsiFromWide(NULL, pComp, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -762,7 +762,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp else { cbCompNew = Imm32ReconvertWideFromAnsi(NULL, pComp, uCodePage); - pCompNew = Imm32HeapAlloc(0, cbCompNew); + pCompNew = ImmLocalAlloc(0, cbCompNew); if (!pCompNew) goto Quit; @@ -778,7 +778,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp if (bAnsiClient) { cbReadNew = Imm32ReconvertAnsiFromWide(NULL, pRead, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -790,7 +790,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp else { cbReadNew = Imm32ReconvertWideFromAnsi(NULL, pRead, uCodePage); - pReadNew = Imm32HeapAlloc(0, cbReadNew); + pReadNew = ImmLocalAlloc(0, cbReadNew); if (!pReadNew) goto Quit; @@ -836,8 +836,8 @@ Quit: ImmUnlockIMCC(pIC->hCompStr); if (pIC) ImmUnlockIMC(hIMC); - Imm32HeapFree(pCompNew); - Imm32HeapFree(pReadNew); + ImmLocalFree(pCompNew); + ImmLocalFree(pReadNew); ImmUnlockImeDpi(pImeDpi); return ret; } diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index ef18b027a77..eec07d540b8 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -229,7 +229,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) return NULL; } - pImeDpiNew = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI)); + pImeDpiNew = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI)); if (pImeDpiNew == NULL) return NULL; @@ -244,7 +244,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) { - Imm32HeapFree(pImeDpiNew); + ImmLocalFree(pImeDpiNew); return FALSE; } @@ -259,7 +259,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) RtlLeaveCriticalSection(&g_csImeDpi); Imm32FreeImeDpi(pImeDpiNew, FALSE); - Imm32HeapFree(pImeDpiNew); + ImmLocalFree(pImeDpiNew); return pImeDpiFound; } else @@ -343,7 +343,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL) } Imm32FreeImeDpi(pImeDpi0, TRUE); - Imm32HeapFree(pImeDpi0); + ImmLocalFree(pImeDpi0); Quit: RtlLeaveCriticalSection(&g_csImeDpi); @@ -422,7 +422,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (lpImeMenu) { cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOA)) * sizeof(IMEMENUITEMINFOW)); - pNewItems = Imm32HeapAlloc(0, cbTotal); + pNewItems = ImmLocalAlloc(0, cbTotal); if (!pNewItems) goto Quit; } @@ -435,7 +435,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (lpImeMenu) { cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOW)) * sizeof(IMEMENUITEMINFOA)); - pNewItems = Imm32HeapAlloc(0, cbTotal); + pNewItems = ImmLocalAlloc(0, cbTotal); if (!pNewItems) goto Quit; } @@ -489,7 +489,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen Quit: if (pNewItems != lpImeMenu) - Imm32HeapFree(pNewItems); + ImmLocalFree(pNewItems); ImmUnlockImeDpi(pImeDpi); ImmUnlockIMC(hIMC); return ret; @@ -516,8 +516,8 @@ HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); Quit: - Imm32HeapFree(pszFileNameW); - Imm32HeapFree(pszLayoutTextW); + ImmLocalFree(pszFileNameW); + ImmLocalFree(pszLayoutTextW); return hKL; } @@ -553,10 +553,10 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) cLayouts = Imm32GetRegImes(NULL, 0); if (cLayouts) { - pLayouts = Imm32HeapAlloc(0, cLayouts * sizeof(REG_IME)); + pLayouts = ImmLocalAlloc(0, cLayouts * sizeof(REG_IME)); if (!pLayouts || !Imm32GetRegImes(pLayouts, cLayouts)) { - Imm32HeapFree(pLayouts); + ImmLocalFree(pLayouts); return NULL; } @@ -611,7 +611,7 @@ HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) } Quit: - Imm32HeapFree(pLayouts); + ImmLocalFree(pLayouts); return hNewKL; } @@ -788,7 +788,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) } Imm32FreeImeDpi(pImeDpi, TRUE); - Imm32HeapFree(pImeDpi); + ImmLocalFree(pImeDpi); RtlLeaveCriticalSection(&g_csImeDpi); } @@ -1520,7 +1520,7 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst, if (cb == 0) goto Quit; - pCL = Imm32HeapAlloc(0, cb); + pCL = ImmLocalAlloc(0, cb); if (pCL == NULL) goto Quit; @@ -1531,8 +1531,8 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst, ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP); Quit: - Imm32HeapFree(pszSrcW); - Imm32HeapFree(pCL); + ImmLocalFree(pszSrcW); + ImmLocalFree(pCL); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1575,7 +1575,7 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst, if (cb == 0) goto Quit; - pCL = Imm32HeapAlloc(0, cb); + pCL = ImmLocalAlloc(0, cb); if (!pCL) goto Quit; @@ -1586,8 +1586,8 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst, ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP); Quit: - Imm32HeapFree(pszSrcA); - Imm32HeapFree(pCL); + ImmLocalFree(pszSrcA); + ImmLocalFree(pCL); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1721,8 +1721,8 @@ DoIt: SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); Quit: - Imm32HeapFree(RegWordW.lpReading); - Imm32HeapFree(RegWordW.lpWord); + ImmLocalFree(RegWordW.lpReading); + ImmLocalFree(RegWordW.lpWord); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1775,8 +1775,8 @@ DoIt: SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); Quit: - Imm32HeapFree(RegWordA.lpReading); - Imm32HeapFree(RegWordA.lpWord); + ImmLocalFree(RegWordA.lpReading); + ImmLocalFree(RegWordA.lpWord); ImmUnlockImeDpi(pImeDpi); return ret; } diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index dad6998d9e1..3dde6656739 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -136,7 +136,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) cKLs = GetKeyboardLayoutList(0, NULL); if (cKLs) { - pList = Imm32HeapAlloc(0, cKLs * sizeof(HKL)); + pList = ImmLocalAlloc(0, cKLs * sizeof(HKL)); if (pList == NULL) return FALSE; @@ -150,7 +150,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) } } - Imm32HeapFree(pList); + ImmLocalFree(pList); } StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); @@ -593,14 +593,14 @@ HIMC WINAPI ImmCreateContext(void) if (!IS_IMM_MODE()) return NULL; - pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); + pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); if (pClientImc == NULL) return NULL; hIMC = NtUserCreateInputContext((ULONG_PTR)pClientImc); if (hIMC == NULL) { - Imm32HeapFree(pClientImc); + ImmLocalFree(pClientImc); return NULL; } @@ -624,9 +624,9 @@ static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC) for (pSubState = pState->pSubState; pSubState; pSubState = pSubStateNext) { pSubStateNext = pSubState->pNext; - Imm32HeapFree(pSubState); + ImmLocalFree(pSubState); } - Imm32HeapFree(pState); + ImmLocalFree(pState); } } @@ -913,7 +913,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) pClientImc = (PCLIENTIMC)pIMC->dwClientImcData; if (!pClientImc) { - pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); + pClientImc = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); if (!pClientImc) return NULL; @@ -923,7 +923,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) { - Imm32HeapFree(pClientImc); + ImmLocalFree(pClientImc); return NULL; } @@ -958,7 +958,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc) LocalFree(hInputContext); RtlDeleteCriticalSection(&pClientImc->cs); - Imm32HeapFree(pClientImc); + ImmLocalFree(pClientImc); } static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) @@ -1117,7 +1117,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD dwThreadId, IMCENUMPROC lpfn, LPARAM lPara break; } - Imm32HeapFree(phList); + ImmLocalFree(phList); return ret; } diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index a8dd1f93ced..412b9a07d69 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -281,7 +281,7 @@ static DWORD WINAPI Imm32UnknownProcess1Proc(LPVOID arg) SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, uValue, (LPARAM)pUnknown->hWnd, SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult); } - Imm32HeapFree(pUnknown); + ImmLocalFree(pUnknown); return FALSE; } @@ -304,7 +304,7 @@ LRESULT APIENTRY Imm32UnknownProcess1(HWND hWnd, BOOL fFlag) return lResult; } - pUnknown1 = Imm32HeapAlloc(0, sizeof(IMM_UNKNOWN_PROCESS1)); + pUnknown1 = ImmLocalAlloc(0, sizeof(IMM_UNKNOWN_PROCESS1)); if (!pUnknown1) return 0; @@ -428,9 +428,9 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA if (bAnsiAPI == bAnsiWnd) goto DoIt; if (bAnsiWnd) - pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTA)); + pTempData = ImmLocalAlloc(0, sizeof(LOGFONTA)); else - pTempData = Imm32HeapAlloc(0, sizeof(LOGFONTW)); + pTempData = ImmLocalAlloc(0, sizeof(LOGFONTW)); if (!pTempData) return 0; break; @@ -444,7 +444,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA else ret = Imm32ReconvertWideFromAnsi(NULL, pData, uCodePage); - pTempData = Imm32HeapAlloc(0, ret + sizeof(WCHAR)); + pTempData = ImmLocalAlloc(0, ret + sizeof(WCHAR)); if (!pTempData) return 0; @@ -474,7 +474,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA if (!cchCompStr) return 0; - pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(CHAR)); + pCS = ImmLocalAlloc(0, (cchCompStr + 1) * sizeof(CHAR)); if (!pCS) return 0; @@ -487,7 +487,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA if (!cchCompStr) return 0; - pCS = Imm32HeapAlloc(0, (cchCompStr + 1) * sizeof(WCHAR)); + pCS = ImmLocalAlloc(0, (cchCompStr + 1) * sizeof(WCHAR)); if (!pCS) return 0; @@ -495,7 +495,7 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA pICP->dwCharPos = IchAnsiFromWide(pICP->dwCharPos, pCS, uCodePage); } - Imm32HeapFree(pCS); + ImmLocalFree(pCS); break; default: @@ -552,7 +552,7 @@ DoIt: Quit: if (pTempData != pData) - Imm32HeapFree(pTempData); + ImmLocalFree(pTempData); return ret; } @@ -810,7 +810,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) goto Quit; cbTrans = dwCount * sizeof(TRANSMSG); - pTrans = Imm32HeapAlloc(0, cbTrans); + pTrans = ImmLocalAlloc(0, cbTrans); if (pTrans == NULL) goto Quit; @@ -843,7 +843,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) } Quit: - Imm32HeapFree(pTrans); + ImmLocalFree(pTrans); if (hMsgBuf) ImmUnlockIMCC(hMsgBuf); pIC->dwNumMsgBuf = 0; /* done */ @@ -877,7 +877,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) (Lang == LANG_KOREAN && NtUserGetAppImeLevel(hwnd) == 3)) { DWORD cbTransMsg = dwCount * sizeof(TRANSMSG); - pNewTransMsg = Imm32HeapAlloc(0, cbTransMsg); + pNewTransMsg = ImmLocalAlloc(0, cbTransMsg); if (pNewTransMsg) { RtlCopyMemory(pNewTransMsg, lpTransMsg, cbTransMsg); @@ -903,7 +903,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) #ifdef IMM_WIN3_SUPPORT if (pNewTransMsg != lpTransMsg) - Imm32HeapFree(pNewTransMsg); + ImmLocalFree(pNewTransMsg); #endif } @@ -997,7 +997,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD /* allocate a list */ cbList = offsetof(TRANSMSGLIST, TransMsg) + MSG_COUNT * sizeof(TRANSMSG); - pList = Imm32HeapAlloc(0, cbList); + pList = ImmLocalAlloc(0, cbList); if (!pList) goto Quit; @@ -1023,7 +1023,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD } Quit: - Imm32HeapFree(pList); + ImmLocalFree(pList); ImmUnlockImeDpi(pImeDpi); ImmUnlockIMC(hIMC); ImmReleaseContext(hwnd, hIMC); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index e525475f352..07c5c6af4ba 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -84,8 +84,8 @@ PWND FASTCALL ValidateHwndNoErr(HWND hwnd); LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType); BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); -LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); -#define Imm32HeapFree(lpData) HeapFree(pImmHeap, 0, (lpData)) +LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes); +#define ImmLocalFree(lpData) HeapFree(pImmHeap, 0, (lpData)) LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); diff --git a/dll/win32/imm32/regword.c b/dll/win32/imm32/regword.c index cf038a2edcc..32148e11e6b 100644 --- a/dll/win32/imm32/regword.c +++ b/dll/win32/imm32/regword.c @@ -51,8 +51,8 @@ Imm32EnumWordProcA2W(LPCSTR pszReadingA, DWORD dwStyle, LPCSTR pszRegisterA, LPV lpEnumData->ret = ret; Quit: - Imm32HeapFree(pszReadingW); - Imm32HeapFree(pszRegisterW); + ImmLocalFree(pszReadingW); + ImmLocalFree(pszRegisterW); return ret; } @@ -81,8 +81,8 @@ Imm32EnumWordProcW2A(LPCWSTR pszReadingW, DWORD dwStyle, LPCWSTR pszRegisterW, L lpEnumData->ret = ret; Quit: - Imm32HeapFree(pszReadingA); - Imm32HeapFree(pszRegisterA); + ImmLocalFree(pszReadingA); + ImmLocalFree(pszRegisterA); return ret; } @@ -136,8 +136,8 @@ ImmEnumRegisterWordA(HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, ret = EnumDataW2A.ret; Quit: - Imm32HeapFree(pszReadingW); - Imm32HeapFree(pszRegisterW); + ImmLocalFree(pszReadingW); + ImmLocalFree(pszRegisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -192,8 +192,8 @@ ImmEnumRegisterWordW(HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, ret = EnumDataA2W.ret; Quit: - Imm32HeapFree(pszReadingA); - Imm32HeapFree(pszRegisterA); + ImmLocalFree(pszReadingA); + ImmLocalFree(pszRegisterA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -224,7 +224,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf if (nItem > 0) { - pNewStylesW = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFW)); + pNewStylesW = ImmLocalAlloc(0, nItem * sizeof(STYLEBUFW)); if (!pNewStylesW) goto Quit; } @@ -251,7 +251,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf } Quit: - Imm32HeapFree(pNewStylesW); + ImmLocalFree(pNewStylesW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -282,7 +282,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf if (nItem > 0) { - pNewStylesA = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFA)); + pNewStylesA = ImmLocalAlloc(0, nItem * sizeof(STYLEBUFA)); if (!pNewStylesA) goto Quit; } @@ -308,7 +308,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf } Quit: - Imm32HeapFree(pNewStylesA); + ImmLocalFree(pNewStylesA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -354,8 +354,8 @@ ImmRegisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW); Quit: - Imm32HeapFree(pszReadingW); - Imm32HeapFree(pszRegisterW); + ImmLocalFree(pszReadingW); + ImmLocalFree(pszRegisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -401,8 +401,8 @@ ImmRegisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegist ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA); Quit: - Imm32HeapFree(pszReadingA); - Imm32HeapFree(pszRegisterA); + ImmLocalFree(pszReadingA); + ImmLocalFree(pszRegisterA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -448,8 +448,8 @@ ImmUnregisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregi ret = pImeDpi->ImeUnregisterWord(pszReadingW, dwStyle, pszUnregisterW); Quit: - Imm32HeapFree(pszReadingW); - Imm32HeapFree(pszUnregisterW); + ImmLocalFree(pszReadingW); + ImmLocalFree(pszUnregisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -495,8 +495,8 @@ ImmUnregisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnre ret = pImeDpi->ImeUnregisterWord(pszReadingA, dwStyle, pszUnregisterA); Quit: - Imm32HeapFree(pszReadingA); - Imm32HeapFree(pszUnregisterA); + ImmLocalFree(pszReadingA); + ImmLocalFree(pszUnregisterA); ImmUnlockImeDpi(pImeDpi); return ret; } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 91434297f14..2e5ffc4f301 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -63,7 +63,7 @@ BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA) { INT cch = lstrlenA(pszA); - LPWSTR pszW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); + LPWSTR pszW = ImmLocalAlloc(0, (cch + 1) * sizeof(WCHAR)); if (pszW == NULL) return NULL; cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pszA, cch, pszW, cch + 1); @@ -75,7 +75,7 @@ LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW) { INT cchW = lstrlenW(pszW); INT cchA = (cchW + 1) * sizeof(WCHAR); - LPSTR pszA = Imm32HeapAlloc(0, cchA); + LPSTR pszA = ImmLocalAlloc(0, cchA); if (!pszA) return NULL; cchA = WideCharToMultiByte(CP_ACP, 0, pszW, cchW, pszA, cchA, NULL, NULL); @@ -219,7 +219,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; } -LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes) +LPVOID APIENTRY ImmLocalAlloc(DWORD dwFlags, DWORD dwBytes) { if (!pImmHeap) { @@ -270,18 +270,18 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) DWORD dwCount = INITIAL_COUNT, cRetry = 0; HIMC *phNewList; - phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); + phNewList = ImmLocalAlloc(0, dwCount * sizeof(HIMC)); if (phNewList == NULL) return 0; Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount); while (Status == STATUS_BUFFER_TOO_SMALL) { - Imm32HeapFree(phNewList); + ImmLocalFree(phNewList); if (cRetry++ >= MAX_RETRY) return 0; - phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); + phNewList = ImmLocalAlloc(0, dwCount * sizeof(HIMC)); if (phNewList == NULL) return 0; @@ -290,7 +290,7 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) if (NT_ERROR(Status) || !dwCount) { - Imm32HeapFree(phNewList); + ImmLocalFree(phNewList); return 0; } @@ -361,7 +361,7 @@ Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL) } if (!pState) { - pState = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IME_STATE)); + pState = ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(IME_STATE)); if (pState) { pState->wLang = Lang; @@ -381,7 +381,7 @@ Imm32FetchImeSubState(PIME_STATE pState, HKL hKL) if (pSubState->hKL == hKL) return pSubState; } - pSubState = Imm32HeapAlloc(0, sizeof(IME_SUBSTATE)); + pSubState = ImmLocalAlloc(0, sizeof(IME_SUBSTATE)); if (!pSubState) return NULL; pSubState->dwValue = 0; @@ -650,7 +650,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) if (!cbVerInfo) goto Quit; - pVerInfo = Imm32HeapAlloc(0, cbVerInfo); + pVerInfo = ImmLocalAlloc(0, cbVerInfo); if (!pVerInfo) goto Quit; @@ -661,7 +661,7 @@ BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) ret = Imm32LoadImeLangAndDesc(pImeInfoEx, pVerInfo); } - Imm32HeapFree(pVerInfo); + ImmLocalFree(pVerInfo); Quit: if (bLoaded) diff --git a/dll/win32/imm32/win3.c b/dll/win32/imm32/win3.c index bce492c9cb1..43bb2abadb4 100644 --- a/dll/win32/imm32/win3.c +++ b/dll/win32/imm32/win3.c @@ -49,7 +49,7 @@ ImmNt3JTrans(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC, // clone the message list cbTempList = (dwCount + 1) * sizeof(TRANSMSG); - pTempList = Imm32HeapAlloc(HEAP_ZERO_MEMORY, cbTempList); + pTempList = ImmLocalAlloc(HEAP_ZERO_MEMORY, cbTempList); if (pTempList == NULL) return 0; RtlCopyMemory(pTempList, pTrans, dwCount * sizeof(TRANSMSG)); @@ -166,7 +166,7 @@ DoDefault: } } - Imm32HeapFree(pTempList); + ImmLocalFree(pTempList); return ret; }

1 0

[reactos] 01/01: [IMM32] Renaming: s/g_hImm32Heap/pImmHeap/
by Katayama Hirofumi MZ 29 Mar '22

29 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d744afbc77ff53a91121… commit 0d744afbc77ff53a911219192f8d67ca486a2506 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 29 17:59:23 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 29 17:59:23 2022 +0900 [IMM32] Renaming: s/g_hImm32Heap/pImmHeap/ CORE-11700 --- dll/win32/imm32/precomp.h | 4 ++-- dll/win32/imm32/utils.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index c2acccec149..e525475f352 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -75,7 +75,7 @@ extern PIMEDPI g_pImeDpiList; extern PSERVERINFO gpsi; extern SHAREDINFO g_SharedInfo; extern BYTE g_bClientRegd; -extern HANDLE g_hImm32Heap; +extern HANDLE pImmHeap; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); @@ -85,7 +85,7 @@ LPVOID FASTCALL ValidateHandleNoErr(HANDLE hObject, UINT uType); BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC); LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); -#define Imm32HeapFree(lpData) HeapFree(g_hImm32Heap, 0, (lpData)) +#define Imm32HeapFree(lpData) HeapFree(pImmHeap, 0, (lpData)) LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index e96f80528ae..91434297f14 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -14,7 +14,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -HANDLE g_hImm32Heap = NULL; +HANDLE pImmHeap = NULL; HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) @@ -221,13 +221,13 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes) { - if (!g_hImm32Heap) + if (!pImmHeap) { - g_hImm32Heap = RtlGetProcessHeap(); - if (g_hImm32Heap == NULL) + pImmHeap = RtlGetProcessHeap(); + if (pImmHeap == NULL) return NULL; } - return HeapAlloc(g_hImm32Heap, dwFlags, dwBytes); + return HeapAlloc(pImmHeap, dwFlags, dwBytes); } BOOL APIENTRY

1 0

[reactos] 01/01: [IMM32] Renaming: s/g_psi/gpsi/
by Katayama Hirofumi MZ 29 Mar '22

29 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82fa82d8e19883ef8cd2e… commit 82fa82d8e19883ef8cd2efc52f85635a7338c14c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 29 17:57:28 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Mar 29 17:57:28 2022 +0900 [IMM32] Renaming: s/g_psi/gpsi/ CORE-11700 --- dll/win32/imm32/imm.c | 4 ++-- dll/win32/imm32/keymsg.c | 2 +- dll/win32/imm32/precomp.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index a4e48cb88ce..dad6998d9e1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -15,7 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HMODULE g_hImm32Inst = NULL; -PSERVERINFO g_psi = NULL; +PSERVERINFO gpsi = NULL; SHAREDINFO g_SharedInfo = { NULL }; BYTE g_bClientRegd = FALSE; @@ -44,7 +44,7 @@ static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) { g_SharedInfo = *ptr; - g_psi = g_SharedInfo.psi; + gpsi = g_SharedInfo.psi; return Imm32InitInstance(hMod); } diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 0b5baaf7e88..a8dd1f93ced 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -292,7 +292,7 @@ LRESULT APIENTRY Imm32UnknownProcess1(HWND hWnd, BOOL fFlag) PIMM_UNKNOWN_PROCESS1 pUnknown1; DWORD_PTR lResult = 0; - if (hWnd && g_psi) + if (hWnd && gpsi) pWnd = ValidateHwndNoErr(hWnd); if (!pWnd) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 3de40f0cbc0..c2acccec149 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -72,7 +72,7 @@ typedef struct REG_IME extern HMODULE g_hImm32Inst; extern RTL_CRITICAL_SECTION g_csImeDpi; extern PIMEDPI g_pImeDpiList; -extern PSERVERINFO g_psi; +extern PSERVERINFO gpsi; extern SHAREDINFO g_SharedInfo; extern BYTE g_bClientRegd; extern HANDLE g_hImm32Heap; @@ -112,8 +112,8 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) -#define IS_IMM_MODE() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) -#define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) +#define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) +#define Imm32IsCiceroMode() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) DWORD APIENTRY

1 0

[reactos] 01/01: [DISKPART] Fix duplicate resource IDs
by Eric Kohl 28 Mar '22

28 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4f08c7746be3086a2db5… commit a4f08c7746be3086a2db522cc83da541051da6c8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 28 21:04:06 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 28 21:04:06 2022 +0200 [DISKPART] Fix duplicate resource IDs --- base/system/diskpart/resource.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index ab5989de4d3..44ad22cdee6 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -17,26 +17,26 @@ #define IDS_APP_LEAVING 4 #define IDS_APP_PROMPT 5 -#define IDS_DETAIL_INFO_DISK_ID 7 -#define IDS_DETAIL_INFO_TYPE 8 -#define IDS_DETAIL_INFO_STATUS 9 -#define IDS_DETAIL_INFO_PATH 10 -#define IDS_DETAIL_INFO_TARGET 11 -#define IDS_DETAIL_INFO_LUN_ID 12 -#define IDS_DETAIL_INFO_LOC_PATH 13 -#define IDS_DETAIL_INFO_CURR_RO_STATE 14 -#define IDS_DETAIL_INFO_RO 15 -#define IDS_DETAIL_INFO_BOOT_DSK 16 -#define IDS_DETAIL_INFO_PAGE_FILE_DSK 17 -#define IDS_DETAIL_INFO_HIBER_FILE_DSK 18 -#define IDS_DETAIL_INFO_CRASH_DSK 19 -#define IDS_DETAIL_INFO_CLST_DSK 20 +#define IDS_DETAIL_INFO_DISK_ID 1107 +#define IDS_DETAIL_INFO_TYPE 1108 +#define IDS_DETAIL_INFO_STATUS 1109 +#define IDS_DETAIL_INFO_PATH 1110 +#define IDS_DETAIL_INFO_TARGET 1111 +#define IDS_DETAIL_INFO_LUN_ID 1112 +#define IDS_DETAIL_INFO_LOC_PATH 1113 +#define IDS_DETAIL_INFO_CURR_RO_STATE 1114 +#define IDS_DETAIL_INFO_RO 1115 +#define IDS_DETAIL_INFO_BOOT_DSK 1116 +#define IDS_DETAIL_INFO_PAGE_FILE_DSK 1117 +#define IDS_DETAIL_INFO_HIBER_FILE_DSK 1118 +#define IDS_DETAIL_INFO_CRASH_DSK 1119 +#define IDS_DETAIL_INFO_CLST_DSK 1120 -#define IDS_DETAIL_PARTITION_NUMBER 30 -#define IDS_DETAIL_PARTITION_TYPE 31 -#define IDS_DETAIL_PARTITION_HIDDEN 32 -#define IDS_DETAIL_PARTITION_ACTIVE 33 -#define IDS_DETAIL_PARTITION_OFFSET 34 +#define IDS_DETAIL_PARTITION_NUMBER 1130 +#define IDS_DETAIL_PARTITION_TYPE 1131 +#define IDS_DETAIL_PARTITION_HIDDEN 1132 +#define IDS_DETAIL_PARTITION_ACTIVE 1133 +#define IDS_DETAIL_PARTITION_OFFSET 1134 #define IDS_LIST_DISK_HEAD 3300 #define IDS_LIST_DISK_LINE 3301

1 0

[reactos] 01/01: [NTOS:IO] IoRegisterDeviceInterface: create non-volatile keys for new device interfaces Always create only non-volatile (sub)keys when registering a new device interface, so then they are saved after reboot. On Windows, nearly all device interface keys are non-volatile, except the "Control" subkey, which is managed by IoSetDeviceInterfaceState instead. In particular, it fixes MS sysaudio loading failure with MS audio drivers replacement (ks, portcls, swenum, sysaudio, wdmaud). M
by Oleg Dubinskiy 28 Mar '22

28 Mar '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7309801e5ab693add8510… commit 7309801e5ab693add8510da72921d982432d75a3 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Jan 16 19:57:43 2022 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Mon Mar 28 08:13:05 2022 +0200 [NTOS:IO] IoRegisterDeviceInterface: create non-volatile keys for new device interfaces Always create only non-volatile (sub)keys when registering a new device interface, so then they are saved after reboot. On Windows, nearly all device interface keys are non-volatile, except the "Control" subkey, which is managed by IoSetDeviceInterfaceState instead. In particular, it fixes MS sysaudio loading failure with MS audio drivers replacement (ks, portcls, swenum, sysaudio, wdmaud). My IoGetDeviceInterfaceAlias implementation is also required to be applied. MS sysaudio implementation(s) except that those keys are non-volatile (but we're creating them volatile instead), and trying to create a subkey(s) there (via other IoDeviceInterface* routines), to read/write some needed data. But then they fail to do that with STATUS_CHILD_MUST_BE_VOLA [...] The volatile keys can never have non-volatile subkeys. CORE-17361 --- ntoskrnl/io/iomgr/deviface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/deviface.c b/ntoskrnl/io/iomgr/deviface.c index 6a57e7d203b..d640f7087b9 100644 --- a/ntoskrnl/io/iomgr/deviface.c +++ b/ntoskrnl/io/iomgr/deviface.c @@ -1060,7 +1060,7 @@ IoRegisterDeviceInterface(IN PDEVICE_OBJECT PhysicalDeviceObject, &ObjectAttributes, 0, /* TileIndex */ NULL, /* Class */ - REG_OPTION_VOLATILE, + REG_OPTION_NON_VOLATILE, NULL); /* Disposition */ if (!NT_SUCCESS(Status)) @@ -1111,7 +1111,7 @@ IoRegisterDeviceInterface(IN PDEVICE_OBJECT PhysicalDeviceObject, &ObjectAttributes, 0, /* TileIndex */ NULL, /* Class */ - REG_OPTION_VOLATILE, + REG_OPTION_NON_VOLATILE, NULL); /* Disposition */ if (!NT_SUCCESS(Status)) @@ -1175,7 +1175,7 @@ IoRegisterDeviceInterface(IN PDEVICE_OBJECT PhysicalDeviceObject, &ObjectAttributes, 0, /* TileIndex */ NULL, /* Class */ - REG_OPTION_VOLATILE, + REG_OPTION_NON_VOLATILE, NULL); /* Disposition */ if (!NT_SUCCESS(Status))

1 0

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 March 2022