November 2022 - Wine-commits

Tim Clem : wow64: Truncate too-large regions from NtQueryVirtualMemory(MemoryBasicInformation).
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: d47bdb3eb270b31d2c507a91a49ede20f4cdf2aa URL: https://gitlab.winehq.org/wine/wine/-/commit/d47bdb3eb270b31d2c507a91a49ede… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Nov 8 13:44:00 2022 -0800 wow64: Truncate too-large regions from NtQueryVirtualMemory(MemoryBasicInformation). BaseAddress + RegionSize should not exceed the highest WoW user address. --- dlls/wow64/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 4d3bb90386a..8396b2de334 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -399,6 +399,8 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) info32->State = info.State; info32->Protect = info.Protect; info32->Type = info.Type; + if ((ULONG_PTR)info.BaseAddress + info.RegionSize > highest_user_address) + info32->RegionSize = highest_user_address - (ULONG_PTR)info.BaseAddress + 1; } } res_len = sizeof(MEMORY_BASIC_INFORMATION32);

1 0

Tim Clem : wow64: Return error from NtQueryVirtualMemory(MemoryRegionInformation) for a too-large address.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 62fbfe87612eb973a42b73adc8f023bc2dc4cbb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/62fbfe87612eb973a42b73adc8f023… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Nov 8 13:50:02 2022 -0800 wow64: Return error from NtQueryVirtualMemory(MemoryRegionInformation) for a too-large address. --- dlls/wow64/virtual.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 8396b2de334..f9a0e0b6bc8 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -426,7 +426,11 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) case MemoryRegionInformation: /* MEMORY_REGION_INFORMATION */ { - if (len >= sizeof(MEMORY_REGION_INFORMATION32)) + if (len < sizeof(MEMORY_REGION_INFORMATION32)) + status = STATUS_INFO_LENGTH_MISMATCH; + if ((ULONG_PTR)addr > highest_user_address) + status = STATUS_INVALID_PARAMETER; + else { MEMORY_REGION_INFORMATION info; MEMORY_REGION_INFORMATION32 *info32 = ptr; @@ -442,7 +446,6 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) info32->NodePreference = info.NodePreference; } } - else status = STATUS_INFO_LENGTH_MISMATCH; res_len = sizeof(MEMORY_REGION_INFORMATION32); break; }

1 0

Tim Clem : wow64: Truncate too-large regions from NtQueryVirtualMemory(MemoryRegionInformation).
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 06321ba57b17635cf2bd945ce38d2c95367b2156 URL: https://gitlab.winehq.org/wine/wine/-/commit/06321ba57b17635cf2bd945ce38d2c… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Nov 8 13:51:40 2022 -0800 wow64: Truncate too-large regions from NtQueryVirtualMemory(MemoryRegionInformation). AllocationBase + RegionSize should not exceed the highest WoW user address. --- dlls/wow64/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index f9a0e0b6bc8..c41d0a930ca 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -444,6 +444,8 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) info32->CommitSize = info.CommitSize; info32->PartitionId = info.PartitionId; info32->NodePreference = info.NodePreference; + if ((ULONG_PTR)info.AllocationBase + info.RegionSize > highest_user_address) + info32->RegionSize = highest_user_address - (ULONG_PTR)info.AllocationBase + 1; } } res_len = sizeof(MEMORY_REGION_INFORMATION32);

1 0

Zebediah Figura : wined3d: Factor out creating the window state thread.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 6a4d688f4eca7a1c52496f80aa37d5bbb7a0d118 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4d688f4eca7a1c52496f80aa37d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 19 12:34:02 2022 -0500 wined3d: Factor out creating the window state thread. --- dlls/wined3d/swapchain.c | 53 +++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e40707c0e54..4b420a749f3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2195,7 +2195,7 @@ struct wined3d_window_state bool set_style; }; -static DWORD WINAPI wined3d_set_window_state(void *ctx) +static DWORD WINAPI set_window_state_thread(void *ctx) { struct wined3d_window_state *s = ctx; bool filter; @@ -2218,12 +2218,28 @@ static DWORD WINAPI wined3d_set_window_state(void *ctx) return 0; } +static void set_window_state(struct wined3d_window_state *s) +{ + DWORD window_tid = GetWindowThreadProcessId(s->window, NULL); + DWORD tid = GetCurrentThreadId(); + HANDLE thread; + + TRACE("Window %p belongs to thread %#x.\n", s->window, window_tid); + /* If the window belongs to a different thread, modifying the style and/or + * position can potentially deadlock if that thread isn't processing + * messages. */ + if (window_tid == tid) + set_window_state_thread(s); + else if (!(thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) + ERR("Failed to create thread.\n"); + else + CloseHandle(thread); +} + HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, HWND window, int x, int y, int width, int height) { struct wined3d_window_state *s; - DWORD window_tid, tid; - HANDLE thread; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -2264,20 +2280,7 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", state->style, state->exstyle, s->style, s->exstyle); - window_tid = GetWindowThreadProcessId(window, NULL); - tid = GetCurrentThreadId(); - - TRACE("Window %p belongs to thread %#x.\n", window, window_tid); - /* If the window belongs to a different thread, modifying the style and/or - * position can potentially deadlock if that thread isn't processing - * messages. */ - if (window_tid == tid) - wined3d_set_window_state(s); - else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) - ERR("Failed to create thread.\n"); - else - CloseHandle(thread); - + set_window_state(s); return WINED3D_OK; } @@ -2285,9 +2288,7 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st HWND window, const RECT *window_rect) { struct wined3d_window_state *s; - DWORD window_tid, tid; LONG style, exstyle; - HANDLE thread; if (!state->style && !state->exstyle) return; @@ -2343,19 +2344,7 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st s->flags |= (SWP_NOMOVE | SWP_NOSIZE); } - window_tid = GetWindowThreadProcessId(window, NULL); - tid = GetCurrentThreadId(); - - TRACE("Window %p belongs to thread %#x.\n", window, window_tid); - /* If the window belongs to a different thread, modifying the style and/or - * position can potentially deadlock if that thread isn't processing - * messages. */ - if (window_tid == tid) - wined3d_set_window_state(s); - else if (!(thread = CreateThread(NULL, 0, wined3d_set_window_state, s, 0, NULL))) - ERR("Failed to create thread.\n"); - else - CloseHandle(thread); + set_window_state(s); /* Delete the old values. */ state->style = 0;

1 0

Zebediah Figura : wined3d: Set the window state thread description only if it's actually a new thread.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: efcb73441428705cdd49bf41bd396c4e829ac5c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/efcb73441428705cdd49bf41bd396c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 19 12:35:35 2022 -0500 wined3d: Set the window state thread description only if it's actually a new thread. Fixes: a2c03e23565779d2743f5750c37de0be3f7222bf --- dlls/wined3d/swapchain.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4b420a749f3..346fd1e6497 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2200,8 +2200,6 @@ static DWORD WINAPI set_window_state_thread(void *ctx) struct wined3d_window_state *s = ctx; bool filter; - SetThreadDescription(GetCurrentThread(), L"wined3d_set_window_state"); - filter = wined3d_filter_messages(s->window, TRUE); if (s->set_style) @@ -2229,11 +2227,18 @@ static void set_window_state(struct wined3d_window_state *s) * position can potentially deadlock if that thread isn't processing * messages. */ if (window_tid == tid) + { set_window_state_thread(s); - else if (!(thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) - ERR("Failed to create thread.\n"); - else + } + else if ((thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) + { + SetThreadDescription(thread, L"wined3d_set_window_state"); CloseHandle(thread); + } + else + { + ERR("Failed to create thread.\n"); + } } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state,

1 0

Zhiyi Zhang : user32: Use NtUserSetWindowLongPtr() in set_dialog_proc().
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 2e622d104122855c0c51245eae3f0a2cdc04e57c URL: https://gitlab.winehq.org/wine/wine/-/commit/2e622d104122855c0c51245eae3f0a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 7 10:47:35 2022 +0800 user32: Use NtUserSetWindowLongPtr() in set_dialog_proc(). Using NtUserSetWindowLong() truncates 64bit dialog procedure pointers to 32bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53631 --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0605f94abe1..3750d4b9643 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -632,7 +632,7 @@ static LONG_PTR set_dialog_proc( HWND hwnd, LONG_PTR newval, BOOL ansi ) DLGPROC proc; LONG_PTR ret; newval = NtUserCallTwoParam( newval, ansi, NtUserAllocWinProc ); - ret = NtUserSetWindowLong( hwnd, DWLP_DLGPROC, newval, ansi ); + ret = NtUserSetWindowLongPtr( hwnd, DWLP_DLGPROC, newval, ansi ); proc = NtUserGetDialogProc( (DLGPROC)ret, ansi ); if (proc) ret = (UINT_PTR)proc; return ret;

1 0

Eric Pouech : dbghelp: Added missing DECLSPEC_HIDDEN attribute.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: e6fd3021ba99b0593ac9ebaa452fcdead57c3372 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6fd3021ba99b0593ac9ebaa452fcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 9 11:17:40 2022 +0100 dbghelp: Added missing DECLSPEC_HIDDEN attribute. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 09457db0fff..01163c0e98a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -695,7 +695,7 @@ extern BOOL pcs_callback(const struct process* pcs, ULONG action, void* extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HIDDEN; extern const char* wine_dbgstr_addr(const ADDRESS64* addr) DECLSPEC_HIDDEN; extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; -extern const WCHAR *process_getenv(const struct process *process, const WCHAR *name); +extern const WCHAR *process_getenv(const struct process *process, const WCHAR *name) DECLSPEC_HIDDEN; extern DWORD calc_crc32(HANDLE handle) DECLSPEC_HIDDEN; /* elf_module.c */

1 0

Eric Pouech : dbghelp: Introduce a helper for module lookup.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 31e76b533326b55ae616f6bb1bf4e38e9ffb00f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/31e76b533326b55ae616f6bb1bf4e3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 9 11:17:42 2022 +0100 dbghelp: Introduce a helper for module lookup. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/path.c | 55 ++++++++++++++++++----------------------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 5b4172e4001..903087695aa 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -705,14 +705,24 @@ WCHAR *get_dos_file_name(const WCHAR *filename) return dos_path; } +static BOOL try_match_file(const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) +{ + HANDLE file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + BOOL ret = match(param, file, name); + CloseHandle(file); + return ret; + } + return FALSE; +} + BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { const WCHAR *env; WCHAR *p, *end; size_t len, i; - HANDLE file; WCHAR *buf; - BOOL ret; name = file_name(name); @@ -733,13 +743,7 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma p = end + lstrlenW(end); *p++ = '\\'; lstrcpyW(p, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + if (try_match_file(buf, match, param)) goto found; memcpy(end, programsW, sizeof(programsW)); end += ARRAY_SIZE(programsW); @@ -749,13 +753,7 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma p = end + lstrlenW(end); *p++ = '\\'; lstrcpyW(p, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + if (try_match_file(buf, match, param)) goto found; heap_free(buf); } @@ -771,21 +769,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma swprintf(buf, len, L"%s%s\\%s", env, so_dir, name); else swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + if (try_match_file(buf, match, param)) goto found; swprintf(buf, len, L"%s\\%s", env, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + if (try_match_file(buf, match, param)) goto found; heap_free(buf); } @@ -822,13 +808,8 @@ BOOL search_unix_path(const WCHAR *name, const WCHAR *path, BOOL (*match)(void*, WideCharToMultiByte(CP_UNIXCP, 0, name, -1, buf + len, size - len, NULL, NULL); if ((dos_path = wine_get_dos_file_name(buf))) { - HANDLE file = CreateFileW(dos_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, dos_path); - CloseHandle(file); - if (ret) TRACE("found %s\n", debugstr_w(dos_path)); - } + ret = try_match_file(dos_path, match, param); + if (ret) TRACE("found %s\n", debugstr_w(dos_path)); heap_free(dos_path); if (ret) break; }

1 0

Eric Pouech : dbghelp: Support loading modules from Wine's multi-arch build tree.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 1ed24f7ec624e7c3bacfbd166770b3c94635d728 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ed24f7ec624e7c3bacfbd166770b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 9 11:17:43 2022 +0100 dbghelp: Support loading modules from Wine's multi-arch build tree. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 10 +++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/path.c | 67 +++++++++++++++++++++++++++--------------- 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 32ce7e13865..2facc58585e 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -332,6 +332,16 @@ const WCHAR *process_getenv(const struct process *process, const WCHAR *name) return NULL; } +const struct cpu* process_get_cpu(const struct process* pcs) +{ + const struct module* m = pcs->lmodules; + + /* main module is the last one in list */ + if (!m) return dbghelp_current_cpu; + while (m->next) m = m->next; + return m->cpu; +} + /****************************************************************** * check_live_target * diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 01163c0e98a..22e9eec8805 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -696,6 +696,7 @@ extern void* fetch_buffer(struct process* pcs, unsigned size) DECLSPEC_HI extern const char* wine_dbgstr_addr(const ADDRESS64* addr) DECLSPEC_HIDDEN; extern struct cpu* cpu_find(DWORD) DECLSPEC_HIDDEN; extern const WCHAR *process_getenv(const struct process *process, const WCHAR *name) DECLSPEC_HIDDEN; +extern const struct cpu* process_get_cpu(const struct process* pcs) DECLSPEC_HIDDEN; extern DWORD calc_crc32(HANDLE handle) DECLSPEC_HIDDEN; /* elf_module.c */ diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 903087695aa..2320c9da5c3 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -31,22 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -#ifdef __i386__ -static const WCHAR pe_dir[] = L"\\i386-windows"; -static const WCHAR so_dir[] = L"\\i386-unix"; -#elif defined __x86_64__ -static const WCHAR pe_dir[] = L"\\x86_64-windows"; -static const WCHAR so_dir[] = L"\\x86_64-unix"; -#elif defined __arm__ -static const WCHAR pe_dir[] = L"\\arm-windows"; -static const WCHAR so_dir[] = L"\\arm-unix"; -#elif defined __aarch64__ -static const WCHAR pe_dir[] = L"\\aarch64-windows"; -static const WCHAR so_dir[] = L"\\aarch64-unix"; -#else -static const WCHAR pe_dir[] = L""; -static const WCHAR so_dir[] = L""; -#endif +static const struct machine_dir +{ + DWORD machine; + const WCHAR *pe_dir; + const WCHAR *so_dir; +} + all_machine_dir[] = +{ + {IMAGE_FILE_MACHINE_I386, L"\\i386-windows\\", L"\\i386-unix\\"}, + {IMAGE_FILE_MACHINE_AMD64, L"\\x86_64-windows\\", L"\\x86_64-unix\\"}, + {IMAGE_FILE_MACHINE_ARMNT, L"\\arm-windows\\", L"\\arm-unix\\"}, + {IMAGE_FILE_MACHINE_ARM64, L"\\aarch64-windows\\", L"\\aarch64-unix\\"}, +}; static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} @@ -705,6 +702,14 @@ WCHAR *get_dos_file_name(const WCHAR *filename) return dos_path; } +static inline const WCHAR* get_machine_dir(const struct machine_dir *machine_dir, const WCHAR *name) +{ + WCHAR *ptr; + if ((ptr = wcsrchr(name, L'.')) && !lstrcmpW(ptr, L".so")) + return machine_dir->so_dir; + return machine_dir->pe_dir; +} + static BOOL try_match_file(const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { HANDLE file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -721,18 +726,27 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma { const WCHAR *env; WCHAR *p, *end; - size_t len, i; + size_t len, i, machine_dir_len; WCHAR *buf; + const struct cpu* cpu; + const struct machine_dir* machine_dir; name = file_name(name); + cpu = process_get_cpu(process); + for (machine_dir = all_machine_dir; machine_dir < all_machine_dir + ARRAY_SIZE(all_machine_dir); machine_dir++) + if (machine_dir->machine == cpu->machine) break; + if (machine_dir >= all_machine_dir + ARRAY_SIZE(all_machine_dir)) return FALSE; + machine_dir_len = max(wcslen(machine_dir->pe_dir), wcslen(machine_dir->so_dir)); + if ((env = process_getenv(process, L"WINEBUILDDIR"))) { const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; len = lstrlenW(env); - if (!(buf = heap_alloc((len + 8 + 3 * lstrlenW(name)) * sizeof(WCHAR)))) return FALSE; + if (!(buf = heap_alloc((len + ARRAY_SIZE(programsW) + machine_dir_len + + 2 * lstrlenW(name) + 1) * sizeof(WCHAR)))) return FALSE; wcscpy(buf, env); end = buf + len; @@ -741,6 +755,11 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".dll")) *p = 0; p = end + lstrlenW(end); + /* try multi-arch first */ + wcscpy(p, get_machine_dir(machine_dir, name)); + wcscpy(p + wcslen(p), name); + if (try_match_file(buf, match, param)) goto found; + /* then old mono-arch */ *p++ = '\\'; lstrcpyW(p, name); if (try_match_file(buf, match, param)) goto found; @@ -751,6 +770,11 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".exe")) *p = 0; p = end + lstrlenW(end); + /* try multi-arch first */ + wcscpy(p, get_machine_dir(machine_dir, name)); + wcscpy(p + wcslen(p), name); + if (try_match_file(buf, match, param)) goto found; + /* then old mono-arch */ *p++ = '\\'; lstrcpyW(p, name); if (try_match_file(buf, match, param)) goto found; @@ -763,12 +787,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; + len = wcslen(env) + machine_dir_len + wcslen(name) + 1; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; - if ((p = wcsrchr(name, '.')) && !lstrcmpW(p, L".so")) - swprintf(buf, len, L"%s%s\\%s", env, so_dir, name); - else - swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); + swprintf(buf, len, L"%s%s%s", env, get_machine_dir(machine_dir, name), name); if (try_match_file(buf, match, param)) goto found; swprintf(buf, len, L"%s\\%s", env, name); if (try_match_file(buf, match, param)) goto found;

1 0

Zebediah Figura : d3d8/tests: Test drawing from a managed texture after Reset().
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: e4d37a452feec6d3c3e0ff15dda493c1c1d4b768 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4d37a452feec6d3c3e0ff15dda493… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 19:42:48 2022 -0500 d3d8/tests: Test drawing from a managed texture after Reset(). --- dlls/d3d8/tests/visual.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 2f9462f2d44..05a1fc38844 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -19,6 +19,7 @@ /* See comment in dlls/d3d9/tests/visual.c for general guidelines */ +#include <stdbool.h> #include <limits.h> #include <math.h> @@ -41,6 +42,14 @@ struct vec4 float x, y, z, w; }; +struct d3d8_test_context +{ + HWND window; + IDirect3D8 *d3d; + IDirect3DDevice8 *device; + IDirect3DSurface8 *backbuffer; +}; + static HWND create_window(void) { RECT rect; @@ -239,8 +248,9 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) } } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) -static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = 0xdeadbeef; struct surface_readback rb; @@ -264,7 +274,8 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface8 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + todo_wine_if (todo) + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -288,6 +299,101 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND return NULL; } +static bool init_test_context(struct d3d8_test_context *context) +{ + HRESULT hr; + + memset(context, 0, sizeof(*context)); + + context->window = create_window(); + context->d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!context->d3d, "Failed to create a D3D object.\n"); + if (!(context->device = create_device(context->d3d, context->window, context->window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(context->d3d); + DestroyWindow(context->window); + return false; + } + + hr = IDirect3DDevice8_GetRenderTarget(context->device, &context->backbuffer); + ok(hr == S_OK, "Failed to get backbuffer, hr %#lx.\n", hr); + + return true; +} + +#define release_test_context(a) release_test_context_(__LINE__, a) +static void release_test_context_(unsigned int line, struct d3d8_test_context *context) +{ + ULONG refcount; + + IDirect3DSurface8_Release(context->backbuffer); + refcount = IDirect3DDevice8_Release(context->device); + ok(!refcount, "Device has %lu references left.\n", refcount); + refcount = IDirect3D8_Release(context->d3d); + ok(!refcount, "D3D object has %lu references left.\n", refcount); + DestroyWindow(context->window); +} + +static void draw_textured_quad(struct d3d8_test_context *context, IDirect3DTexture8 *texture) +{ + IDirect3DDevice8 *device = context->device; + HRESULT hr; + + static const struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, + }; + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + +static HRESULT reset_device(struct d3d8_test_context *context) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + HRESULT hr; + + IDirect3DSurface8_Release(context->backbuffer); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = context->window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice8_Reset(context->device, &present_parameters); + + if (SUCCEEDED(hr)) + IDirect3DDevice8_GetRenderTarget(context->device, &context->backbuffer); + + return hr; +} + static void test_sanity(void) { IDirect3DDevice8 *device; @@ -5398,6 +5504,15 @@ static void fill_surface(IDirect3DSurface8 *surface, DWORD color, DWORD flags) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#lx.\n", hr); } +static void fill_texture(IDirect3DTexture8 *texture, DWORD color, DWORD flags) +{ + IDirect3DSurface8 *surface; + + IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + fill_surface(surface, color, flags); + IDirect3DSurface8_Release(surface); +} + static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) { HRESULT hr; @@ -11979,6 +12094,37 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_managed_reset(void) +{ + struct d3d8_test_context context; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + HRESULT hr; + + if (!init_test_context(&context)) + return; + device = context.device; + + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + fill_texture(texture, 0x0000ff00, 0); + + draw_textured_quad(&context, texture); + check_rt_color(context.backbuffer, 0x0000ff00); + + hr = reset_device(&context); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo(context.backbuffer, 0x0000ff00); + + IDirect3DTexture8_Release(texture); + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -12060,4 +12206,5 @@ START_TEST(visual) test_sample_mask(); test_dynamic_map_synchronization(); test_filling_convention(); + test_managed_reset(); }

1 0