February 2023 - Wine-commits

Rémi Bernon : include: Fix ImeToAsciiEx declaration.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: f371309f6d12273c889ebb9d6be1c8bcb613450a URL: https://gitlab.winehq.org/wine/wine/-/commit/f371309f6d12273c889ebb9d6be1c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 18:59:10 2022 +0100 include: Fix ImeToAsciiEx declaration. --- dlls/imm32/imm.c | 14 ++++---------- dlls/imm32/tests/imm32.c | 6 ------ dlls/winemac.drv/ime.c | 14 ++++---------- dlls/winex11.drv/ime.c | 8 +------- include/immdev.h | 15 ++++++++++++++- 5 files changed, 23 insertions(+), 34 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c4c495e86a5..57d00dd4984 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -68,7 +68,7 @@ typedef struct _tagImmHkl{ LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); BOOL (WINAPI *pImeSelect)(HIMC, BOOL); BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL); - UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, DWORD *, UINT, HIMC); + UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, TRANSMSGLIST *, UINT, HIMC); BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD); BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *); BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *); @@ -97,12 +97,6 @@ typedef struct tagInputContextData #define WINE_IMC_VALID_MAGIC 0x56434D49 -typedef struct _tagTRANSMSG { - UINT message; - WPARAM wParam; - LPARAM lParam; -} TRANSMSG, *LPTRANSMSG; - struct coinit_spy { IInitializeSpy IInitializeSpy_iface; @@ -3004,7 +2998,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD HIMC imc = ImmGetContext(hwnd); BYTE state[256]; UINT scancode; - LPVOID list = 0; + TRANSMSGLIST *list = NULL; UINT msg_count; UINT uVirtKey; static const DWORD list_count = 10; @@ -3020,7 +3014,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD scancode = lKeyData >> 0x10 & 0xff; list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD)); - ((DWORD*)list)[0] = list_count; + list->uMsgCount = list_count; if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { @@ -3040,7 +3034,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD if (msg_count && msg_count <= list_count) { UINT i; - LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD)); + LPTRANSMSG msgs = list->TransMsg; for (i = 0; i < msg_count; i++) ImmInternalPostIMEMessage(data, msgs[i].message, msgs[i].wParam, msgs[i].lParam); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index e6d51a1329e..a97457320ce 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -93,12 +93,6 @@ typedef struct } u; } TEST_INPUT; -typedef struct _tagTRANSMSG { - UINT message; - WPARAM wParam; - LPARAM lParam; -} TRANSMSG, *LPTRANSMSG; - static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 7c0495a6fd5..5780c942283 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -52,12 +52,6 @@ typedef struct _IMEPRIVATE { UINT repeat; } IMEPRIVATE, *LPIMEPRIVATE; -typedef struct _tagTRANSMSG { - UINT message; - WPARAM wParam; - LPARAM lParam; -} TRANSMSG, *LPTRANSMSG; - static const WCHAR UI_CLASS_NAME[] = {'W','i','n','e',' ','M','a','c',' ','I','M','E',0}; static HIMC *hSelectedFrom = NULL; @@ -454,15 +448,15 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam UnlockRealIMC(hIMC); } -static BOOL GenerateMessageToTransKey(LPDWORD lpTransBuf, UINT *uNumTranMsgs, +static BOOL GenerateMessageToTransKey(TRANSMSGLIST *lpTransBuf, UINT *uNumTranMsgs, UINT msg, WPARAM wParam, LPARAM lParam) { LPTRANSMSG ptr; - if (*uNumTranMsgs + 1 >= (UINT)*lpTransBuf) + if (*uNumTranMsgs + 1 >= lpTransBuf->uMsgCount) return FALSE; - ptr = (LPTRANSMSG)(lpTransBuf + 1 + *uNumTranMsgs * 3); + ptr = lpTransBuf->TransMsg + *uNumTranMsgs; ptr->message = msg; ptr->wParam = wParam; ptr->lParam = lParam; @@ -652,7 +646,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) } UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, - LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) + TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC) { struct process_text_input_params params; UINT vkey; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ef498760a60..a293daa6ad9 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -56,12 +56,6 @@ typedef struct _IMEPRIVATE { HWND hwndDefault; } IMEPRIVATE, *LPIMEPRIVATE; -typedef struct _tagTRANSMSG { - UINT message; - WPARAM wParam; - LPARAM lParam; -} TRANSMSG, *LPTRANSMSG; - static const WCHAR UI_CLASS_NAME[] = {'W','i','n','e','X','1','1','I','M','E',0}; static HIMC *hSelectedFrom = NULL; @@ -618,7 +612,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) } UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, - LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) + TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC) { /* See the comment at the head of this file */ TRACE("We do no processing via this route\n"); diff --git a/include/immdev.h b/include/immdev.h index eb6591d1e74..350adf00a8b 100644 --- a/include/immdev.h +++ b/include/immdev.h @@ -107,6 +107,19 @@ typedef struct tagCANDIDATEINFO DWORD dwPrivateOffset; } CANDIDATEINFO, *LPCANDIDATEINFO; +typedef struct tagTRANSMSG +{ + UINT message; + WPARAM wParam; + LPARAM lParam; +} TRANSMSG, *LPTRANSMSG; + +typedef struct tagTRANSMSGLIST +{ + UINT uMsgCount; + TRANSMSG TransMsg[1]; +} TRANSMSGLIST, *LPTRANSMSGLIST; + LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); BOOL WINAPI ImmUnlockIMC(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC); @@ -162,7 +175,7 @@ LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, const LPBYTE); BOOL WINAPI ImeSelect(HIMC, BOOL); BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); -UINT WINAPI ImeToAsciiEx(UINT, UINT, const LPBYTE, LPDWORD, UINT, HIMC); +UINT WINAPI ImeToAsciiEx(UINT, UINT, const LPBYTE, LPTRANSMSGLIST, UINT, HIMC); BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR);

1 0

Rémi Bernon : include: Add Imm(Get|Set)HotKey declarations.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 333ab2b4d683e253cf0040954794d942d03a57ef URL: https://gitlab.winehq.org/wine/wine/-/commit/333ab2b4d683e253cf0040954794d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 20:28:15 2022 +0100 include: Add Imm(Get|Set)HotKey declarations. --- dlls/imm32/imm.c | 2 +- include/immdev.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 57d00dd4984..3d9cbf7e198 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3116,7 +3116,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) * ImmGetHotKey(IMM32.@) */ -BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) +BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL *hkl) { FIXME("%lx, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; diff --git a/include/immdev.h b/include/immdev.h index 350adf00a8b..92f2a47c167 100644 --- a/include/immdev.h +++ b/include/immdev.h @@ -158,6 +158,8 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); #define NI_SETCANDIDATE_PAGESIZE 0x0017 #define NI_IMEMENUSELECTED 0x0018 +BOOL WINAPI ImmGetHotKey(DWORD,UINT*,UINT*,HKL*); +BOOL WINAPI ImmSetHotKey(DWORD,UINT,UINT,HKL); BOOL WINAPI ImmGenerateMessage(HIMC); LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM);

1 0

Eric Pouech : psapi/tests: Test directory of enumerated loaded modules.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: e38455a2181ab5ce0bf842f2c9a638b3ee9b538c URL: https://gitlab.winehq.org/wine/wine/-/commit/e38455a2181ab5ce0bf842f2c9a638… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 14 11:06:57 2023 +0100 psapi/tests: Test directory of enumerated loaded modules. Showing that Wine incorrectly reports, for a Wow64 process, the system DLLs from within the wow64 directory while they should be from system32. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index a106628a9ed..d1bc0ca63bd 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -310,6 +310,23 @@ static void snapshot_check_first_main_module(const struct moduleex_snapshot* sna winetest_pop_context(); } +static unsigned int snapshot_count_in_dir(const struct moduleex_snapshot* snap, HANDLE proc, const char* dirname) +{ + unsigned int count = 0; + char buffer[128]; + size_t dirname_len = strlen(dirname); + BOOL ret; + int i; + + for (i = 0; i < snap->num_modules; i++) + { + ret = GetModuleFileNameExA(proc, snap->modules[i], buffer, sizeof(buffer)); + ok(ret, "got error %lu\n", GetLastError()); + if (!strncasecmp(buffer, dirname, dirname_len)) count++; + } + return count; +} + static void test_EnumProcessModulesEx(void) { char buffer[200] = "C:\\windows\\system32\\notepad.exe"; @@ -430,6 +447,8 @@ static void test_EnumProcessModulesEx(void) if (sizeof(void *) == 8) { + unsigned int count; + strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); if (ret) @@ -457,6 +476,17 @@ static void test_EnumProcessModulesEx(void) snapshot_check_first_main_module(&snap[2], pi.hProcess, buffer); snapshot_check_first_main_module(&snap[3], pi.hProcess, buffer); + ret = GetSystemWow64DirectoryA(buffer, sizeof(buffer)); + ok(ret, "GetSystemWow64DirectoryA failed: %lu\n", GetLastError()); + count = snapshot_count_in_dir(snap, pi.hProcess, buffer); + todo_wine + ok(count <= 1, "Wrong count %u in %s\n", count, buffer); /* notepad can be from system wow64 */ + ret = GetSystemDirectoryA(buffer, sizeof(buffer)); + ok(ret, "GetSystemDirectoryA failed: %lu\n", GetLastError()); + count = snapshot_count_in_dir(snap, pi.hProcess, buffer); + todo_wine + ok(count > 2, "Wrong count %u in %s\n", count, buffer); + /* in fact, this error is only returned when (list & 3 == 0), otherwise the corresponding * list is returned without errors. */

1 0

Eric Pouech : dbgeng: Use EnumProcessModulesEx().
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 34120921d9547a5846c70a6e807537bbad4a0a8e URL: https://gitlab.winehq.org/wine/wine/-/commit/34120921d9547a5846c70a6e807537… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 14 11:06:58 2023 +0100 dbgeng: Use EnumProcessModulesEx(). In order to get 32bit modules for a wow64 process. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbgeng/dbgeng.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 3ec510ef296..6d4710163c9 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -134,6 +134,8 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) HMODULE *modules; MODULEINFO info; DWORD needed; + BOOL wow64; + DWORD filter = LIST_MODULES_DEFAULT; if (target->modules.initialized) return S_OK; @@ -141,8 +143,13 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) if (!target->handle) return E_UNEXPECTED; + if (sizeof(void*) > sizeof(int) && + IsWow64Process(target->handle, &wow64) && + wow64) + filter = LIST_MODULES_32BIT; + needed = 0; - EnumProcessModules(target->handle, NULL, 0, &needed); + EnumProcessModulesEx(target->handle, NULL, 0, &needed, filter); if (!needed) return E_FAIL; @@ -157,7 +164,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) return E_OUTOFMEMORY; } - if (EnumProcessModules(target->handle, modules, count * sizeof(*modules), &needed)) + if (EnumProcessModulesEx(target->handle, modules, count * sizeof(*modules), &needed, filter)) { for (i = 0; i < count; ++i) {

1 0

Eric Pouech : dbghelp: Use EnumProcessModulesEx().
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 82e3e014be08370cd58b6d5d727377778da3fecc URL: https://gitlab.winehq.org/wine/wine/-/commit/82e3e014be08370cd58b6d5d727377… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 14 11:07:00 2023 +0100 dbghelp: Use EnumProcessModulesEx(). In order to get 32bit modules for a wow64 process. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c0c47b859f4..5b99b5eea58 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1273,11 +1273,18 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, WCHAR baseW[256], modW[256]; DWORD i, sz; MODULEINFO mi; + BOOL wow64; + DWORD filter = LIST_MODULES_DEFAULT; hMods = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(hMods[0])); if (!hMods) return FALSE; - if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz)) + if (sizeof(void*) > sizeof(int) && + IsWow64Process(hProcess, &wow64) && + wow64) + filter = LIST_MODULES_32BIT; + + if (!EnumProcessModulesEx(hProcess, hMods, 256 * sizeof(hMods[0]), &sz, filter)) { /* hProcess should also be a valid process handle !! */ HeapFree(GetProcessHeap(), 0, hMods); @@ -1286,7 +1293,7 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (sz > 256 * sizeof(hMods[0])) { hMods = HeapReAlloc(GetProcessHeap(), 0, hMods, sz); - if (!hMods || !EnumProcessModules(hProcess, hMods, sz, &sz)) + if (!hMods || !EnumProcessModulesEx(hProcess, hMods, sz, &sz, filter)) return FALSE; } sz /= sizeof(HMODULE);

1 0

Eric Pouech : psapi: Add more tests for EnumProcessModules().
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 00bf7293af13f3766c6c839f0125785ac9084de8 URL: https://gitlab.winehq.org/wine/wine/-/commit/00bf7293af13f3766c6c839f012578… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 14 11:07:01 2023 +0100 psapi: Add more tests for EnumProcessModules(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index d1bc0ca63bd..fc248d35e01 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -141,6 +141,7 @@ static void test_EnumProcessModules(void) { MODULEINFO info; char name[40]; + HMODULE hmods[3]; strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); @@ -150,26 +151,39 @@ static void test_EnumProcessModules(void) ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); - hMod = NULL; - ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + hmods[0] = NULL; + ret = EnumProcessModules(pi.hProcess, hmods, sizeof(hmods), &cbNeeded); ok(ret == 1, "got %ld, error %lu\n", ret, GetLastError()); - ok(!!hMod, "expected non-NULL module\n"); - ok(cbNeeded % sizeof(hMod) == 0, "got %lu\n", cbNeeded); + ok(cbNeeded >= sizeof(HMODULE), "expected at least one module\n"); + ok(!!hmods[0], "expected non-NULL module\n"); + ok(cbNeeded % sizeof(hmods[0]) == 0, "got %lu\n", cbNeeded); - ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleBaseNameA(pi.hProcess, hmods[0], name, sizeof(name)); ok(ret, "got error %lu\n", GetLastError()); ok(!strcmp(name, "notepad.exe"), "got %s\n", name); - ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ret = GetModuleFileNameExA(pi.hProcess, hmods[0], name, sizeof(name)); ok(ret, "got error %lu\n", GetLastError()); ok(!strcmp(name, buffer), "got %s\n", name); - ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ret = GetModuleInformation(pi.hProcess, hmods[0], &info, sizeof(info)); ok(ret, "got error %lu\n", GetLastError()); - ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); + ok(info.lpBaseOfDll == hmods[0], "expected %p, got %p\n", hmods[0], info.lpBaseOfDll); ok(info.SizeOfImage, "image size was 0\n"); ok(info.EntryPoint >= info.lpBaseOfDll, "got entry point %p\n", info.EntryPoint); + /* "old" Wine wow64 will only return main DLL; while windows & multi-arch Wine Wow64 setup + * will return main module, ntdll.dll and one of the wow64*.dll. + */ + todo_wine_if(cbNeeded == sizeof(HMODULE)) + ok(cbNeeded >= 3 * sizeof(HMODULE), "Wrong count of DLLs\n"); + if (cbNeeded >= 3 * sizeof(HMODULE)) + { + ret = GetModuleBaseNameA(pi.hProcess, hmods[2], name, sizeof(name)); + ok(ret, "got error %lu\n", GetLastError()); + todo_wine + ok(strstr(CharLowerA(name), "wow64") != NULL, "third DLL in wow64 should be one of wow*.dll (%s)\n", name); + } TerminateProcess(pi.hProcess, 0); } else

1 0

Eric Pouech : kernelbase: Re-implement EnumProcessModules on top of EnumProcessModulesEx.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: df5f6f66de80085249d392be5efa085e6ee056a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/df5f6f66de80085249d392be5efa08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 14 11:07:03 2023 +0100 kernelbase: Re-implement EnumProcessModules on top of EnumProcessModulesEx. Note: this patch changes the results of EnumProcessModules for a wow64 target process called from a 64bit process. It now returns: - main module and all loaded 64bit modules (Wine multi-arch wow64 and Windows) - main module only (Wine "old" wow64). It used to return all the 32bit modules. You now must use EnumProcessModulesEx(..., LIST_MODULES_32BIT) to get that result. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 66 +------------------------------------------ dlls/psapi/tests/psapi_main.c | 2 -- 2 files changed, 1 insertion(+), 67 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index ebf1ed76023..4eff7ad1cca 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -949,71 +949,7 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW ca BOOL WINAPI DECLSPEC_HOTPATCH EnumProcessModules( HANDLE process, HMODULE *module, DWORD count, DWORD *needed ) { - struct module_iterator iter; - DWORD size = 0; - BOOL target_wow64; - INT ret; - - if (process == GetCurrentProcess()) - { - PPEB_LDR_DATA ldr_data = NtCurrentTeb()->Peb->LdrData; - PLIST_ENTRY head = &ldr_data->InLoadOrderModuleList; - PLIST_ENTRY entry = head->Flink; - - if (count && !module) - { - SetLastError( ERROR_NOACCESS ); - return FALSE; - } - while (entry != head) - { - LDR_DATA_TABLE_ENTRY *ldr = CONTAINING_RECORD( entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks ); - if (count >= sizeof(HMODULE)) - { - *module++ = ldr->DllBase; - count -= sizeof(HMODULE); - } - size += sizeof(HMODULE); - entry = entry->Flink; - } - if (!needed) - { - SetLastError( ERROR_NOACCESS ); - return FALSE; - } - *needed = size; - return TRUE; - } - - if (!IsWow64Process( process, &target_wow64 )) return FALSE; - if (!init_module_iterator( &iter, process, is_win64 && target_wow64 )) return FALSE; - - if (count && !module) - { - SetLastError( ERROR_NOACCESS ); - return FALSE; - } - - while ((ret = module_iterator_next( &iter )) > 0) - { - if (count >= sizeof(HMODULE)) - { - if (sizeof(void *) == 8 && iter.wow64) - *module++ = (HMODULE) (DWORD_PTR)iter.ldr_module32.BaseAddress; - else - *module++ = iter.ldr_module.DllBase; - count -= sizeof(HMODULE); - } - size += sizeof(HMODULE); - } - - if (!needed) - { - SetLastError( ERROR_NOACCESS ); - return FALSE; - } - *needed = size; - return ret == 0; + return EnumProcessModulesEx( process, module, count, needed, LIST_MODULES_DEFAULT ); } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index fc248d35e01..227fc52c2ad 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -181,7 +181,6 @@ static void test_EnumProcessModules(void) { ret = GetModuleBaseNameA(pi.hProcess, hmods[2], name, sizeof(name)); ok(ret, "got error %lu\n", GetLastError()); - todo_wine ok(strstr(CharLowerA(name), "wow64") != NULL, "third DLL in wow64 should be one of wow*.dll (%s)\n", name); } TerminateProcess(pi.hProcess, 0); @@ -207,7 +206,6 @@ static void test_EnumProcessModules(void) SetLastError(0xdeadbeef); ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); ok(!ret, "got %ld\n", ret); - todo_wine ok(GetLastError() == ERROR_PARTIAL_COPY, "got error %lu\n", GetLastError()); TerminateProcess(pi.hProcess, 0);

1 0

Francois Gouget : atl100/tests: Trace GetLastError() when DeleteFile() fails.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: d384e858c1889e7749bdd141fb764f87acfed95c URL: https://gitlab.winehq.org/wine/wine/-/commit/d384e858c1889e7749bdd141fb764f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 14 00:20:04 2023 +0100 atl100/tests: Trace GetLastError() when DeleteFile() fails. test_AtlAxCreateControl()'s DeleteFile() call fails from time to time. --- dlls/atl100/tests/atl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index a40c38df25a..2fad97d8008 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -786,7 +786,7 @@ static void test_ax_win(void) /* test file:// scheme on non-existent file */ ret = DeleteFileW(pathW); - ok(ret, "DeleteFile failed!\n"); + ok(ret, "DeleteFile failed (gle=%lu)\n", GetLastError()); hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); control = NULL; @@ -1048,7 +1048,7 @@ static void test_AtlAxCreateControl(void) /* test file:// scheme on non-existent file. */ ret = DeleteFileW(pathW); - ok(ret, "DeleteFile failed!\n"); + ok(ret, "DeleteFile failed (gle=%lu)\n", GetLastError()); container = NULL; control = NULL; hwnd = create_container_window();

1 0

Rémi Bernon : dinput: Introduce keyboard_handle_key_event helper.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 2d6776e82e3597a87cd41074e7bea79f17492a9d URL: https://gitlab.winehq.org/wine/wine/-/commit/2d6776e82e3597a87cd41074e7bea7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 5 14:00:00 2022 +0100 dinput: Introduce keyboard_handle_key_event helper. --- dlls/dinput/keyboard.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 873a2d98434..6c24ddcf24b 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -83,22 +83,13 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers return (BYTE)scanCode; } -int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) +static void keyboard_handle_event( struct keyboard *impl, DWORD vkey, DWORD scan_code, BOOL up ) { - struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); - int dik_code, ret = impl->base.dwCoopLevel & DISCL_EXCLUSIVE; - KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; - DWORD scan_code; - - if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && - wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) - return 0; + IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; + int dik_code; - TRACE( "iface %p, wparam %#Ix, lparam %#Ix, vkCode %#lx, scanCode %#lx.\n", iface, wparam, - lparam, hook->vkCode, hook->scanCode ); - - switch (hook->vkCode) + switch (vkey) { /* R-Shift is special - it is an extended key with separate scan code */ case VK_RSHIFT : dik_code = DIK_RSHIFT; break; @@ -106,25 +97,41 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - scan_code = hook->scanCode & 0xff; - if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; - dik_code = map_dik_code( scan_code, hook->vkCode, subtype, impl->base.dinput->dwVersion ); + dik_code = map_dik_code( scan_code, vkey, subtype, impl->base.dinput->dwVersion ); + break; } - new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; + new_diks = (up ? 0 : 0x80); /* returns now if key event already known */ - if (new_diks == impl->base.device_state[dik_code]) return ret; + if (new_diks == impl->base.device_state[dik_code]) return; impl->base.device_state[dik_code] = new_diks; - TRACE( " setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); + TRACE( "setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); EnterCriticalSection( &impl->base.crit ); queue_event( iface, DIDFT_MAKEINSTANCE( dik_code ) | DIDFT_PSHBUTTON, new_diks, GetCurrentTime(), impl->base.dinput->evsequence++ ); if (impl->base.hEvent) SetEvent( impl->base.hEvent ); LeaveCriticalSection( &impl->base.crit ); +} + +int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) +{ + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; + DWORD scan_code; + + TRACE( "iface %p, wparam %#Ix, lparam %#Ix, vkCode %#lx, scanCode %#lx.\n", iface, wparam, + lparam, hook->vkCode, hook->scanCode ); + + if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) + return 0; + + scan_code = hook->scanCode & 0xff; + if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; + keyboard_handle_event( impl, hook->vkCode, scan_code, hook->flags & LLKHF_UP ); - return ret; + return impl->base.dwCoopLevel & DISCL_EXCLUSIVE; } static DWORD get_keyboard_subtype(void)

1 0

Rémi Bernon : dinput: Avoid entering the hook CS in input_thread_ll_hook_proc.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 5c16cda656e1e486f2767acd2d30114abf820820 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c16cda656e1e486f2767acd2d3011… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 11 12:33:58 2023 +0100 dinput: Avoid entering the hook CS in input_thread_ll_hook_proc. --- dlls/dinput/dinput_main.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9af8e064dc4..0b578715d1a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -138,24 +138,30 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD static LRESULT CALLBACK input_thread_ll_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { - struct dinput_device *impl; - int skip = 0; + struct input_thread_state *state = input_thread_state; + int i, skip = 0; if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); - EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( impl, &acquired_mouse_list, struct dinput_device, entry ) - { - TRACE( "calling dinput_mouse_hook (%p %Ix %Ix)\n", impl, wparam, lparam ); - skip |= dinput_mouse_hook( &impl->IDirectInputDevice8W_iface, wparam, lparam ); - } - LIST_FOR_EACH_ENTRY( impl, &acquired_keyboard_list, struct dinput_device, entry ) + for (i = state->events_count; i < state->devices_count; ++i) { - if (impl->use_raw_input) continue; - TRACE( "calling dinput_keyboard_hook (%p %Ix %Ix)\n", impl, wparam, lparam ); - skip |= dinput_keyboard_hook( &impl->IDirectInputDevice8W_iface, wparam, lparam ); + struct dinput_device *device = state->devices[i]; + if (device->use_raw_input) continue; + if (device->instance.dwDevType & DIDEVTYPE_HID) continue; + switch (GET_DIDEVICE_TYPE( device->instance.dwDevType )) + { + case DIDEVTYPE_MOUSE: + case DI8DEVTYPE_MOUSE: + TRACE( "calling dinput_mouse_hook (%p %Ix %Ix)\n", device, wparam, lparam ); + skip |= dinput_mouse_hook( &device->IDirectInputDevice8W_iface, wparam, lparam ); + break; + case DIDEVTYPE_KEYBOARD: + case DI8DEVTYPE_KEYBOARD: + TRACE( "calling dinput_keyboard_hook (%p %Ix %Ix)\n", device, wparam, lparam ); + skip |= dinput_keyboard_hook( &device->IDirectInputDevice8W_iface, wparam, lparam ); + break; + } } - LeaveCriticalSection( &dinput_hook_crit ); return skip ? 1 : CallNextHookEx( 0, code, wparam, lparam ); } @@ -248,18 +254,19 @@ static void input_thread_update_device_list( struct input_thread_state *state ) if (device->dwCoopLevel & DISCL_EXCLUSIVE) rawinput_mouse.dwFlags |= RIDEV_NOLEGACY | RIDEV_CAPTUREMOUSE; rawinput_mouse.dwFlags &= ~RIDEV_REMOVE; rawinput_mouse.hwndTarget = di_em_win; - dinput_device_internal_addref( (state->devices[count] = device) ); - if (++count >= INPUT_THREAD_MAX_DEVICES) break; + if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); } LIST_FOR_EACH_ENTRY( device, &acquired_mouse_list, struct dinput_device, entry ) { if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; mouse_count++; + if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); } LIST_FOR_EACH_ENTRY( device, &acquired_keyboard_list, struct dinput_device, entry ) { if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; keyboard_count++; + if (count < INPUT_THREAD_MAX_DEVICES) dinput_device_internal_addref( (state->devices[count++] = device) ); } state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit );

1 0