- Wine-Commits - list.winehq.org

Eric Pouech : winedbg: Track loaded modules.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 224b33c2be2ccab7ea5f2926f391717703b5427b URL: https://gitlab.winehq.org/wine/wine/-/commit/224b33c2be2ccab7ea5f2926f39171… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 16 11:09:46 2023 -0600 winedbg: Track loaded modules. Co-authored-by: Evan Tang <etang(a)codeweavers.com> --- programs/winedbg/debugger.h | 12 ++++++++- programs/winedbg/tgt_active.c | 3 +-- programs/winedbg/types.c | 12 ++++----- programs/winedbg/winedbg.c | 61 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 72 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c4c0402ef5f..2948b1ba437 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -246,6 +246,12 @@ struct dbg_thread BOOL suspended; }; +struct dbg_module +{ + struct list entry; + DWORD_PTR base; +}; + struct dbg_delayed_bp { BOOL is_symbol; @@ -271,6 +277,7 @@ struct dbg_process void* pio_data; const WCHAR* imageName; struct list threads; + struct list modules; struct backend_cpu* be_cpu; HANDLE event_on_first_exception; BOOL active_debuggee; @@ -503,7 +510,7 @@ extern BOOL types_is_integral_type(const struct dbg_lvalue*); extern BOOL types_is_float_type(const struct dbg_lvalue*); extern BOOL types_is_pointer_type(const struct dbg_lvalue*); extern BOOL types_find_basic(const WCHAR*, const char*, struct dbg_type* type); -extern BOOL types_unload_module(DWORD_PTR linear); +extern BOOL types_unload_module(struct dbg_process* pcs, DWORD_PTR linear); /* winedbg.c */ #ifdef __GNUC__ @@ -524,6 +531,9 @@ extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); +extern struct dbg_module* dbg_get_module(struct dbg_process* pcs, DWORD_PTR base); +extern void dbg_del_module(struct dbg_module* mod); +extern BOOL dbg_unload_module(struct dbg_process* pcs, DWORD_PTR base); extern void dbg_set_option(const char*, const char*); extern void dbg_start_interactive(const char*, HANDLE hFile); extern void dbg_init_console(void); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 9e130038f22..0d5ae754af5 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -501,8 +501,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); break_delete_xpoints_from_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); - types_unload_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); - SymUnloadModule64(dbg_curr_process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); + dbg_unload_module(dbg_curr_process, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); break; case OUTPUT_DEBUG_STRING_EVENT: diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5f5f1346c67..44872a7edad 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -1205,16 +1205,16 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v return TRUE; } -BOOL types_unload_module(DWORD_PTR linear) +BOOL types_unload_module(struct dbg_process* pcs, DWORD_PTR linear) { unsigned i; - if (!dbg_curr_process) return FALSE; - for (i = 0; i < dbg_curr_process->num_synthetized_types; i++) + if (!pcs) return FALSE; + for (i = 0; i < pcs->num_synthetized_types; i++) { - if (dbg_curr_process->synthetized_types[i].module == linear) + if (pcs->synthetized_types[i].module == linear) { - dbg_curr_process->synthetized_types[i].module = 0; - dbg_curr_process->synthetized_types[i].id = dbg_itype_none; + pcs->synthetized_types[i].module = 0; + pcs->synthetized_types[i].id = dbg_itype_none; } } return TRUE; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index aa94f2f18ab..f5c573cf30e 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -273,6 +273,7 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->pio_data = NULL; p->imageName = NULL; list_init(&p->threads); + list_init(&p->modules); p->event_on_first_exception = NULL; p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ @@ -316,11 +317,16 @@ void dbg_del_process(struct dbg_process* p) { struct dbg_thread* t; struct dbg_thread* t2; + struct dbg_module* mod; + struct dbg_module* mod2; int i; LIST_FOR_EACH_ENTRY_SAFE(t, t2, &p->threads, struct dbg_thread, entry) dbg_del_thread(t); + LIST_FOR_EACH_ENTRY_SAFE(mod, mod2, &p->modules, struct dbg_module, entry) + dbg_del_module(mod); + for (i = 0; i < p->num_delayed_bp; i++) if (p->delayed_bp[i].is_symbol) free(p->delayed_bp[i].u.symbol.name); @@ -377,15 +383,56 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade) BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size) { - BOOL ret = SymLoadModuleExW(hProc, hFile, name, NULL, base, size, NULL, 0); - if (ret) + struct dbg_process* pcs = dbg_get_process_h(hProc); + struct dbg_module* mod; + IMAGEHLP_MODULEW64 info; + + if (!pcs) return FALSE; + mod = malloc(sizeof(struct dbg_module)); + if (!mod) return FALSE; + if (!SymLoadModuleExW(hProc, hFile, name, NULL, base, size, NULL, 0)) { - IMAGEHLP_MODULEW64 ihm; - ihm.SizeOfStruct = sizeof(ihm); - if (SymGetModuleInfoW64(hProc, base, &ihm) && (ihm.PdbUnmatched || ihm.DbgUnmatched)) - dbg_printf("Loaded unmatched debug information for %s\n", wine_dbgstr_w(name)); + free(mod); + return FALSE; } - return ret; + mod->base = base; + list_add_head(&pcs->modules, &mod->entry); + + info.SizeOfStruct = sizeof(info); + if (SymGetModuleInfoW64(hProc, base, &info)) + if (info.PdbUnmatched || info.DbgUnmatched) + dbg_printf("Loaded unmatched debug information for %s\n", wine_dbgstr_w(name)); + + return TRUE; +} + +void dbg_del_module(struct dbg_module* mod) +{ + list_remove(&mod->entry); + free(mod); +} + +struct dbg_module* dbg_get_module(struct dbg_process* pcs, DWORD_PTR base) +{ + struct dbg_module* mod; + + if (!pcs) + return NULL; + LIST_FOR_EACH_ENTRY(mod, &pcs->modules, struct dbg_module, entry) + if (mod->base == base) + return mod; + return NULL; +} + +BOOL dbg_unload_module(struct dbg_process* pcs, DWORD_PTR base) +{ + struct dbg_module* mod = dbg_get_module(pcs, base); + + types_unload_module(pcs, base); + SymUnloadModule64(pcs->handle, base); + dbg_del_module(mod); + + return !!mod; } struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid)

1 0

Eric Pouech : winedbg: Fix read access to variables with thread local storage.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 433bc1270965c07d440ef676d5593de1ef329918 URL: https://gitlab.winehq.org/wine/wine/-/commit/433bc1270965c07d440ef676d5593d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 16 11:14:59 2023 -0600 winedbg: Fix read access to variables with thread local storage. No longer relying on loaded module info (getting index address out of PE image, and caching it in struct dbg_module). Co-authored-by: Evan Tang <etang(a)codeweavers.com> --- programs/winedbg/debugger.h | 1 + programs/winedbg/symbol.c | 74 +++++++++++++++++++++++---------------------- programs/winedbg/winedbg.c | 29 ++++++++++++++++++ 3 files changed, 68 insertions(+), 36 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 2948b1ba437..61fb055e53f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -250,6 +250,7 @@ struct dbg_module { struct list entry; DWORD_PTR base; + DWORD_PTR tls_index_offset; }; struct dbg_delayed_bp diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 961dc95585a..22c34033752 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -61,6 +61,43 @@ static BOOL symbol_get_debug_start(const struct dbg_type* func, ULONG64* start) return FALSE; } +static BOOL fetch_tls_lvalue(const SYMBOL_INFO* sym, struct dbg_lvalue* lvalue) +{ + struct dbg_module* mod = dbg_get_module(dbg_curr_process, sym->ModBase); + unsigned tlsindex; + struct dbg_lvalue lv_teb_tls, lv_index_addr, lv_module_tls; + dbg_lgint_t teb_tls_addr, index_addr, tls_module_addr; + char* teb_tls_storage; + + if (!mod || !mod->tls_index_offset || !dbg_curr_thread) + return FALSE; + /* get ThreadLocalStoragePointer offset depending on debuggee bitness */ + teb_tls_storage = (char*)dbg_curr_thread->teb; + if (ADDRSIZE == sizeof(void*)) + /* debugger and debuggee have same bitness */ + teb_tls_storage += offsetof(TEB, ThreadLocalStoragePointer); + else + /* debugger is 64bit, while debuggee is 32bit */ + teb_tls_storage += 0x2000 /* TEB64 => TEB32 */ + offsetof(TEB32, ThreadLocalStoragePointer); + init_lvalue(&lv_teb_tls, TRUE, teb_tls_storage); + + if (!memory_fetch_integer(&lv_teb_tls, ADDRSIZE, FALSE, &teb_tls_addr)) + return FALSE; + + init_lvalue(&lv_index_addr, TRUE, (void*)(DWORD_PTR)(sym->ModBase + mod->tls_index_offset)); + if (!memory_fetch_integer(&lv_index_addr, ADDRSIZE, FALSE, &index_addr)) + return FALSE; + + if (!dbg_read_memory((const char*)(DWORD_PTR)index_addr, &tlsindex, sizeof(tlsindex))) + return FALSE; + + init_lvalue(&lv_module_tls, TRUE, (void*)(DWORD_PTR)(teb_tls_addr + tlsindex * ADDRSIZE)); + if (!memory_fetch_integer(&lv_module_tls, ADDRSIZE, FALSE, &tls_module_addr)) + return FALSE; + init_lvalue(lvalue, TRUE, (void*)(DWORD_PTR)(tls_module_addr + sym->Address)); + return TRUE; +} + static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, struct dbg_lvalue* lvalue, char* buffer, size_t sz) { @@ -128,46 +165,11 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, } else if (sym->Flags & SYMFLAG_TLSREL) { - PROCESS_BASIC_INFORMATION pbi; - THREAD_BASIC_INFORMATION tbi; - DWORD_PTR addr; - PEB peb; - PEB_LDR_DATA ldr_data; - PLIST_ENTRY head, current; - LDR_DATA_TABLE_ENTRY ldr_module; - unsigned tlsindex = -1; - - if (NtQueryInformationProcess(dbg_curr_process->handle, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL) || - NtQueryInformationThread(dbg_curr_thread->handle, ThreadBasicInformation, - &tbi, sizeof(tbi), NULL)) + if (!fetch_tls_lvalue(sym, lvalue)) { - tls_error: if (buffer) snprintf(buffer, sz, "Cannot read TLS address\n"); return FALSE; } - addr = (DWORD_PTR)&(((TEB*)tbi.TebBaseAddress)->ThreadLocalStoragePointer); - if (!dbg_read_memory((void*)addr, &addr, sizeof(addr)) || - !dbg_read_memory(pbi.PebBaseAddress, &peb, sizeof(peb)) || - !dbg_read_memory(peb.LdrData, &ldr_data, sizeof(ldr_data))) - goto tls_error; - current = ldr_data.InLoadOrderModuleList.Flink; - head = &((PEB_LDR_DATA*)peb.LdrData)->InLoadOrderModuleList; - do - { - if (!dbg_read_memory(CONTAINING_RECORD(current, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks), - &ldr_module, sizeof(ldr_module))) goto tls_error; - if ((DWORD_PTR)ldr_module.DllBase == sym->ModBase) - { - tlsindex = ldr_module.TlsIndex; - break; - } - current = ldr_module.InLoadOrderLinks.Flink; - } while (current != head); - - addr += tlsindex * sizeof(DWORD_PTR); - if (!dbg_read_memory((void*)addr, &addr, sizeof(addr))) goto tls_error; - init_lvalue(lvalue, TRUE, (void*)(DWORD_PTR)(addr + sym->Address)); } else { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index f5c573cf30e..9815ed4a046 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -386,6 +386,8 @@ BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR ba struct dbg_process* pcs = dbg_get_process_h(hProc); struct dbg_module* mod; IMAGEHLP_MODULEW64 info; + HANDLE hMap; + void* image; if (!pcs) return FALSE; mod = malloc(sizeof(struct dbg_module)); @@ -398,6 +400,33 @@ BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR ba mod->base = base; list_add_head(&pcs->modules, &mod->entry); + mod->tls_index_offset = 0; + if ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL))) + { + if ((image = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0))) + { + IMAGE_NT_HEADERS* nth = RtlImageNtHeader(image); + const void* tlsdir; + ULONG sz; + + tlsdir = RtlImageDirectoryEntryToData(image, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &sz); + switch (nth->OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + if (tlsdir && sz >= sizeof(IMAGE_TLS_DIRECTORY32)) + mod->tls_index_offset = (const char*)tlsdir - (const char*)image + + offsetof(IMAGE_TLS_DIRECTORY32, AddressOfIndex); + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + if (tlsdir && sz >= sizeof(IMAGE_TLS_DIRECTORY64)) + mod->tls_index_offset = (const char*)tlsdir - (const char*)image + + offsetof(IMAGE_TLS_DIRECTORY64, AddressOfIndex); + break; + } + UnmapViewOfFile(image); + } + CloseHandle(hMap); + } info.SizeOfStruct = sizeof(info); if (SymGetModuleInfoW64(hProc, base, &info)) if (info.PdbUnmatched || info.DbgUnmatched)

1 0

Huw Davies : winebuild: Reorder the includes to avoid a build error on macOS.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 38a7145731e875108bec91262735af7c0d8c5dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/38a7145731e875108bec91262735af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:35:08 2023 +0000 winebuild: Reorder the includes to avoid a build error on macOS. "build.h" eventually includes <sys/queue.h> which contains a conflicting definition of LIST_INIT. --- tools/winebuild/import.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e7306fc12d8..0c1cd291d21 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -28,8 +28,8 @@ #include <string.h> #include <stdarg.h> -#include "wine/list.h" #include "build.h" +#include "wine/list.h" /* standard C functions that are also exported from ntdll */ static const char *stdc_names[] =

1 0

Nikolay Sivov : comctl32/header: Do not touch 'hwnd' field in HDM_LAYOUT.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 32bfaeb3f9d5f8f51dfc76f1987947e1125bbe67 URL: https://gitlab.winehq.org/wine/wine/-/commit/32bfaeb3f9d5f8f51dfc76f1987947… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 22 19:18:25 2023 +0300 comctl32/header: Do not touch 'hwnd' field in HDM_LAYOUT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 1 - dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/header.c | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 191a314bcd8..1e2d957b93e 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1465,7 +1465,6 @@ HEADER_InsertItemT (HEADER_INFO *infoPtr, INT nItem, const HDITEMW *phdi, BOOL b static LRESULT HEADER_Layout (HEADER_INFO *infoPtr, LPHDLAYOUT lpLayout) { - lpLayout->pwpos->hwnd = infoPtr->hwndSelf; lpLayout->pwpos->hwndInsertAfter = 0; lpLayout->pwpos->x = lpLayout->prc->left; lpLayout->pwpos->y = lpLayout->prc->top; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fc22818c37b..750e447dbef 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11184,7 +11184,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) wp.cy = 0; } - SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); + SetWindowPos(infoPtr->hwndHeader, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags); TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); infoPtr->rcList.top = max(wp.cy, 0); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 7261da2a5f3..c027d292385 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -873,9 +873,12 @@ static void test_hdm_layout(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); + windowPos.hwnd = (HWND)0xdeadbeef; flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessageA(hChild, HDM_LAYOUT, 0, (LPARAM) &hdLayout); expect(TRUE, retVal); + ok(windowPos.hwnd == (HWND)0xdeadbeef, "Unexpected value %p.\n", windowPos.hwnd); + ok(!windowPos.hwndInsertAfter, "Unexpected value %p.\n", windowPos.hwndInsertAfter); ok_sequence(sequences, HEADER_SEQ_INDEX, layout_seq, "layout sequence testing", FALSE); @@ -1884,6 +1887,7 @@ START_TEST(header) test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); test_item_auto_format(parent_hwnd); + test_hdm_layout(parent_hwnd); unload_v6_module(ctx_cookie, hCtx);

1 0

Rémi Bernon : dinput: Introduce new input_thread_update_device_list helper.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 27e89c5c32bbd717932a55d91fc287819e950646 URL: https://gitlab.winehq.org/wine/wine/-/commit/27e89c5c32bbd717932a55d91fc287… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:42:11 2023 +0100 dinput: Introduce new input_thread_update_device_list helper. --- dlls/dinput/dinput_main.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 896126635bd..9daff6f3750 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -237,6 +237,22 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam return CallNextHookEx( 0, code, wparam, lparam ); } +static void input_thread_update_device_list( struct input_thread_state *state ) +{ + struct dinput_device *device; + UINT count = 0; + + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) + { + if (!device->read_event || !device->vtbl->read) continue; + state->events[count] = device->read_event; + if (++count >= ARRAY_SIZE(state->events)) break; + } + state->events_count = count; + LeaveCriticalSection( &dinput_hook_crit ); +} + static DWORD WINAPI dinput_thread_proc( void *params ) { HANDLE finished_event, start_event = params; @@ -319,15 +335,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) SetEvent(finished_event); } - state.events_count = 0; - EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) - { - if (!impl->read_event || !impl->vtbl->read) continue; - if (state.events_count >= ARRAY_SIZE(state.events)) break; - state.events[state.events_count++] = impl->read_event; - } - LeaveCriticalSection( &dinput_hook_crit ); + input_thread_update_device_list( &state ); } if (ret != state.events_count) ERR("Unexpected termination, ret %#lx\n", ret);

1 0

Rémi Bernon : dinput: Keep a reference on acquired devices while waiting.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: d58055dd7d79cdb7466d4183ec4326f95a23cdd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d58055dd7d79cdb7466d4183ec4326… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:45:43 2023 +0100 dinput: Keep a reference on acquired devices while waiting. --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9daff6f3750..48aa53c63cb 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -46,10 +46,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#define INPUT_THREAD_MAX_DEVICES 128 + struct input_thread_state { UINT events_count; - HANDLE events[128]; + UINT devices_count; + struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; + HANDLE events[INPUT_THREAD_MAX_DEVICES]; }; static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -247,9 +251,11 @@ static void input_thread_update_device_list( struct input_thread_state *state ) { if (!device->read_event || !device->vtbl->read) continue; state->events[count] = device->read_event; - if (++count >= ARRAY_SIZE(state->events)) break; + dinput_device_internal_addref( (state->devices[count] = device) ); + if (++count >= INPUT_THREAD_MAX_DEVICES) break; } state->events_count = count; + state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit ); } @@ -258,7 +264,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) HANDLE finished_event, start_event = params; struct input_thread_state state = {0}; static HHOOK kbd_hook, mouse_hook; - struct dinput_device *impl, *next; + struct dinput_device *device; DWORD ret; MSG msg; @@ -274,20 +280,13 @@ static DWORD WINAPI dinput_thread_proc( void *params ) if (ret < state.events_count) { - EnterCriticalSection( &dinput_hook_crit ); - LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) + if ((device = state.devices[ret]) && FAILED( device->vtbl->read( &device->IDirectInputDevice8W_iface ) )) { - if (impl->read_event == state.events[ret]) - { - if (FAILED( impl->vtbl->read( &impl->IDirectInputDevice8W_iface ) )) - { - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface ); - impl->status = STATUS_UNPLUGGED; - } - break; - } + EnterCriticalSection( &dinput_hook_crit ); + dinput_device_internal_unacquire( &device->IDirectInputDevice8W_iface ); + LeaveCriticalSection( &dinput_hook_crit ); + device->status = STATUS_UNPLUGGED; } - LeaveCriticalSection( &dinput_hook_crit ); } while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) @@ -335,12 +334,14 @@ static DWORD WINAPI dinput_thread_proc( void *params ) SetEvent(finished_event); } + while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); input_thread_update_device_list( &state ); } if (ret != state.events_count) ERR("Unexpected termination, ret %#lx\n", ret); done: + while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); DestroyWindow( di_em_win ); di_em_win = NULL; return 0;

1 0

Rémi Bernon : dinput: Keep an internal refcount for dinput devices references.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 5fa11f5fb6e0b630d1aa8d978a8377753817cce7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa11f5fb6e0b630d1aa8d978a8377… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 12:19:12 2023 +0100 dinput: Keep an internal refcount for dinput devices references. --- dlls/dinput/device.c | 5 ++--- dlls/dinput/dinput.c | 30 ++++++++++++++++++++++++------ dlls/dinput/dinput_private.h | 4 ++++ dlls/dinput/tests/device8.c | 1 - dlls/dinput/tests/hid.c | 2 -- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index afb3a1512bb..7f97067bd81 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -716,7 +716,7 @@ void dinput_device_internal_release( struct dinput_device *impl ) free( impl->action_map ); - IDirectInput_Release( &impl->dinput->IDirectInput7A_iface ); + dinput_internal_release( impl->dinput ); impl->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &impl->crit ); @@ -2125,8 +2125,7 @@ void dinput_device_init( struct dinput_device *device, const struct dinput_devic device->device_gain = 10000; device->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &device->crit ); - device->dinput = dinput; - IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); + dinput_internal_addref( (device->dinput = dinput) ); device->vtbl = vtbl; } diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index 08d36246071..7cf06364dc3 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -107,6 +107,28 @@ static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LP return IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, type, callback, context, flags ); } +void dinput_internal_addref( struct dinput *impl ) +{ + ULONG ref = InterlockedIncrement( &impl->internal_ref ); + TRACE( "impl %p, internal ref %lu.\n", impl, ref ); +} + +void dinput_internal_release( struct dinput *impl ) +{ + ULONG ref = InterlockedDecrement( &impl->internal_ref ); + TRACE( "impl %p, internal ref %lu.\n", impl, ref ); + + if (!ref) + { + struct DevicePlayer *device_player, *device_player2; + + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) + free( device_player ); + + free( impl ); + } +} + static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) { struct dinput *impl = impl_from_IDirectInput7W( iface ); @@ -124,12 +146,7 @@ static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) if (!ref) { - struct DevicePlayer *device_player, *device_player2; - - LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) - free( device_player ); - - free( impl ); + dinput_internal_release( impl ); } return ref; @@ -792,6 +809,7 @@ static HRESULT dinput_create( IUnknown **out ) impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->internal_ref = 1; impl->ref = 1; list_init( &impl->device_players ); diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 79a5baabb6e..fb9558716a3 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -36,6 +36,7 @@ struct dinput IDirectInput8A IDirectInput8A_iface; IDirectInput8W IDirectInput8W_iface; IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; + LONG internal_ref; LONG ref; DWORD dwVersion; /* direct input version number */ @@ -46,6 +47,9 @@ struct dinput extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN; extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN; +extern void dinput_internal_addref( struct dinput *dinput ); +extern void dinput_internal_release( struct dinput *dinput ); + extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); extern HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 86f0360c0f1..449402621a7 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -116,7 +116,6 @@ static HRESULT create_dinput_device( DWORD version, const GUID *guid, IDirectInp ok( hr == DI_OK, "CreateDevice returned %#lx\n", hr ); ref = IDirectInput_Release( dinput ); - todo_wine ok( ref == 0, "Release returned %ld\n", ref ); return DI_OK; diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index a5ede6ee29b..facbf69fcec 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3689,7 +3689,6 @@ HRESULT dinput_test_create_device( DWORD version, DIDEVICEINSTANCEW *devinst, ID ok( hr == DI_OK, "CreateDevice returned %#lx\n", hr ); ref = IDirectInput8_Release( di8 ); - todo_wine ok( ref == 0, "Release returned %ld\n", ref ); } else @@ -3716,7 +3715,6 @@ HRESULT dinput_test_create_device( DWORD version, DIDEVICEINSTANCEW *devinst, ID ok( hr == DI_OK, "CreateDevice returned %#lx\n", hr ); ref = IDirectInput_Release( di ); - todo_wine ok( ref == 0, "Release returned %ld\n", ref ); }

1 0

Rémi Bernon : dinput: Introduce a new struct to keep input thread state.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 35e4a577f062bf8b48b2644ce055fbe4ae11369e URL: https://gitlab.winehq.org/wine/wine/-/commit/35e4a577f062bf8b48b2644ce055fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 14:40:39 2023 +0100 dinput: Introduce a new struct to keep input thread state. --- dlls/dinput/dinput_main.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 19bdf07975d..896126635bd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -46,6 +46,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +struct input_thread_state +{ + UINT events_count; + HANDLE events[128]; +}; + static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) { return CONTAINING_RECORD( iface, struct dinput_device, IDirectInputDevice8W_iface ); @@ -233,11 +239,10 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static DWORD WINAPI dinput_thread_proc( void *params ) { - HANDLE events[128], start_event = params; + HANDLE finished_event, start_event = params; + struct input_thread_state state = {0}; static HHOOK kbd_hook, mouse_hook; struct dinput_device *impl, *next; - SIZE_T events_count = 0; - HANDLE finished_event; DWORD ret; MSG msg; @@ -247,16 +252,16 @@ static DWORD WINAPI dinput_thread_proc( void *params ) PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); SetEvent( start_event ); - while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) + while ((ret = MsgWaitForMultipleObjectsEx( state.events_count, state.events, INFINITE, QS_ALLINPUT, 0 )) <= state.events_count) { UINT kbd_cnt = 0, mice_cnt = 0; - if (ret < events_count) + if (ret < state.events_count) { EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) { - if (impl->read_event == events[ret]) + if (impl->read_event == state.events[ret]) { if (FAILED( impl->vtbl->read( &impl->IDirectInputDevice8W_iface ) )) { @@ -314,18 +319,18 @@ static DWORD WINAPI dinput_thread_proc( void *params ) SetEvent(finished_event); } - events_count = 0; + state.events_count = 0; EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, struct dinput_device, entry ) { if (!impl->read_event || !impl->vtbl->read) continue; - if (events_count >= ARRAY_SIZE(events)) break; - events[events_count++] = impl->read_event; + if (state.events_count >= ARRAY_SIZE(state.events)) break; + state.events[state.events_count++] = impl->read_event; } LeaveCriticalSection( &dinput_hook_crit ); } - if (ret != events_count) ERR("Unexpected termination, ret %#lx\n", ret); + if (ret != state.events_count) ERR("Unexpected termination, ret %#lx\n", ret); done: DestroyWindow( di_em_win );

1 0

Hans Leidekker : dplayx/tests: Skip tests when the dll is missing.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: e82e74bfb5896d1dae3684f795782f767cbf73c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e82e74bfb5896d1dae3684f795782f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 24 13:29:42 2023 +0100 dplayx/tests: Skip tests when the dll is missing. --- dlls/dplayx/tests/dplayx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6cc149bac95..ba0f73194f6 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6906,9 +6906,9 @@ START_TEST(dplayx) } strcat(path, "\\dplayx.dll"); - if (!winetest_interactive && is_stub_dll(path)) + if (!winetest_interactive && (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES || is_stub_dll(path))) { - win_skip("dpnet is a stub dll, skipping tests\n"); + win_skip("dplayx is missing or a stub dll, skipping tests\n"); return; }

1 0

Rémi Bernon : dinput: Use an internal refcount on all dinput devices.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 15c12fd75d73e59236b024270939f85c0e67fd63 URL: https://gitlab.winehq.org/wine/wine/-/commit/15c12fd75d73e59236b024270939f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 22 12:04:21 2023 +0100 dinput: Use an internal refcount on all dinput devices. --- dlls/dinput/device.c | 38 ++++++++++++++++++++++++-------------- dlls/dinput/device_private.h | 8 ++++++-- dlls/dinput/joystick_hid.c | 38 ++++++++++++-------------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e53940a2e3b..afb3a1512bb 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -693,25 +693,35 @@ static HRESULT WINAPI dinput_device_SetEventNotification( IDirectInputDevice8W * return DI_OK; } -void dinput_device_destroy( IDirectInputDevice8W *iface ) +void dinput_device_internal_addref( struct dinput_device *impl ) { - struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); + ULONG ref = InterlockedIncrement( &impl->internal_ref ); + TRACE( "impl %p, internal ref %lu.\n", impl, ref ); +} - TRACE( "iface %p.\n", iface ); +void dinput_device_internal_release( struct dinput_device *impl ) +{ + ULONG ref = InterlockedDecrement( &impl->internal_ref ); + TRACE( "impl %p, internal ref %lu.\n", impl, ref ); - free( This->object_properties ); - free( This->data_queue ); + if (!ref) + { + if (impl->vtbl->destroy) impl->vtbl->destroy( &impl->IDirectInputDevice8W_iface ); - free( This->device_format.rgodf ); - dinput_device_release_user_format( This ); + free( impl->object_properties ); + free( impl->data_queue ); - free( This->action_map ); + free( impl->device_format.rgodf ); + dinput_device_release_user_format( impl ); - IDirectInput_Release(&This->dinput->IDirectInput7A_iface); - This->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->crit); + free( impl->action_map ); - free( This ); + IDirectInput_Release( &impl->dinput->IDirectInput7A_iface ); + impl->crit.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &impl->crit ); + + free( impl ); + } } static ULONG WINAPI dinput_device_Release( IDirectInputDevice8W *iface ) @@ -724,8 +734,7 @@ static ULONG WINAPI dinput_device_Release( IDirectInputDevice8W *iface ) if (!ref) { IDirectInputDevice_Unacquire( iface ); - if (impl->vtbl->release) impl->vtbl->release( iface ); - else dinput_device_destroy( iface ); + dinput_device_internal_release( impl ); } return ref; @@ -2107,6 +2116,7 @@ void dinput_device_init( struct dinput_device *device, const struct dinput_devic { device->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; device->IDirectInputDevice8W_iface.lpVtbl = &dinput_device_w_vtbl; + device->internal_ref = 1; device->ref = 1; device->guid = *guid; device->instance.dwSize = sizeof(DIDEVICEINSTANCEW); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 45250ed082b..fd48a602b97 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -36,7 +36,7 @@ typedef struct struct dinput_device_vtbl { - void (*release)( IDirectInputDevice8W *iface ); + void (*destroy)( IDirectInputDevice8W *iface ); HRESULT (*poll)( IDirectInputDevice8W *iface ); HRESULT (*read)( IDirectInputDevice8W *iface ); HRESULT (*acquire)( IDirectInputDevice8W *iface ); @@ -81,7 +81,9 @@ struct dinput_device { IDirectInputDevice8W IDirectInputDevice8W_iface; IDirectInputDevice8A IDirectInputDevice8A_iface; + LONG internal_ref; LONG ref; + GUID guid; CRITICAL_SECTION crit; struct dinput *dinput; @@ -125,8 +127,10 @@ struct dinput_device extern void dinput_device_init( struct dinput_device *device, const struct dinput_device_vtbl *vtbl, const GUID *guid, struct dinput *dinput ); +extern void dinput_device_internal_addref( struct dinput_device *device ); +extern void dinput_device_internal_release( struct dinput_device *device ); + extern HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface ); -extern void dinput_device_destroy( IDirectInputDevice8W *iface ); extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2ec218ffc09..6846410e02c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -172,7 +172,6 @@ struct pid_effect_state struct hid_joystick { struct dinput_device base; - LONG internal_ref; HANDLE device; OVERLAPPED read_ovl; @@ -775,30 +774,18 @@ static void set_report_value( struct hid_joystick *impl, char *report_buf, caps->usage_page, caps->usage_min, status ); } -static void hid_joystick_addref( IDirectInputDevice8W *iface ) +static void hid_joystick_destroy( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - ULONG ref = InterlockedIncrement( &impl->internal_ref ); - TRACE( "iface %p, internal ref %lu.\n", iface, ref ); -} - -static void hid_joystick_release( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - ULONG ref = InterlockedDecrement( &impl->internal_ref ); - TRACE( "iface %p, internal ref %lu.\n", iface, ref ); + TRACE( "iface %p.\n", iface ); - if (!ref) - { - free( impl->usages_buf ); - free( impl->feature_report_buf ); - free( impl->output_report_buf ); - free( impl->input_report_buf ); - HidD_FreePreparsedData( impl->preparsed ); - CloseHandle( impl->base.read_event ); - CloseHandle( impl->device ); - dinput_device_destroy( iface ); - } + free( impl->usages_buf ); + free( impl->feature_report_buf ); + free( impl->output_report_buf ); + free( impl->input_report_buf ); + HidD_FreePreparsedData( impl->preparsed ); + CloseHandle( impl->base.read_event ); + CloseHandle( impl->device ); } static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD property, @@ -1367,7 +1354,7 @@ static HRESULT hid_joystick_enum_objects( IDirectInputDevice8W *iface, const DIP static const struct dinput_device_vtbl hid_joystick_vtbl = { - hid_joystick_release, + hid_joystick_destroy, NULL, hid_joystick_read, hid_joystick_acquire, @@ -2036,7 +2023,6 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - impl->internal_ref = 1; if (memcmp( device_path_guid.Data4, guid->Data4, sizeof(device_path_guid.Data4) )) hr = hid_joystick_device_open( -1, guid, &impl->base.instance, impl->device_path, &impl->device, &impl->preparsed, @@ -2163,7 +2149,7 @@ static ULONG WINAPI hid_joystick_effect_Release( IDirectInputEffect *iface ) EnterCriticalSection( &impl->joystick->base.crit ); list_remove( &impl->entry ); LeaveCriticalSection( &impl->joystick->base.crit ); - hid_joystick_release( &impl->joystick->base.IDirectInputDevice8W_iface ); + dinput_device_internal_release( &impl->joystick->base ); free( impl->set_envelope_buf ); free( impl->type_specific_buf ); free( impl->effect_update_buf ); @@ -3155,7 +3141,7 @@ static HRESULT hid_joystick_create_effect( IDirectInputDevice8W *iface, IDirectI impl->IDirectInputEffect_iface.lpVtbl = &hid_joystick_effect_vtbl; impl->ref = 1; impl->joystick = joystick; - hid_joystick_addref( &joystick->base.IDirectInputDevice8W_iface ); + dinput_device_internal_addref( &joystick->base ); EnterCriticalSection( &joystick->base.crit ); list_add_tail( &joystick->effect_list, &impl->entry );

1 0