February 2023 - Wine-Commits

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

Feb. 15, 2023

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

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

Feb. 15, 2023

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: Add more tests for EnumProcessModules().
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

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 : dbghelp: Use EnumProcessModulesEx().
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

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 : kernelbase: Re-implement EnumProcessModules on top of EnumProcessModulesEx.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

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

Rémi Bernon : include: Fix ImeInquire declaration.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 2fdfe16c2d5a92b1204f929ba8074a7c6574c7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2fdfe16c2d5a92b1204f929ba8074a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 18:59:10 2022 +0100 include: Fix ImeInquire declaration. --- dlls/imm32/imm.c | 4 ++-- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 3 +-- include/immdev.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d7af6d79736..c4c495e86a5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -62,7 +62,7 @@ typedef struct _tagImmHkl{ HWND UIWnd; /* Function Pointers */ - BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); + BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); @@ -508,7 +508,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); - if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) + if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, 0)) { FreeLibrary(ptr->hIME); ptr->hIME = NULL; diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index ee9db0ca396..7c0495a6fd5 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1367,7 +1367,7 @@ static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **contex return TRUE; } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags) { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 7fe1e0a0b1e..ef498760a60 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -511,8 +511,7 @@ static void IME_AddToSelected(HIMC hIMC) hSelectedFrom[hSelectedCount-1] = hIMC; } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, - LPCWSTR lpszOption) +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags) { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; diff --git a/include/immdev.h b/include/immdev.h index 994bb44d74f..eb6591d1e74 100644 --- a/include/immdev.h +++ b/include/immdev.h @@ -154,7 +154,7 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); BOOL WINAPI ImmShowSoftKeyboard(HWND, int); -BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); +BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, DWORD); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); BOOL WINAPI ImeDestroy(UINT);

1 0

Rémi Bernon : include: Move ddk/imm.h to immdev.h.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 68ff9a942e899750238c6653fbc38966c7469781 URL: https://gitlab.winehq.org/wine/wine/-/commit/68ff9a942e899750238c6653fbc389… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 18:56:56 2022 +0100 include: Move ddk/imm.h to immdev.h. --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/user32/user_main.c | 2 +- dlls/win32u/imm.c | 2 +- dlls/win32u/message.c | 2 +- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 2 +- include/Makefile.in | 2 +- include/{ddk/imm.h => immdev.h} | 21 +++++++++++++-------- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 17061ae0034..d7af6d79736 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -33,7 +33,7 @@ #include "winerror.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "winnls.h" #include "winreg.h" #include "wine/list.h" diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 496dc284fbc..e6d51a1329e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -25,7 +25,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 0ddbd710b6b..56d5849f469 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -21,7 +21,7 @@ #include "user_private.h" #include "controls.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 513f116f80f..1ccc09c97b2 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -27,7 +27,7 @@ #include <pthread.h> #include "win32u_private.h" #include "ntuser_private.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2c320377e34..ed4198991cf 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -33,7 +33,7 @@ #include "hidusage.h" #include "dbt.h" #include "dde.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 19a974b3c24..ee9db0ca396 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -36,7 +36,7 @@ #include "macdrv_dll.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0599159646f..7fe1e0a0b1e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -43,7 +43,7 @@ #include "x11drv_dll.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/include/Makefile.in b/include/Makefile.in index 963fe1a2858..49b5f7c4b01 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -195,7 +195,6 @@ SOURCES = \ ddk/hidport.h \ ddk/hidsdi.h \ ddk/hidtypes.h \ - ddk/imm.h \ ddk/mountmgr.h \ ddk/ndis.h \ ddk/ntddcdvd.h \ @@ -359,6 +358,7 @@ SOURCES = \ imagehlp.h \ ime.h \ imm.h \ + immdev.h \ imnact.idl \ imnxport.idl \ in6addr.h \ diff --git a/include/ddk/imm.h b/include/immdev.h similarity index 95% rename from include/ddk/imm.h rename to include/immdev.h index bbbd70a596f..994bb44d74f 100644 --- a/include/ddk/imm.h +++ b/include/immdev.h @@ -16,14 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _DDKIMM_H_ -#define _DDKIMM_H_ +#ifndef __WINE_IMMDEV_H +#define __WINE_IMMDEV_H #ifdef __cplusplus extern "C" { #endif -typedef struct _tagINPUTCONTEXT { +typedef struct tagINPUTCONTEXT +{ HWND hWnd; BOOL fOpen; POINT ptStatusWndPos; @@ -46,7 +47,8 @@ typedef struct _tagINPUTCONTEXT { DWORD dwReserve[3]; } INPUTCONTEXT, *LPINPUTCONTEXT; -typedef struct _tagIMEINFO { +typedef struct tagIMEINFO +{ DWORD dwPrivateDataSize; DWORD fdwProperty; DWORD fdwConversionCaps; @@ -56,7 +58,8 @@ typedef struct _tagIMEINFO { DWORD fdwSelectCaps; } IMEINFO, *LPIMEINFO; -typedef struct tagCOMPOSITIONSTRING { +typedef struct tagCOMPOSITIONSTRING +{ DWORD dwSize; DWORD dwCompReadAttrLen; DWORD dwCompReadAttrOffset; @@ -84,7 +87,8 @@ typedef struct tagCOMPOSITIONSTRING { DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; -typedef struct tagGUIDELINE { +typedef struct tagGUIDELINE +{ DWORD dwSize; DWORD dwLevel; DWORD dwIndex; @@ -94,7 +98,8 @@ typedef struct tagGUIDELINE { DWORD dwPrivateOffset; } GUIDELINE, *LPGUIDELINE; -typedef struct tagCANDIDATEINFO { +typedef struct tagCANDIDATEINFO +{ DWORD dwSize; DWORD dwCount; DWORD dwOffset[32]; @@ -170,4 +175,4 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMEN } /* extern "C" */ #endif -#endif /* _DDKIMM_H_ */ +#endif /* __WINE_IMMDEV_H */

1 0

Piotr Caban : msvcrt: Don't crash on NULL argument in getenv.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: 86fb5c7ba639de2cd0357fa2e259971494a9cc13 URL: https://gitlab.winehq.org/wine/wine/-/commit/86fb5c7ba639de2cd0357fa2e25997… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:37:52 2023 +0100 msvcrt: Don't crash on NULL argument in getenv. --- dlls/msvcrt/environ.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index e541bd5bff0..145f7d0640f 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -26,18 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* - * getenv (MSVCRT.@) + * getenv (MSVCRT.@) */ char * CDECL getenv(const char *name) { char **env; - unsigned int length=strlen(name); + size_t len; + + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + len = strlen(name); for (env = MSVCRT__environ; *env; env++) { char *str = *env; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !_strnicmp(str,name,length)) + if (pos && ((pos - str) == len) && !_strnicmp(str, name, len)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1;

1 0

Piotr Caban : msvcrt: Improve error handling in getenv_s.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: b7a586771b96cd38e4afb727fefcab3a9deef3c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7a586771b96cd38e4afb727fefcab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:35:14 2023 +0100 msvcrt: Improve error handling in getenv_s. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54486 --- dlls/msvcrt/environ.c | 41 ++++++++++++++++++++++------------------- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index a2626a85c30..39a2f6b4e09 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -25,15 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/********************************************************************* - * getenv (MSVCRT.@) - */ -char * CDECL getenv(const char *name) +static char * getenv_helper(const char *name) { char **env; size_t len; - if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + if (!name) return NULL; len = strlen(name); for (env = MSVCRT__environ; *env; env++) @@ -49,6 +46,16 @@ char * CDECL getenv(const char *name) return NULL; } +/********************************************************************* + * getenv (MSVCRT.@) + */ +char * CDECL getenv(const char *name) +{ + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + + return getenv_helper(name); +} + /********************************************************************* * _wgetenv (MSVCRT.@) */ @@ -278,24 +285,20 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, /****************************************************************** * getenv_s (MSVCRT.@) */ -int CDECL getenv_s(size_t *pReturnValue, char* buffer, size_t numberOfElements, const char *varname) +int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varname) { char *e; - if (!MSVCRT_CHECK_PMT(pReturnValue != NULL)) return EINVAL; - if (!MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0))) return EINVAL; - if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(ret_len != NULL)) return EINVAL; + *ret_len = 0; + if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; + if (buffer) buffer[0] = 0; + + if (!(e = getenv_helper(varname))) return 0; + *ret_len = strlen(e) + 1; + if (!len) return 0; + if (len < *ret_len) return ERANGE; - if (!(e = getenv(varname))) - { - *pReturnValue = 0; - return *_errno() = EINVAL; - } - *pReturnValue = strlen(e) + 1; - if (numberOfElements < *pReturnValue) - { - return *_errno() = ERANGE; - } strcpy(buffer, e); return 0; } diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 03129dcbf14..3d6b55dffa8 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -50,6 +50,7 @@ static void (__cdecl *p_get_environ)(char ***); static void (__cdecl *p_get_wenviron)(WCHAR ***); static errno_t (__cdecl *p_putenv_s)(const char*, const char*); static errno_t (__cdecl *p_wputenv_s)(const wchar_t*, const wchar_t*); +static errno_t (__cdecl *p_getenv_s)(size_t*, char*, size_t, const char*); static char ***p_environ; static WCHAR ***p_wenviron; @@ -66,6 +67,7 @@ static void init(void) p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); p_putenv_s = (void *)GetProcAddress(hmod, "_putenv_s"); p_wputenv_s = (void *)GetProcAddress(hmod, "_wputenv_s"); + p_getenv_s = (void *)GetProcAddress(hmod, "getenv_s"); } static void test_system(void) @@ -242,11 +244,20 @@ static void test__wenviron(void) static void test_environment_manipulation(void) { + char buf[256]; errno_t ret; + size_t len; ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" ); + if (p_getenv_s) + { + ret = p_getenv_s(&len, buf, sizeof(buf), "cat"); + ok( !ret, "getenv_s returned %d\n", ret ); + ok( len == 4, "getenv_s returned length is %Id\n", len); + ok( !strcmp(buf, "dog"), "getenv_s did not return 'dog'\n"); + } ok( _putenv("cat=") == 0, "failed deleting cat\n" ); ok( _putenv("=") == -1, "should not accept '=' as input\n" ); @@ -282,6 +293,27 @@ static void test_environment_manipulation(void) ret = p_wputenv_s(L"cat", L""); ok( !ret, "_wputenv_s returned %d\n", ret); } + + if (p_getenv_s) + { + buf[0] = 'x'; + len = 1; + errno = 0xdeadbeef; + ret = p_getenv_s(&len, buf, sizeof(buf), "nonexistent"); + ok( !ret, "_getenv_s returned %d\n", ret); + ok( !len, "getenv_s returned length is %Id\n", len); + ok( !buf[0], "buf = %s\n", buf); + ok( errno == 0xdeadbeef, "errno = %d\n", errno); + + buf[0] = 'x'; + len = 1; + errno = 0xdeadbeef; + ret = p_getenv_s(&len, buf, sizeof(buf), NULL); + ok( !ret, "_getenv_s returned %d\n", ret); + ok( !len, "getenv_s returned length is %Id\n", len); + ok( !buf[0], "buf = %s\n", buf); + ok( errno == 0xdeadbeef, "errno = %d\n", errno); + } } START_TEST(environ)

1 0

Piotr Caban : msvcrt: Don't crash on NULL argument in _wgetenv.
by Alexandre Julliard Feb. 15, 2023

Feb. 15, 2023

Module: wine Branch: master Commit: d812af3f12434a4671f1aa98fcc5fb11ffa9826b URL: https://gitlab.winehq.org/wine/wine/-/commit/d812af3f12434a4671f1aa98fcc5fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 15 13:38:38 2023 +0100 msvcrt: Don't crash on NULL argument in _wgetenv. --- dlls/msvcrt/environ.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 145f7d0640f..a2626a85c30 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -50,12 +50,15 @@ char * CDECL getenv(const char *name) } /********************************************************************* - * _wgetenv (MSVCRT.@) + * _wgetenv (MSVCRT.@) */ wchar_t * CDECL _wgetenv(const wchar_t *name) { wchar_t **env; - unsigned int length=wcslen(name); + size_t len; + + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; + len = wcslen(name); /* Initialize the _wenviron array if it's not already created. */ if (!MSVCRT__wenviron) @@ -65,7 +68,7 @@ wchar_t * CDECL _wgetenv(const wchar_t *name) { wchar_t *str = *env; wchar_t *pos = wcschr(str,'='); - if (pos && ((pos - str) == length) && !_wcsnicmp(str,name,length)) + if (pos && ((pos - str) == len) && !_wcsnicmp(str, name, len)) { TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1)); return pos + 1;

1 0