November 2022 - Wine-commits

Matteo Bruni : wined3d: Destroy primary GL context if initialization fails.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: ee349306e29309e629acd5e441374c369c489a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee349306e29309e629acd5e441374c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 25 20:00:33 2022 +0100 wined3d: Destroy primary GL context if initialization fails. --- dlls/wined3d/device.c | 7 +++++-- dlls/wined3d/swapchain.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d2d9a61552..5e64cf9487c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1256,10 +1256,13 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) return; } + context_gl = wined3d_context_gl(context); + if (!wined3d_allocator_init(&device_gl->allocator, ARRAY_SIZE(gl_memory_types), &wined3d_allocator_gl_ops)) { WARN("Failed to initialise allocator.\n"); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } @@ -1269,6 +1272,7 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) ERR("Failed to allocate shader private data, hr %#x.\n", hr); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } @@ -1278,11 +1282,10 @@ void wined3d_device_gl_create_primary_opengl_context_cs(void *object) device->shader_backend->shader_free_private(device, NULL); wined3d_allocator_cleanup(&device_gl->allocator); context_release(context); + wined3d_swapchain_gl_context_destroy(wined3d_swapchain_gl(swapchain), context_gl); return; } - context_gl = wined3d_context_gl(context); - wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 79ee427572f..0fd082fac7b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1804,6 +1804,25 @@ static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct win return context_gl; } +void wined3d_swapchain_gl_context_destroy(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_context_gl *context_gl) +{ + unsigned int i, j; + + TRACE("swapchain_gl %p, context_gl %p.\n", swapchain_gl, context_gl); + + for (i = 0; i < swapchain_gl->context_count; ++i) + { + if (swapchain_gl->contexts[i] == context_gl) + { + wined3d_context_gl_destroy(swapchain_gl->contexts[i]); + for (j = i; j < --swapchain_gl->context_count; ++j) + swapchain_gl->contexts[j] = swapchain_gl->contexts[j + 1]; + return; + } + } + ERR("context_gl %p not found in the swapchain list.\n", context_gl); +} + void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) { unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47904390ed3..20194887b7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5720,6 +5720,8 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +void wined3d_swapchain_gl_context_destroy(struct wined3d_swapchain_gl *swapchain_gl, + struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl,

1 0

Rémi Bernon : joy.cpl: Draw dinput button state with gdi32.
by Alexandre Julliard 30 Nov '22

30 Nov '22

1 0

Rémi Bernon : joy.cpl: Draw dinput axes state with gdi32.
by Alexandre Julliard 30 Nov '22

30 Nov '22

1 0

Rémi Bernon : joy.cpl: Move dinput test tab logic to dinput.c.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 9d80a0ee790adbbd4bcc9997bbb23aa86e0a1c06 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d80a0ee790adbbd4bcc9997bbb23a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 29 21:20:41 2022 +0100 joy.cpl: Move dinput test tab logic to dinput.c. --- dlls/joy.cpl/dinput.c | 514 +++++++++++++++++++++++++++++++++++++++++++-- dlls/joy.cpl/joy_private.h | 2 +- dlls/joy.cpl/main.c | 496 +------------------------------------------ 3 files changed, 494 insertions(+), 518 deletions(-)

1 0

Rémi Bernon : joy.cpl: Remove unnecessary JoystickData structure.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 140456a05834999ee2fd612e2aef8d52386ea562 URL: https://gitlab.winehq.org/wine/wine/-/commit/140456a05834999ee2fd612e2aef8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 29 21:41:21 2022 +0100 joy.cpl: Remove unnecessary JoystickData structure. --- dlls/joy.cpl/main.c | 57 ++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 8e8d167068e..28334ec6f99 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -44,11 +44,6 @@ struct device IDirectInputDevice8W *device; }; -struct JoystickData -{ - IDirectInput8W *di; -}; - static HMODULE hcpl; static CRITICAL_SECTION joy_cs; @@ -81,12 +76,12 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) static BOOL CALLBACK enum_devices( const DIDEVICEINSTANCEW *instance, void *context ) { DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; - struct JoystickData *data = context; + IDirectInput8W *dinput = context; struct device *entry; if (!(entry = calloc( 1, sizeof(*entry) ))) return DIENUM_STOP; - IDirectInput8_CreateDevice( data->di, &instance->guidInstance, &entry->device, NULL ); + IDirectInput8_CreateDevice( dinput, &instance->guidInstance, &entry->device, NULL ); IDirectInputDevice8_SetDataFormat( entry->device, &c_dfDIJoystick ); IDirectInputDevice8_GetCapabilities( entry->device, &caps ); @@ -170,8 +165,9 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) if (appkey) RegCloseKey(appkey); } -static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) +static void refresh_joystick_list( HWND hwnd ) { + IDirectInput8W *dinput; struct device *entry; HKEY hkey, appkey; DWORD values = 0; @@ -180,7 +176,9 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) clear_devices(); - IDirectInput8_EnumDevices( data->di, DI8DEVCLASS_GAMECTRL, enum_devices, data, DIEDFL_ATTACHEDONLY ); + DirectInput8Create( GetModuleHandleW( NULL ), DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); + IDirectInput8_EnumDevices( dinput, DI8DEVCLASS_GAMECTRL, enum_devices, dinput, DIEDFL_ATTACHEDONLY ); + IDirectInput8_Release( dinput ); SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -247,7 +245,6 @@ static void override_joystick(WCHAR *joy_name, BOOL override) static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { WCHAR instance_name[MAX_PATH] = {0}; - static struct JoystickData *data; int sel; TRACE("(%p, 0x%08x/%d, 0x%Ix)\n", hwnd, msg, msg, lparam); @@ -255,9 +252,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case WM_INITDIALOG: { - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); @@ -281,7 +276,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (instance_name[0]) { enable_joystick(instance_name, FALSE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -294,7 +289,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (instance_name[0]) { enable_joystick(instance_name, TRUE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -305,7 +300,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_GETTEXT, sel, (LPARAM)instance_name); override_joystick(instance_name, FALSE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -316,7 +311,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { SendDlgItemMessageW(hwnd, IDC_XINPUTLIST, LB_GETTEXT, sel, (LPARAM)instance_name); override_joystick(instance_name, TRUE); - refresh_joystick_list(hwnd, data); + refresh_joystick_list( hwnd ); } } break; @@ -375,7 +370,7 @@ static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam) return 0; } -static void display_cpl_sheets( HWND parent, struct JoystickData *data ) +static void display_cpl_sheets( HWND parent ) { INITCOMMONCONTROLSEX init = { @@ -389,14 +384,12 @@ static void display_cpl_sheets( HWND parent, struct JoystickData *data ) .hInstance = hcpl, .pszTemplate = MAKEINTRESOURCEW( IDD_LIST ), .pfnDlgProc = list_dlgproc, - .lParam = (INT_PTR)data, }, { .dwSize = sizeof(PROPSHEETPAGEW), .hInstance = hcpl, .pszTemplate = MAKEINTRESOURCEW( IDD_TEST_DI ), .pfnDlgProc = test_di_dialog_proc, - .lParam = (INT_PTR)data, }, { .dwSize = sizeof(PROPSHEETPAGEW), @@ -499,30 +492,14 @@ static void unregister_window_class(void) */ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { - static struct JoystickData data; TRACE("(%p, %u, 0x%Ix, 0x%Ix)\n", hwnd, command, lParam1, lParam2); switch (command) { case CPL_INIT: - { - HRESULT hr; - register_window_class(); - - /* Initialize dinput */ - hr = DirectInput8Create(GetModuleHandleW(NULL), DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void**)&data.di, NULL); - - if (FAILED(hr)) - { - ERR("Failed to initialize DirectInput: 0x%08lx\n", hr); - return FALSE; - } - - IDirectInput8_EnumDevices( data.di, DI8DEVCLASS_GAMECTRL, enum_devices, &data, DIEDFL_ATTACHEDONLY ); - return TRUE; - } + case CPL_GETCOUNT: return 1; @@ -538,15 +515,11 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) } case CPL_DBLCLK: - display_cpl_sheets(hwnd, &data); + display_cpl_sheets( hwnd ); break; case CPL_STOP: clear_devices(); - - /* And destroy dinput too */ - IDirectInput8_Release(data.di); - unregister_window_class(); break; }

1 0

Zhiyi Zhang : winex11.drv: Release window data before calling sync_window_cursor().
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: e5c6f915bbd7290641ea43fb41429317bc7e7a80 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c6f915bbd7290641ea43fb414293… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 30 12:28:10 2022 +0800 winex11.drv: Release window data before calling sync_window_cursor(). This prevents a deadlock between the window data lock and the ntdll loader lock because sync_window_cursor() eventually may grab the ntdll loader lock. So if another thread already grabbed the ntdll loader lock and wants to enter the same window data critical section, it will deadlock. Fix Youropa (SteamID: 640120) OpenGL launch option launching to a black screen. --- dlls/winex11.drv/mouse.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index ebc8be643af..d1ade2eda68 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -644,6 +644,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; + Window win = 0; input->type = INPUT_MOUSE; @@ -665,13 +666,14 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU } if (!(data = get_win_data( hwnd ))) return; + win = data->whole_window; + release_win_data( data ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) { - sync_window_cursor( data->whole_window ); + sync_window_cursor( win ); last_cursor_change = input->u.mi.time; } - release_win_data( data ); if (hwnd != NtUserGetDesktopWindow()) {

1 0

Nikolay Sivov : d3dcompiler: Implement D3DDisassemble() using vkd3d-shader.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 7bf58c895c3145187bbc6dcbe4e0e14d11457a39 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bf58c895c3145187bbc6dcbe4e0e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 09:20:14 2022 +0300 d3dcompiler: Implement D3DDisassemble() using vkd3d-shader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46649 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 74 +++++++++++++++++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/asm.c | 6 ++-- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 174fbc98280..8fb38cf592c 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -596,11 +596,79 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename return preprocess_shader(data, size, filename, defines, include, shader, error_messages); } -HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, + ID3DBlob **disassembly) { - FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n", + struct vkd3d_shader_compile_info compile_info; + enum vkd3d_shader_source_type source_type; + struct vkd3d_shader_code asm_code; + const char *ptr = data; + char *messages; + HRESULT hr; + int ret; + + TRACE("data %p, size %Iu, flags %#x, comments %p, disassembly %p.\n", data, size, flags, comments, disassembly); - return E_NOTIMPL; + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (comments) + FIXME("Ignoring comments %s.\n", debugstr_a(comments)); + +#if D3D_COMPILER_VERSION >= 46 + if (!size) + return E_INVALIDARG; +#endif + + if (size >= 4 && read_u32(&ptr) == TAG_DXBC) + source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + else + source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = NULL; + compile_info.source.code = data; + compile_info.source.size = size; + compile_info.source_type = source_type; + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_ASM; + compile_info.options = NULL; + compile_info.option_count = 0; + compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.source_name = NULL; + + ret = vkd3d_shader_compile(&compile_info, &asm_code, &messages); + + if (ret) + ERR("Failed to disassemble shader, vkd3d result %d.\n", ret); + + if (messages) + { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + + vkd3d_shader_free_messages(messages); + } + + if (ret) + return hresult_from_vkd3d_result(ret); + + if (SUCCEEDED(hr = D3DCreateBlob(asm_code.size, disassembly))) + memcpy(ID3D10Blob_GetBufferPointer(*disassembly), asm_code.code, asm_code.size); + + vkd3d_shader_free_shader_code(&asm_code); + + return hr; } HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index df686b9378c..6c22eae66c8 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1749,7 +1749,6 @@ static void test_disassemble_shader(void) HRESULT hr; hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); - todo_wine #if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); #else @@ -1757,9 +1756,8 @@ static void test_disassemble_shader(void) #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ID3D10Blob_Release(blob); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ID3D10Blob_Release(blob); } START_TEST(asm)

1 0

Rémi Bernon : joy.cpl: Add a checkbox to test xinput rumble.
by Alexandre Julliard 30 Nov '22

30 Nov '22

1 0

Rémi Bernon : joy.cpl: Add a new xinput controller test tab.
by Alexandre Julliard 30 Nov '22

30 Nov '22

1 0

Rémi Bernon : joy.cpl: Draw xinput controller state with gdi32.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 3bc30c372378f27864d35e7681de59ce046ef81f URL: https://gitlab.winehq.org/wine/wine/-/commit/3bc30c372378f27864d35e7681de59… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 15:31:11 2022 +0100 joy.cpl: Draw xinput controller state with gdi32. --- dlls/joy.cpl/Makefile.in | 2 +- dlls/joy.cpl/joy_private.h | 1 + dlls/joy.cpl/main.c | 19 ++++ dlls/joy.cpl/xinput.c | 238 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 258 insertions(+), 2 deletions(-)

1 0