August 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : winegcc: Add a helper function to build the .spec.o file.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: c697ee728b60e259723730384ecf784f5f9375ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c697ee728b60e25972373038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 11:58:17 2021 +0200 winegcc: Add a helper function to build the .spec.o file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 176 ++++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 79 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd2d2c2a794..b756c5a97f8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1120,10 +1120,105 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil free(fullname); } +/* run winebuild to generate the .spec.o file */ +static const char *build_spec_obj( struct options *opts, const char *spec_file, const char *output_file, + strarray *files, strarray *lib_dirs, const char *entry_point ) +{ + unsigned int i; + int is_pe = is_pe_target( opts ); + strarray *spec_args = get_winebuild_args( opts ); + strarray *tool; + const char *spec_o_name, *output_name; + int fake_module = strendswith(output_file, ".fake"); + + /* get the filename from the path */ + if ((output_name = strrchr(output_file, '/'))) output_name++; + else output_name = output_file; + + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + spec_o_name = get_temp_file(output_name, ".spec.o"); + if (opts->force_pointer_size) + strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); + strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); + if (fake_module) + { + strarray_add(spec_args, "--fake-module"); + strarray_add(spec_args, "-o"); + strarray_add(spec_args, output_file); + } + else + { + strarray_add(spec_args, "-o"); + strarray_add(spec_args, spec_o_name); + } + if (spec_file) + { + strarray_add(spec_args, "-E"); + strarray_add(spec_args, spec_file); + } + + if (!opts->shared) + { + strarray_add(spec_args, "-F"); + strarray_add(spec_args, output_name); + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->gui_app ? "windows" : "console"); + if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); + } + + if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + + if (entry_point) + { + strarray_add(spec_args, "--entry"); + strarray_add(spec_args, entry_point); + } + + if (opts->subsystem) + { + strarray_add(spec_args, "--subsystem"); + strarray_add(spec_args, opts->subsystem); + } + + for (i = 0; i < lib_dirs->size; i++) + strarray_add(spec_args, strmake("-L%s", lib_dirs->base[i])); + + if (!is_pe) + { + for (i = 0; i < opts->delayimports->size; i++) + strarray_add(spec_args, strmake("-d%s", opts->delayimports->base[i])); + } + + /* add resource files */ + for (i = 0; i < files->size; i++) + if (files->base[i][1] == 'r') strarray_add(spec_args, files->base[i]); + + /* add other files */ + strarray_add(spec_args, "--"); + for (i = 0; i < files->size; i++) + { + switch(files->base[i][1]) + { + case 'd': + case 'a': + case 'o': + strarray_add(spec_args, files->base[i] + 2); + break; + } + } + + spawn(opts->prefix, spec_args, 0); + strarray_free (spec_args); + return spec_o_name; +} + static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *implib_args, *tool; + strarray *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1287,85 +1382,8 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - spec_args = get_winebuild_args( opts ); - if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); - if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); - - spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->force_pointer_size) - strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - strarray_add(spec_args, "-D_REENTRANT"); - if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); - strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); - if (fake_module) - { - strarray_add(spec_args, "--fake-module"); - strarray_add(spec_args, "-o"); - strarray_add(spec_args, output_file); - } - else - { - strarray_add(spec_args, "-o"); - strarray_add(spec_args, spec_o_name); - } - if (spec_file) - { - strarray_add(spec_args, "-E"); - strarray_add(spec_args, spec_file); - } - - if (!opts->shared) - { - strarray_add(spec_args, "-F"); - strarray_add(spec_args, output_name); - strarray_add(spec_args, "--subsystem"); - strarray_add(spec_args, opts->gui_app ? "windows" : "console"); - if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); - } - - if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); - if (entry_point) - { - strarray_add(spec_args, "--entry"); - strarray_add(spec_args, entry_point); - } - - if (opts->subsystem) - { - strarray_add(spec_args, "--subsystem"); - strarray_add(spec_args, opts->subsystem); - } - - for ( j = 0; j < lib_dirs->size; j++ ) - strarray_add(spec_args, strmake("-L%s", lib_dirs->base[j])); - - if (!is_pe) - { - for (j = 0; j < opts->delayimports->size; j++) - strarray_add(spec_args, strmake("-d%s", opts->delayimports->base[j])); - } - - /* add resource files */ - for ( j = 0; j < files->size; j++ ) - if (files->base[j][1] == 'r') strarray_add(spec_args, files->base[j]); - - /* add other files */ - strarray_add(spec_args, "--"); - for ( j = 0; j < files->size; j++ ) - { - switch(files->base[j][1]) - { - case 'd': - case 'a': - case 'o': - strarray_add(spec_args, files->base[j] + 2); - break; - } - } - - spawn(opts->prefix, spec_args, 0); - strarray_free (spec_args); if (fake_module) return; /* nothing else to do */ /* link everything together now */

1 0

Alexandre Julliard : winegcc: Don't build the .spec.o file for native Unix libraries.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 6688367046fd0a7446baaf623b2a6b8329b27059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6688367046fd0a7446baaf62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 11:59:26 2021 +0200 winegcc: Don't build the .spec.o file for native Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b756c5a97f8..8e77648ac10 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1220,7 +1220,7 @@ static void build(struct options* opts) strarray *lib_dirs, *files; strarray *link_args, *implib_args, *tool; char *output_file, *output_path; - const char *spec_o_name, *libgcc = NULL; + const char *spec_o_name = NULL, *libgcc = NULL; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; @@ -1382,7 +1382,8 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); + if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native"))) + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (fake_module) return; /* nothing else to do */ @@ -1414,7 +1415,7 @@ static void build(struct options* opts) entry_point)); } - strarray_add(link_args, spec_o_name); + if (spec_o_name) strarray_add(link_args, spec_o_name); if (is_pe) {

1 0

Alexandre Julliard : ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: d7add3821898b6f002c3df969f1198b30fcfc8c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7add3821898b6f002c3df96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:07:15 2021 +0200 ntdll: Make __wine_unix_call() WINAPI to follow syscall conventions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 2 +- include/winternl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5ac5a16ed44..36d997d1762 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1625,7 +1625,7 @@ @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) # Unix interface -@ cdecl -syscall __wine_unix_call(int64 long ptr) +@ stdcall -syscall __wine_unix_call(int64 long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ stdcall __wine_ctrl_routine(ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f1a2b9f5a79..7d9635db535 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr /*********************************************************************** * __wine_unix_call */ -NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); } diff --git a/include/winternl.h b/include/winternl.h index 562a35a83a1..523e65007ed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4617,7 +4617,7 @@ typedef UINT64 unixlib_handle_t; /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); -extern NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Alexandre Julliard : ntdll: Avoid CDECL on internal functions.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 2941e5185535781b58bbe5c2b63393a132c30098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2941e5185535781b58bbe5c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:07:29 2021 +0200 ntdll: Avoid CDECL on internal functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 372447eb8af..a252e25fbc6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -381,7 +381,7 @@ static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), +static int mmap_enum_reserved_areas( int (*enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ) { int ret = 0; @@ -1451,7 +1451,7 @@ struct area_boundary * in the specified region. If no boundaries are found, result is NULL. * virtual_mutex must be held by caller. */ -static int CDECL get_area_boundary_callback( void *start, SIZE_T size, void *arg ) +static int get_area_boundary_callback( void *start, SIZE_T size, void *arg ) { struct area_boundary *area = arg; void *end = (char *)start + size; @@ -1818,7 +1818,7 @@ struct alloc_area * * Try to map some space inside a reserved area. Callback for mmap_enum_reserved_areas. */ -static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) +static int alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) { struct alloc_area *alloc = arg; void *end = (char *)start + size; @@ -2633,7 +2633,7 @@ struct alloc_virtual_heap }; /* callback for mmap_enum_reserved_areas to allocate space for the virtual heap */ -static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) +static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) { struct alloc_virtual_heap *alloc = arg; void *end = (char *)base + size; @@ -3668,7 +3668,7 @@ struct free_range }; /* free reserved areas above the limit; callback for mmap_enum_reserved_areas */ -static int CDECL free_reserved_memory( void *base, SIZE_T size, void *arg ) +static int free_reserved_memory( void *base, SIZE_T size, void *arg ) { struct free_range *range = arg; @@ -4048,7 +4048,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* retrieve state for a free memory area; callback for mmap_enum_reserved_areas */ -static int CDECL get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) +static int get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) { MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size;

1 0

Nikolay Sivov : d3dx9: Implement getting/setting line width.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: ebb99bde64f8a134466f45547d82ff974524ee47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb99bde64f8a134466f4554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 11:54:05 2021 +0300 d3dx9: Implement getting/setting line width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/line.c | 19 +++++++++++++++---- dlls/d3dx9_36/tests/line.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 7b2e3b5428f..647eb1b5b2a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ struct d3dx9_line IDirect3DDevice9 *device; IDirect3DStateBlock9 *state; + float width; }; static inline struct d3dx9_line *impl_from_ID3DXLine(ID3DXLine *iface) @@ -192,16 +193,25 @@ static float WINAPI d3dx9_line_GetPatternScale(ID3DXLine *iface) static HRESULT WINAPI d3dx9_line_SetWidth(ID3DXLine *iface, float width) { - FIXME("iface %p, width %.8e stub!\n", iface, width); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e.\n", iface, width); + + if (width <= 0.0f) + return D3DERR_INVALIDCALL; + + line->width = width; + + return D3D_OK; } static float WINAPI d3dx9_line_GetWidth(ID3DXLine *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return 1.0f; + TRACE("iface %p.\n", iface); + + return line->width; } static HRESULT WINAPI d3dx9_line_SetAntialias(ID3DXLine *iface, BOOL antialias) @@ -306,6 +316,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object->ref = 1; object->device = device; IDirect3DDevice9_AddRef(device); + object->width = 1.0f; *line = &object->ID3DXLine_iface; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index ae8d07e0623..d89ae160ba5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -115,6 +115,38 @@ static void test_create_line(IDirect3DDevice9* device) ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } +static void test_line_width(IDirect3DDevice9* device) +{ + ID3DXLine *line = NULL; + ULONG refcount; + float width; + HRESULT hr; + + hr = D3DXCreateLine(device, &line); + ok(hr == D3D_OK, "Failed to create a line, hr %#x.\n", hr); + + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 0.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, -1.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 10.0f); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 10.0f, "Unexpected line width %.8e.\n", width); + + refcount = ID3DXLine_Release(line); + ok(!refcount, "Got %u references to line.\n", refcount); +} + START_TEST(line) { HWND wnd; @@ -148,6 +180,7 @@ START_TEST(line) } test_create_line(device); + test_line_width(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Nikolay Sivov : d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory().
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: fa20ac430bf613cbc119c52f034b44044f25a93f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa20ac430bf613cbc119c52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 13:57:29 2021 +0300 d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 595 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 595 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa20ac430bf613cbc119…

1 0

Rémi Bernon : xinput1_3/tests: Add some HID report tests.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 7a571127e4fb5e3eba3f382446f4a82ef5728b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a571127e4fb5e3eba3f3824… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:22:16 2021 +0200 xinput1_3/tests: Add some HID report tests. This adds tests to validate the bogus HID devices exposed native XInput driver. Interactive tests are also included to validate the HID report values, and more specifically the weird combined triggers, which is currently not implemented correctly in Wine. Some third-party libraries, such as SDL, are known to rely on this bogus HID devices and hardcode the expected report structure. This has been tested on Windows 10 with XBox 360 controllers as well as Xbox One S controllers. The latter are detected as 045e:02ea on Linux, but as 045e:02ff on Windows for some reason, and their descriptor seems a little bit different. Their exposed HID device also doesn't seem to work at all and ReadFile never succeeds, so the interactive tests are skipped for these devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/Makefile.in | 2 +- dlls/xinput1_3/tests/xinput.c | 516 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 517 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a571127e4fb5e3eba3f…

1 0

Rémi Bernon : xinput1_3: Create a new background update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 40cb5510aea7f829b34daf66aee9bb8ec3f2620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=40cb5510aea7f829b34daf66… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:22 2021 +0200 xinput1_3: Create a new background update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index ae2670ba306..63f125ae528 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -119,6 +119,8 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = }; static DWORD last_check = 0; +static HANDLE stop_event; +static HANDLE done_event; static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { @@ -294,8 +296,12 @@ failed: return FALSE; } +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); + static void HID_find_gamepads(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -308,6 +314,8 @@ static void HID_find_gamepads(void) GUID guid; int i; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); + idx = GetTickCount(); if ((idx - last_check) < 2000) return; @@ -383,9 +391,16 @@ static void controller_destroy(struct xinput_controller *controller) LeaveCriticalSection(&controller->crit); } -static void HID_destroy_gamepads(void) +static void stop_update_thread(void) { int i; + + SetEvent(stop_event); + WaitForSingleObject(done_event, INFINITE); + + CloseHandle(stop_event); + CloseHandle(done_event); + for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i]); } @@ -523,6 +538,40 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE memcpy(state, &controller->state, sizeof(*state)); } +static DWORD WINAPI hid_update_thread_proc(void *param) +{ + HANDLE events[1]; + DWORD count, ret; + + do + { + count = 0; + events[count++] = stop_event; + } + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + + if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); + SetEvent(done_event); + return ret; +} + +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread; + + stop_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!stop_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + done_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!done_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, hid_update_thread_proc, NULL, 0, NULL); + if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); + CloseHandle(thread); + + return TRUE; +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -552,7 +601,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(); + stop_update_thread(); break; } return TRUE;

1 0

Rémi Bernon : xinput1_3: Update the controller list in the update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 8bf147b99096c0a940b55ccc42e05f36c39a6fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf147b99096c0a940b55ccc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:23 2021 +0200 xinput1_3: Update the controller list in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 63f125ae528..45ccb5f79db 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -118,7 +118,6 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, }; -static DWORD last_check = 0; static HANDLE stop_event; static HANDLE done_event; @@ -296,12 +295,8 @@ failed: return FALSE; } -static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); - -static void HID_find_gamepads(void) +static void update_controller_list(void) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -314,20 +309,6 @@ static void HID_find_gamepads(void) GUID guid; int i; - InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); - - idx = GetTickCount(); - if ((idx - last_check) < 2000) return; - - EnterCriticalSection(&xinput_crit); - - if ((idx - last_check) < 2000) - { - LeaveCriticalSection(&xinput_crit); - return; - } - last_check = idx; - HidD_GetHidGuid(&guid); set = SetupDiGetClassDevsW(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); @@ -368,7 +349,6 @@ static void HID_find_gamepads(void) } SetupDiDestroyDeviceInfoList(set); - LeaveCriticalSection(&xinput_crit); } static void controller_destroy(struct xinput_controller *controller) @@ -541,14 +521,18 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE static DWORD WINAPI hid_update_thread_proc(void *param) { HANDLE events[1]; - DWORD count, ret; + DWORD count, ret = WAIT_TIMEOUT; do { + EnterCriticalSection(&xinput_crit); + if (ret == WAIT_TIMEOUT) update_controller_list(); + count = 0; events[count++] = stop_event; + LeaveCriticalSection(&xinput_crit); } - while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, 2000, TRUE )) < count - 1 || ret == WAIT_TIMEOUT); if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); SetEvent(done_event); @@ -569,9 +553,20 @@ static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); CloseHandle(thread); + /* do it once now, to resolve delayed imports and populate the initial list */ + EnterCriticalSection(&xinput_crit); + update_controller_list(); + LeaveCriticalSection(&xinput_crit); + return TRUE; } +static void start_update_thread(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -617,7 +612,7 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - HID_find_gamepads(); + start_update_thread(); for (index = 0; index < XUSER_MAX_COUNT; index++) { @@ -634,7 +629,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION *vib TRACE("(index %u, vibration %p)\n", index, vibration); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -652,7 +647,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) { if (!state) return ERROR_BAD_ARGUMENTS; - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -908,7 +903,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X { TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;

1 0

Rémi Bernon : xinput1_3: Read the controller state in the update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 43f0c8096b2d81052a30d8542372adc46dab8292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f0c8096b2d81052a30d854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:24 2021 +0200 xinput1_3: Read the controller state in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 235 +++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f0c8096b2d81052a30…

1 0