Ros-diffs April 2022

ros-diffs@reactos.org

22 participants
157 discussions

[reactos] 01/01: [MIDIMAP] MIDIMAP_modMessage(): Fix a MSVC amd64 C4133 warning

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4121b0e80591b1862555d… commit 4121b0e80591b1862555ddd1fb60dd333e8c3f77 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Apr 11 19:20:13 2022 +0300 [MIDIMAP] MIDIMAP_modMessage(): Fix a MSVC amd64 C4133 warning MSVC amd64 '...\dll\win32\winmm\midimap\midimap.c(474): warning C4133: 'function': incompatible types - from 'LPDWORD' to 'DWORD_PTR *'' Import missed parts of https://source.winehq.org/git/wine.git/commit/29b00e1a8c2d06573027278de53b8… Addendum to b40e7f0 (r47900). CORE-7538 --- dll/win32/winmm/midimap/CMakeLists.txt | 5 ----- dll/win32/winmm/midimap/midimap.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt index 2e4aaa22403..517f1bc7364 100644 --- a/dll/win32/winmm/midimap/CMakeLists.txt +++ b/dll/win32/winmm/midimap/CMakeLists.txt @@ -8,11 +8,6 @@ add_library(midimap MODULE set_module_type(midimap win32dll UNICODE) -if(MSVC) - # error C4133: 'function': incompatible types - from 'LPDWORD' to 'DWORD_PTR *' - remove_target_compile_option(midimap "/we4133") -endif() - target_link_libraries(midimap uuid wine) add_importlibs(midimap advapi32 user32 winmm msvcrt kernel32 ntdll) add_cd_file(TARGET midimap DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/winmm/midimap/midimap.c b/dll/win32/winmm/midimap/midimap.c index fd9ecae485e..8eefac33d14 100644 --- a/dll/win32/winmm/midimap/midimap.c +++ b/dll/win32/winmm/midimap/midimap.c @@ -392,7 +392,7 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) } break; default: - FIXME("ooch %lu\n", dwParam); + FIXME("ooch %lx\n", dwParam); } return ret; @@ -471,7 +471,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, /* FIXME: Pretend this is supported */ return 0; - case MODM_OPEN: return modOpen ((LPDWORD)dwUser, (LPMIDIOPENDESC)dwParam1,dwParam2); + case MODM_OPEN: return modOpen((DWORD_PTR *)dwUser, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: return modClose ((MIDIMAPDATA*)dwUser); case MODM_DATA: return modData ((MIDIMAPDATA*)dwUser, dwParam1);

2 years, 5 months

[reactos] 01/01: [NTUSER] Dereference spDefaultImc at UserCreateInputContext (#4446)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05bbbd7d8b5c6c039c8f9… commit 05bbbd7d8b5c6c039c8f9b3727db522a42e75a33 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 11 10:53:36 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 11 10:53:36 2022 +0900 [NTUSER] Dereference spDefaultImc at UserCreateInputContext (#4446) Dereference pti->spDefaultImc by UserDereferenceObject if pti->spDefaultImc is NULL at UserCreateInputContext function. CORE-11700 --- win32ss/user/ntuser/ime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 1c46bfded3b..7b6c06b9f94 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1362,6 +1362,8 @@ PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) else // First time. It's the default IMC. { // Add the first one (default) to the list. + if (pti->spDefaultImc) + UserDereferenceObject(pti->spDefaultImc); pti->spDefaultImc = pIMC; pIMC->pImcNext = NULL; }

2 years, 5 months

[reactos] 01/01: [NTUSER] Set error on NtUserCreateInputContext (#4444)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88c1d8c737cd252b77cef… commit 88c1d8c737cd252b77cef181bc2b5cd0ddad3234 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 10 19:26:19 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 10 19:26:19 2022 +0900 [NTUSER] Set error on NtUserCreateInputContext (#4444) Set the error code correctly on NtUserCreateInputContext. CORE-11700 --- win32ss/user/ntuser/ime.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 27342263904..1c46bfded3b 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1377,14 +1377,18 @@ NtUserCreateInputContext(ULONG_PTR dwClientImcData) PIMC pIMC; HIMC ret = NULL; - if (!dwClientImcData) - return NULL; - UserEnterExclusive(); if (!IS_IMM_MODE()) { ERR("!IS_IMM_MODE()\n"); + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + if (!dwClientImcData) + { + EngSetLastError(ERROR_INVALID_PARAMETER); goto Quit; }

2 years, 5 months

[reactos] 01/01: [NTUSER] Simplify IntDestroyInputContext (#4443)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f1e19a7b68731e92c4e4… commit 0f1e19a7b68731e92c4e4336fa58f5b06cb92e8f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 10 17:20:21 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 10 17:20:21 2022 +0900 [NTUSER] Simplify IntDestroyInputContext (#4443) CORE-11700 --- win32ss/user/ntuser/ime.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 1aa1ce49dd8..27342263904 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1257,7 +1257,6 @@ VOID UserFreeInputContext(PVOID Object) BOOLEAN UserDestroyInputContext(PVOID Object) { PIMC pIMC = Object; - if (!pIMC || !UserMarkObjectDestroy(pIMC)) return TRUE; @@ -1265,17 +1264,16 @@ BOOLEAN UserDestroyInputContext(PVOID Object) } // Win: DestroyInputContext -BOOLEAN IntDestroyInputContext(PVOID Object) +BOOL IntDestroyInputContext(PIMC pIMC) { - PIMC pIMC = Object; - HIMC hIMC = pIMC->head.h; + HIMC hIMC = UserHMGetHandle(pIMC); PTHREADINFO pti = pIMC->head.pti; PWND pwndChild; PWINDOWLIST pwl; HWND *phwnd; PWND pWnd; - if (pIMC->head.pti != gptiCurrent) + if (pti != gptiCurrent) { EngSetLastError(ERROR_ACCESS_DENIED); return FALSE;

2 years, 5 months

[reactos] 01/01: [NTUSER] Improve NtUserDestroyInputContext etc. (#4442)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb902e5bee0077d438a2d… commit eb902e5bee0077d438a2dfb10f391132b18bab67 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 10 12:27:38 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 10 12:27:38 2022 +0900 [NTUSER] Improve NtUserDestroyInputContext etc. (#4442) CORE-11700 --- win32ss/user/ntuser/ime.c | 81 ++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index c6f5473d8d9..1aa1ce49dd8 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -1231,19 +1231,19 @@ VOID UserFreeInputContext(PVOID Object) { PTHRDESKHEAD ObjHead = Object; PDESKTOP pDesk = ObjHead->rpdesk; - PIMC pIMC = Object, *ppIMC; + PIMC pNode, pIMC = Object; PTHREADINFO pti; if (!pIMC) return; - /* Find the IMC in the list and remove it */ + // Remove pIMC from the list except spDefaultImc pti = pIMC->head.pti; - for (ppIMC = &pti->spDefaultImc; *ppIMC; ppIMC = &(*ppIMC)->pImcNext) + for (pNode = pti->spDefaultImc; pNode; pNode = pNode->pImcNext) { - if (*ppIMC == pIMC) + if (pNode->pImcNext == pIMC) { - *ppIMC = pIMC->pImcNext; + pNode->pImcNext = pIMC->pImcNext; break; } } @@ -1258,60 +1258,69 @@ BOOLEAN UserDestroyInputContext(PVOID Object) { PIMC pIMC = Object; - if (!pIMC) + if (!pIMC || !UserMarkObjectDestroy(pIMC)) return TRUE; - UserMarkObjectDestroy(pIMC); - return UserDeleteObject(UserHMGetHandle(pIMC), TYPE_INPUTCONTEXT); } -BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) +// Win: DestroyInputContext +BOOLEAN IntDestroyInputContext(PVOID Object) { - PIMC pIMC; - BOOL ret = FALSE; + PIMC pIMC = Object; + HIMC hIMC = pIMC->head.h; + PTHREADINFO pti = pIMC->head.pti; + PWND pwndChild; + PWINDOWLIST pwl; HWND *phwnd; PWND pWnd; - PWINDOWLIST pwl; - PTHREADINFO pti; - UserEnterExclusive(); - - if (!IS_IMM_MODE()) + if (pIMC->head.pti != gptiCurrent) { - ERR("!IS_IMM_MODE()\n"); - EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); - goto Quit; + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; } - pIMC = UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (!pIMC) - goto Quit; - - pti = pIMC->head.pti; - if (pti != GetW32ThreadInfo() || pIMC == pti->spDefaultImc) - goto Quit; - - UserMarkObjectDestroy(pIMC); + if (pIMC == pti->spDefaultImc) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - pwl = IntBuildHwndList(pti->rpdesk->pDeskInfo->spwnd->spwndChild, - IACE_CHILDREN | IACE_LIST, pti); + pwndChild = pti->rpdesk->pDeskInfo->spwnd->spwndChild; + pwl = IntBuildHwndList(pwndChild, IACE_LIST | IACE_CHILDREN, pti); if (pwl) { for (phwnd = pwl->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) { - pWnd = ValidateHwndNoErr(*phwnd); - if (!pWnd) - continue; - - if (pWnd->hImc == hIMC) + pWnd = UserGetObjectNoErr(gHandleTable, *phwnd, TYPE_WINDOW); + if (pWnd && pWnd->hImc == hIMC) IntAssociateInputContext(pWnd, pti->spDefaultImc); } IntFreeHwndList(pwl); } - ret = UserDeleteObject(hIMC, TYPE_INPUTCONTEXT); + UserDeleteObject(hIMC, TYPE_INPUTCONTEXT); + return TRUE; +} + +BOOL NTAPI NtUserDestroyInputContext(HIMC hIMC) +{ + BOOL ret = FALSE; + PIMC pIMC; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + { + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + pIMC = UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (pIMC) + ret = IntDestroyInputContext(pIMC); Quit: UserLeave();

2 years, 5 months

[reactos] 01/01: [NTUSER][INCLUDE] Add IMC offset info (#4439)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de38e3be6131ce394e3b6… commit de38e3be6131ce394e3b6d5749c74e065cd0df1b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 10 07:27:30 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 10 07:27:30 2022 +0900 [NTUSER][INCLUDE] Add IMC offset info (#4439) Add C_ASSERT assertions on the offsets of the members of IMC structure. CORE-11700 --- win32ss/include/ntuser.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 846750ca64e..56e13e2229e 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -195,6 +195,15 @@ typedef struct tagIMC HWND hImeWnd; } IMC, *PIMC; +#ifndef _WIN64 +C_ASSERT(offsetof(IMC, head.h) == 0x0); +C_ASSERT(offsetof(IMC, head.cLockObj) == 0x4); +C_ASSERT(offsetof(IMC, head.pti) == 0x8); +C_ASSERT(offsetof(IMC, pImcNext) == 0x14); +C_ASSERT(offsetof(IMC, dwClientImcData) == 0x18); +C_ASSERT(offsetof(IMC, hImeWnd) == 0x1c); +#endif + typedef struct _PROCDESKHEAD { HEAD;

2 years, 5 months

[reactos] 01/01: [WIN32K] Remove incorrect packing specification around _TL, _WIN32THREAD and _THREADINFO structures. CORE-18140

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04eca8e2b21e6da084eea… commit 04eca8e2b21e6da084eea163372a2cbbadb753de Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 9 17:51:08 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 9 23:31:44 2022 +0200 [WIN32K] Remove incorrect packing specification around _TL, _WIN32THREAD and _THREADINFO structures. CORE-18140 This was introduced historically in commit 583de66b3 (r7460) to workaround some compiler problems (or replace already existing GCC-specific __attribute__((packed)) annotations); however these structures are in-memory-only, do not describe any on-disk data format and don't describe hardware-specific data. So they should have the "natural" alignment of the target platform. They also have to match the documented layouts at: https://reactos.org/wiki/Techwiki:Win32k/THREADINFO https://www.geoffchappell.com/studies/windows/km/win32k/structs/threadinfo/… at least for the compatible parts that ReactOS shares. --- win32ss/user/ntuser/win32.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h index 585a7191589..dd30cf23fc8 100644 --- a/win32ss/user/ntuser/win32.h +++ b/win32ss/user/ntuser/win32.h @@ -53,7 +53,6 @@ extern HANDLE hModuleWin; // This Win32k Instance. extern struct _CLS *SystemClassList; extern BOOL RegisteredSysClasses; -#include <pshpack1.h> // FIXME: Move to ntuser.h typedef struct _TL { @@ -164,8 +163,6 @@ typedef struct _THREADINFO #endif // __cplusplus } THREADINFO; -#include <poppack.h> - #define IntReferenceThreadInfo(pti) \ InterlockedIncrement(&(pti)->RefCount)

2 years, 5 months

[reactos] 01/01: [HALX86:ACPI] Use the correct PCH file for compilation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5d17a0219f2a198e2923… commit e5d17a0219f2a198e2923d0070bb43133d747191 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 9 20:18:03 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 9 20:18:03 2022 +0200 [HALX86:ACPI] Use the correct PCH file for compilation. This also removes the following warnings, that were present because, as the ACPICA acpi.h header was used as PCH (instead of none, or the hal's own main header), it was "included" before any other header -- and in particular, before hal.h -- and as a result, colliding defines were still defined even if the #undef tricks were used for them. rosbuilds\sdk\include\reactos\mc\bugcodes.h(1417): warning C4005: 'ACPI_BIOS_ERROR': macro redefinition reactos\drivers\bus\acpi\acpica\include\acoutput.h(243): note: see previous definition of 'ACPI_BIOS_ERROR' reactos\hal\halx86\include\hal.h(41): warning C4109: unexpected identifier '_read' reactos\hal\halx86\include\hal.h(42): warning C4109: unexpected identifier '_read' --- hal/halx86/acpi.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hal/halx86/acpi.cmake b/hal/halx86/acpi.cmake index e35cab24e4a..600fac13ca3 100644 --- a/hal/halx86/acpi.cmake +++ b/hal/halx86/acpi.cmake @@ -14,7 +14,5 @@ if(ARCH STREQUAL "amd64") endif() add_library(lib_hal_acpi OBJECT ${HAL_ACPI_SOURCE}) -add_pch(lib_hal_acpi ${REACTOS_SOURCE_DIR}/drivers/bus/acpi/acpica/include/acpi.h ${HAL_ACPI_SOURCE}) +add_pch(lib_hal_acpi include/hal.h ${HAL_ACPI_SOURCE}) add_dependencies(lib_hal_acpi bugcodes xdk) -#add_pch(lib_hal_acpi include/hal.h) -

2 years, 5 months

[reactos] 01/01: [IMM32] Many renamings and 'Win:' info (#4438)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc8a4ac37b3d34a9b44d7… commit bc8a4ac37b3d34a9b44d736be098199d6f6d91df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 9 10:41:39 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 9 10:41:39 2022 +0900 [IMM32] Many renamings and 'Win:' info (#4438) - Add many Win: comments. - s/Imm32UnloadIME/Imm32FreeIME/ - s/Imm32LoadImeInfo/Imm32LoadIME/ - s/g_hImm32Inst/ghImm32Inst/ - s/Imm32AllocAndBuildHimcList/Imm32BuildHimcList/ - s/Imm32SelectLayout/Imm32SelectInputContext/ CORE-11700 --- dll/win32/imm32/candidate.c | 2 ++ dll/win32/imm32/ime.c | 20 ++++++++++++-------- dll/win32/imm32/imm.c | 31 +++++++++++++++++-------------- dll/win32/imm32/precomp.h | 5 ++--- dll/win32/imm32/utils.c | 13 ++++++++++++- 5 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dll/win32/imm32/candidate.c b/dll/win32/imm32/candidate.c index 3fc12bfbeaa..028d1233fa3 100644 --- a/dll/win32/imm32/candidate.c +++ b/dll/win32/imm32/candidate.c @@ -9,6 +9,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); +// Win: InternalGetCandidateListWtoA DWORD APIENTRY CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, UINT uCodePage) @@ -78,6 +79,7 @@ CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, D return dwBufLen; } +// Win: InternalGetCandidateListAtoW DWORD APIENTRY CandidateListAnsiToWide(const CANDIDATELIST *pAnsiCL, LPCANDIDATELIST pWideCL, DWORD dwBufLen, UINT uCodePage) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 327dc2f49fb..5b7720363aa 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -16,6 +16,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); RTL_CRITICAL_SECTION gcsImeDpi; // Win: gcsImeDpi PIMEDPI gpImeDpiList = NULL; // Win: gpImeDpi +// Win: ImmGetImeDpi PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL) { PIMEDPI pImeDpi; @@ -32,7 +33,7 @@ PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL) } // Win: UnloadIME -VOID APIENTRY Imm32UnloadIME(PIMEDPI pImeDpi, BOOL bDestroy) +VOID APIENTRY Imm32FreeIME(PIMEDPI pImeDpi, BOOL bDestroy) { if (pImeDpi->hInst == NULL) return; @@ -42,6 +43,7 @@ VOID APIENTRY Imm32UnloadIME(PIMEDPI pImeDpi, BOOL bDestroy) pImeDpi->hInst = NULL; } +// Win: InquireIme BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) { WCHAR szUIClass[64]; @@ -147,7 +149,8 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW); } -BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) +// Win: LoadIME +BOOL APIENTRY Imm32LoadIME(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) { WCHAR szPath[MAX_PATH]; HINSTANCE hIME; @@ -163,7 +166,7 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) hIME = LoadLibraryW(szPath); if (hIME == NULL) { - ERR("Imm32LoadImeInfo: LoadLibraryW(%S) failed\n", szPath); + ERR("Imm32LoadIME: LoadLibraryW(%S) failed\n", szPath); return FALSE; } } @@ -215,6 +218,7 @@ Failed: return ret; } +// Win: LoadImeDpi PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) { IMEINFOEX ImeInfoEx; @@ -242,7 +246,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) uCodePage = CP_ACP; pImeDpiNew->uCodePage = uCodePage; - if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) + if (!Imm32LoadIME(&ImeInfoEx, pImeDpiNew)) { ImmLocalFree(pImeDpiNew); return FALSE; @@ -257,8 +261,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) pImeDpiFound->dwFlags &= ~IMEDPI_FLAG_LOCKED; RtlLeaveCriticalSection(&gcsImeDpi); - - Imm32UnloadIME(pImeDpiNew, FALSE); + Imm32FreeIME(pImeDpiNew, FALSE); ImmLocalFree(pImeDpiNew); return pImeDpiFound; } @@ -304,6 +307,7 @@ ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) return 0; } +// Win: ImmUnloadIME BOOL APIENTRY Imm32ReleaseIME(HKL hKL) { BOOL ret = TRUE; @@ -343,7 +347,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL) } } - Imm32UnloadIME(pImeDpi0, TRUE); + Imm32FreeIME(pImeDpi0, TRUE); ImmLocalFree(pImeDpi0); Quit: @@ -789,7 +793,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) } } - Imm32UnloadIME(pImeDpi, TRUE); + Imm32FreeIME(pImeDpi, TRUE); ImmLocalFree(pImeDpi); RtlLeaveCriticalSection(&gcsImeDpi); diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 2260a50e74e..4a440d9fb41 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -13,10 +13,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -HMODULE g_hImm32Inst = NULL; -PSERVERINFO gpsi = NULL; -SHAREDINFO gSharedInfo = { NULL }; -BYTE g_bClientRegd = FALSE; +HMODULE ghImm32Inst = NULL; // Win: ghInst +PSERVERINFO gpsi = NULL; // Win: gpsi +SHAREDINFO gSharedInfo = { NULL }; // Win: gSharedInfo +BYTE gfImmInitialized = FALSE; // Win: gfInitialized // Win: ImmInitializeGlobals static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) @@ -24,16 +24,16 @@ static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) NTSTATUS status; if (hMod) - g_hImm32Inst = hMod; + ghImm32Inst = hMod; - if (g_bClientRegd) + if (gfImmInitialized) return TRUE; status = RtlInitializeCriticalSection(&gcsImeDpi); if (NT_ERROR(status)) return FALSE; - g_bClientRegd = TRUE; + gfImmInitialized = TRUE; return TRUE; } @@ -178,7 +178,8 @@ Retry: return TRUE; } -VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC) +// Win: SelectInputContext +VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { PCLIENTIMC pClientImc; LPINPUTCONTEXTDX pIC; @@ -424,14 +425,16 @@ typedef struct SELECT_LAYOUT HKL hOldKL; } SELECT_LAYOUT, *LPSELECT_LAYOUT; -static BOOL CALLBACK Imm32SelectLayoutProc(HIMC hIMC, LPARAM lParam) +// Win: SelectContextProc +static BOOL CALLBACK Imm32SelectContextProc(HIMC hIMC, LPARAM lParam) { LPSELECT_LAYOUT pSelect = (LPSELECT_LAYOUT)lParam; - Imm32SelectLayout(pSelect->hNewKL, pSelect->hOldKL, hIMC); + Imm32SelectInputContext(pSelect->hNewKL, pSelect->hOldKL, hIMC); return TRUE; } -static BOOL CALLBACK Imm32NotifyCompStrProc(HIMC hIMC, LPARAM lParam) +// Win: NotifyIMEProc +static BOOL CALLBACK Imm32NotifyIMEProc(HIMC hIMC, LPARAM lParam) { ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, (DWORD)lParam, 0); return TRUE; @@ -466,7 +469,7 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) lParam = CPS_CANCEL; ImmUnlockImeDpi(pImeDpi); - ImmEnumInputContext(0, Imm32NotifyCompStrProc, lParam); + ImmEnumInputContext(0, Imm32NotifyIMEProc, lParam); } hwndDefIME = ImmGetDefaultIMEWnd(NULL); @@ -478,7 +481,7 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) SelectLayout.hNewKL = hKL; SelectLayout.hOldKL = hOldKL; - ImmEnumInputContext(0, Imm32SelectLayoutProc, (LPARAM)&SelectLayout); + ImmEnumInputContext(0, Imm32SelectContextProc, (LPARAM)&SelectLayout); if (IsWindow(hwndDefIME)) SendMessageW(hwndDefIME, WM_IME_SELECT, TRUE, (LPARAM)hKL); @@ -1099,7 +1102,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD dwThreadId, IMCENUMPROC lpfn, LPARAM lPara TRACE("(%lu, %p, %p)\n", dwThreadId, lpfn, lParam); - dwCount = Imm32AllocAndBuildHimcList(dwThreadId, &phList); + dwCount = Imm32BuildHimcList(dwThreadId, &phList); if (!dwCount) return FALSE; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index d6310c7e536..f80fe47781c 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -69,12 +69,11 @@ typedef struct REG_IME WCHAR szFileName[80]; /* The IME module filename */ } REG_IME, *PREG_IME; -extern HMODULE g_hImm32Inst; +extern HMODULE ghImm32Inst; extern RTL_CRITICAL_SECTION gcsImeDpi; extern PIMEDPI gpImeDpiList; extern PSERVERINFO gpsi; extern SHAREDINFO gSharedInfo; -extern BYTE g_bClientRegd; extern HANDLE ghImmHeap; BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName); @@ -127,7 +126,7 @@ BOOL APIENTRY Imm32MakeIMENotify(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD_PTR dwValue, DWORD_PTR dwCommand, DWORD_PTR dwData); -DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList); +DWORD APIENTRY Imm32BuildHimcList(DWORD dwThreadId, HIMC **pphList); INT APIENTRY Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW, diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 319a670ec69..810bd0acd58 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -15,6 +15,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HANDLE ghImmHeap = NULL; // Win: pImmHeap +// Win: StrToUInt HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) { @@ -266,7 +267,8 @@ Imm32MakeIMENotify(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWOR return TRUE; } -DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) +// Win: BuildHimcList +DWORD APIENTRY Imm32BuildHimcList(DWORD dwThreadId, HIMC **pphList) { #define INITIAL_COUNT 0x40 #define MAX_RETRY 10 @@ -304,6 +306,7 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) #undef MAX_RETRY } +// Win: ConvertImeMenuItemInfoAtoW INT APIENTRY Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW, UINT uCodePage, BOOL bBitmap) @@ -330,6 +333,7 @@ Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW return ret; } +// Win: ConvertImeMenuItemInfoWtoA INT APIENTRY Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA, UINT uCodePage) @@ -353,6 +357,7 @@ Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA return ret; } +// Win: GetImeModeSaver PIME_STATE APIENTRY Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL) { @@ -376,6 +381,7 @@ Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL) return pState; } +// Win: GetImePrivateModeSaver PIME_SUBSTATE APIENTRY Imm32FetchImeSubState(PIME_STATE pState, HKL hKL) { @@ -395,6 +401,7 @@ Imm32FetchImeSubState(PIME_STATE pState, HKL hKL) return pSubState; } +// Win: RestorePrivateMode BOOL APIENTRY Imm32LoadImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) { @@ -407,6 +414,7 @@ Imm32LoadImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) return FALSE; } +// Win: SavePrivateMode BOOL APIENTRY Imm32SaveImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) { @@ -550,6 +558,7 @@ static FN_GetFileVersionInfoW s_fnGetFileVersionInfoW = NULL; static FN_GetFileVersionInfoSizeW s_fnGetFileVersionInfoSizeW = NULL; static FN_VerQueryValueW s_fnVerQueryValueW = NULL; +// Win: LoadFixVersionInfo static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) { UINT cbFixed = 0; @@ -566,6 +575,7 @@ static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) return TRUE; } +// Win: GetVersionDatum static LPWSTR APIENTRY Imm32GetVerInfoValue(LPCVOID pVerInfo, LPWSTR pszKey, DWORD cchKey, LPCWSTR pszName) { @@ -582,6 +592,7 @@ Imm32GetVerInfoValue(LPCVOID pVerInfo, LPWSTR pszKey, DWORD cchKey, LPCWSTR pszN return (cbValue ? pszValue : NULL); } +// Win: LoadVarVersionInfo BOOL APIENTRY Imm32LoadImeLangAndDesc(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) { BOOL ret;

2 years, 5 months

[reactos] 01/01: [BOOTDATA] Add two missing separating commas in the ServiceGroupOrder List multi-string.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfe387a9b09751241060a… commit cfe387a9b09751241060a6c0f24c94bc46df98b5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 9 02:51:20 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 9 03:15:57 2022 +0200 [BOOTDATA] Add two missing separating commas in the ServiceGroupOrder List multi-string. Typos introduced in commit 4d1ea554c. These had the effect of enumerating "NetworkProviderRemoteValidation" and "Extended BasePCI Configuration" as groups, which were of course invalid/non-existent. The actual groups are: "NetworkProvider", "RemoteValidation", "Extended Base", and "PCI Configuration". Fixing this may correct the loading order of drivers that belong to these groups (if we do have such drivers). --- boot/bootdata/hivesys.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 48c51e04636..2486a3f551c 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1466,11 +1466,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ "SpoolerGroup", \ "AudioGroup", \ "SmartCardGroup", \ - "NetworkProvider" \ + "NetworkProvider", \ "RemoteValidation", \ "NetDDEGroup", \ "Parallel arbitrator", \ - "Extended Base" \ + "Extended Base", \ "PCI Configuration", \ "MS Transactions"

2 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

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