wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Arkadiusz Hiler : msvcrt: Make UCRT _beginthread[ex]() hold the DLL reference.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 7435ca85453079283da43d716fac48aa1bf5ca3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7435ca85453079283da43d71… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:12 2021 +0300 msvcrt: Make UCRT _beginthread[ex]() hold the DLL reference. MSVCRT's _beginthread[ex]() doesn't exhibit the same behavior and using ThreadExit() does leak the reference. FreeLibraryAndExit() has to be used because the DLL may be the only user of the given CRT. This fixes Baldur's Gate 3 crashing shortly after launch. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/thread.c | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 669d8c29a98..ad366a74d86 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -168,6 +168,7 @@ struct __thread_data { void *unk10[100]; #if _MSVCR_VER >= 140 _invalid_parameter_handler invalid_parameter_handler; + HMODULE module; #endif }; diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index d342d57d38c..01500d93d91 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -54,6 +54,9 @@ thread_data_t *CDECL msvcrt_get_thread_data(void) ptr->random_seed = 1; ptr->locinfo = MSVCRT_locale->locinfo; ptr->mbcinfo = MSVCRT_locale->mbcinfo; +#if _MSVCR_VER >= 140 + ptr->module = NULL; +#endif } SetLastError( err ); return ptr; @@ -76,8 +79,7 @@ void CDECL _endthread(void) } else WARN("tls=%p tls->handle=%p\n", tls, tls ? tls->handle : INVALID_HANDLE_VALUE); - /* FIXME */ - ExitThread(0); + _endthreadex(0); } /********************************************************************* @@ -88,7 +90,17 @@ void CDECL _endthreadex( { TRACE("(%d)\n", retval); - /* FIXME */ +#if _MSVCR_VER >= 140 + { + thread_data_t *tls = TlsGetValue(msvcrt_tls_index); + + if (tls && tls->module != NULL) + FreeLibraryAndExitThread(tls->module, retval); + else + WARN("tls=%p tls->module=%p\n", tls, tls ? tls->module : NULL); + } +#endif + ExitThread(retval); } @@ -104,6 +116,15 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) data->handle = local_trampoline.thread; free(arg); +#if _MSVCR_VER >= 140 + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)local_trampoline.start_address, &data->module)) + { + data->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } +#endif + local_trampoline.start_address(local_trampoline.arglist); _endthread(); } @@ -163,6 +184,18 @@ static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg) data->handle = local_trampoline.thread; free(arg); +#if _MSVCR_VER >= 140 + { + thread_data_t *data = msvcrt_get_thread_data(); + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (void*)local_trampoline.start_address_ex, &data->module)) + { + data->module = NULL; + WARN("failed to get module for the start_address: %d\n", GetLastError()); + } + } +#endif + retval = local_trampoline.start_address_ex(local_trampoline.arglist); _endthreadex(retval); }

1 0

Arkadiusz Hiler : msvcrt: Use trampoline for _beginthreadex().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 9e2fb411dbe5e1bea3e6349fbb14e5346fb5b922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e2fb411dbe5e1bea3e6349f… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:11 2021 +0300 msvcrt: Use trampoline for _beginthreadex(). This way we can call _endthreadex() at the end as stated in the documentation. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 8bf8d9327c1..d342d57d38c 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -27,7 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); typedef struct { HANDLE thread; - _beginthread_start_routine_t start_address; + union { + _beginthread_start_routine_t start_address; + _beginthreadex_start_routine_t start_address_ex; + }; void *arglist; } _beginthread_trampoline_t; @@ -147,6 +150,22 @@ uintptr_t CDECL _beginthread( return (uintptr_t)thread; } +/********************************************************************* + * _beginthreadex_trampoline + */ +static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg) +{ + unsigned int retval; + _beginthread_trampoline_t local_trampoline; + thread_data_t *data = msvcrt_get_thread_data(); + + memcpy(&local_trampoline, arg, sizeof(local_trampoline)); + data->handle = local_trampoline.thread; + free(arg); + + retval = local_trampoline.start_address_ex(local_trampoline.arglist); + _endthreadex(retval); +} /********************************************************************* * _beginthreadex (MSVCRT.@) */ @@ -158,12 +177,30 @@ uintptr_t CDECL _beginthreadex( unsigned int initflag, /* [in] Initial state of new thread (0 for running or CREATE_SUSPEND for suspended) */ unsigned int *thrdaddr) /* [out] Points to a 32-bit variable that receives the thread identifier */ { + _beginthread_trampoline_t* trampoline; + HANDLE thread; + TRACE("(%p, %d, %p, %p, %d, %p)\n", security, stack_size, start_address, arglist, initflag, thrdaddr); - /* FIXME */ - return (uintptr_t)CreateThread(security, stack_size, - start_address, arglist, - initflag, thrdaddr); + /* FIXME: may use different errno / return values */ + if (!MSVCRT_CHECK_PMT(start_address)) return 0; + + if (!(trampoline = malloc(sizeof(*trampoline)))) + return 0; + + trampoline->thread = INVALID_HANDLE_VALUE; + trampoline->start_address_ex = start_address; + trampoline->arglist = arglist; + + thread = CreateThread(security, stack_size, _beginthreadex_trampoline, + trampoline, initflag, thrdaddr); + if(!thread) { + free(trampoline); + msvcrt_set_errno(GetLastError()); + return 0; + } + + return (uintptr_t)thread; } #if _MSVCR_VER>=80

1 0

Arkadiusz Hiler : msvcrt: Make _beginthread() error out as documented.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 80678c4395db059ba28eb330bf59dc1ae433880d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80678c4395db059ba28eb330… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:10 2021 +0300 msvcrt: Make _beginthread() error out as documented. msvcrt_set_errno() seems to be doing the right thing in case of too many threads, invalid parameters, etc. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index c2fc863dd33..8bf8d9327c1 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -118,6 +118,8 @@ uintptr_t CDECL _beginthread( TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); + if (!MSVCRT_CHECK_PMT(start_address)) return -1; + trampoline = malloc(sizeof(*trampoline)); if(!trampoline) { *_errno() = EAGAIN; @@ -128,7 +130,7 @@ uintptr_t CDECL _beginthread( trampoline, CREATE_SUSPENDED, NULL); if(!thread) { free(trampoline); - *_errno() = EAGAIN; + msvcrt_set_errno(GetLastError()); return -1; }

1 0

Rémi Bernon : hidclass.sys: Call IoInvalidateDeviceRelations before IoSetDevicePropertyData.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: af2b2d0433dd1a591fe574945699f32d467cd4b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af2b2d0433dd1a591fe57494… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:51:54 2021 +0200 hidclass.sys: Call IoInvalidateDeviceRelations before IoSetDevicePropertyData. Otherwise setupapi may fail to find the device on which to set the property. This triggers messages like the following the first time a device is created (on prefix creation for mouse and keyboard devices): IoSetDevicePropertyData Failed to open device, error 0xe000020b. Some IoSetDevicePropertyData implementation detail makes it always return successfully but it's not doing anything and user32 will then ignore the device when it enumerates rawinput devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 2769b78c13b..4490f1eba23 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -245,6 +245,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) else pdo_ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); + IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); + if ((status = IoSetDevicePropertyData(child_pdo, &DEVPROPKEY_HID_HANDLE, LOCALE_NEUTRAL, PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) @@ -254,8 +256,6 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) return; } - IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); - pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL; pdo_ext->u.pdo.ring_buffer = RingBuffer_Create(

1 0

Zhiyi Zhang : bcrypt: Fix a compiler warning on Mac.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: caa5f68e41f29705e6fd69e7540427a3a7d8febb URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa5f68e41f29705e6fd69e7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 5 23:37:54 2021 +0800 bcrypt: Fix a compiler warning on Mac. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/macos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 44906519cef..20e1a61e3fb 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -272,7 +272,7 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key } static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, - UCHAR *output, ULONG *output_len ) + UCHAR *output, ULONG output_len, ULONG *ret_len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED;

1 0

Paul Gofman : gamingtcui: Add stub for ShowProfileCardUI().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 8a7dc45476a1a30c0a00d47dd5c9b82329f200de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a7dc45476a1a30c0a00d47d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 5 18:14:22 2021 +0300 gamingtcui: Add stub for ShowProfileCardUI(). Based on a patch by Myah Caron. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-gaming-tcui-l1-1-0.spec | 2 +- dlls/gamingtcui/gamingtcui.spec | 2 +- dlls/gamingtcui/gamingtcui_main.c | 11 +++++++++++ include/gamingtcui.h | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec index b019595c502..d7fa8a12e75 100644 --- a/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec +++ b/dlls/api-ms-win-gaming-tcui-l1-1-0/api-ms-win-gaming-tcui-l1-1-0.spec @@ -2,6 +2,6 @@ @ stub ShowChangeFriendRelationshipUI @ stub ShowGameInviteUI @ stdcall ShowPlayerPickerUI(ptr ptr long ptr long long long ptr ptr) gamingtcui.ShowPlayerPickerUI -@ stub ShowProfileCardUI +@ stdcall ShowProfileCardUI(ptr ptr ptr) gamingtcui.ShowProfileCardUI @ stub ShowTitleAchievementsUI @ stub TryCancelPendingGameUI diff --git a/dlls/gamingtcui/gamingtcui.spec b/dlls/gamingtcui/gamingtcui.spec index 32c8496f657..a0c2d52ad74 100644 --- a/dlls/gamingtcui/gamingtcui.spec +++ b/dlls/gamingtcui/gamingtcui.spec @@ -17,7 +17,7 @@ @ stub ShowGameInviteUIWithContextForUser @ stdcall ShowPlayerPickerUI(ptr ptr long ptr long long long ptr ptr) @ stub ShowPlayerPickerUIForUser -@ stub ShowProfileCardUI +@ stdcall ShowProfileCardUI(ptr ptr ptr) @ stub ShowProfileCardUIForUser @ stub ShowTitleAchievementsUI @ stub ShowTitleAchievementsUIForUser diff --git a/dlls/gamingtcui/gamingtcui_main.c b/dlls/gamingtcui/gamingtcui_main.c index a3e2855a0f8..555b6d781d3 100644 --- a/dlls/gamingtcui/gamingtcui_main.c +++ b/dlls/gamingtcui/gamingtcui_main.c @@ -48,3 +48,14 @@ HRESULT WINAPI ShowPlayerPickerUI(HSTRING prompt_display_text, const HSTRING *xu return S_OK; } + +HRESULT WINAPI ShowProfileCardUI(HSTRING target_user_xuid, GameUICompletionRoutine completion_routine, void *context) +{ + FIXME("target_user_xuid %p, completion_routine %p, context %p stub.\n", + target_user_xuid, completion_routine, context); + + if (completion_routine) + completion_routine(S_OK, context); + + return S_OK; +} diff --git a/include/gamingtcui.h b/include/gamingtcui.h index 99e8d85b2e8..87aa5f5efa1 100644 --- a/include/gamingtcui.h +++ b/include/gamingtcui.h @@ -28,6 +28,7 @@ extern "C" { #endif +typedef void (WINAPI *GameUICompletionRoutine)(HRESULT return_code, void *context); typedef void (WINAPI *PlayerPickerUICompletionRoutine)(HRESULT return_code, void *context, const HSTRING *selected_xuids, size_t count); @@ -35,6 +36,7 @@ HRESULT WINAPI ProcessPendingGameUI(BOOL wait_for_completion); HRESULT WINAPI ShowPlayerPickerUI(HSTRING prompt_display_text, const HSTRING *xuids, size_t xuid_count, const HSTRING *preselected_xuids, size_t preselected_xuid_count, size_t min_selection_count, size_t max_selection_count, PlayerPickerUICompletionRoutine completion_routine, void *context); +HRESULT WINAPI ShowProfileCardUI(HSTRING target_user_xuid, GameUICompletionRoutine completion_routine, void *context); #ifdef __cplusplus }

1 0

Henri Verbeet : wined3d: Implement Vulkan NULL 1D array image shader resource view descriptors.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 6eaf494facc92637df72ef06ac0fd94f20a9a1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eaf494facc92637df72ef06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 16:38:50 2021 +0200 wined3d: Implement Vulkan NULL 1D array image shader resource view descriptors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 83b1d081514..43b806a19b5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2620,6 +2620,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_cube, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_1d_array, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fdde0a88cab..8f9ca725fd5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -778,6 +778,16 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_1d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 1D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d.imageView)); + view_desc.viewType = VK_IMAGE_VIEW_TYPE_1D_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_1d_array.imageView))) < 0) + { + ERR("Failed to create 1D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_1d_array.sampler = VK_NULL_HANDLE; + v->vk_info_1d_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 1D array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d_array.imageView)); + view_desc.image = r->image_2d.vk_image; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d.imageView))) < 0) @@ -858,6 +868,8 @@ fail: VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); if (v->vk_info_2d.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d.imageView, NULL)); + if (v->vk_info_1d_array.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_1d_array.imageView, NULL)); if (v->vk_info_1d.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_1d.imageView, NULL)); if (v->vk_view_buffer_float) @@ -877,6 +889,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d.imageView, id); + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_1d_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_1d.imageView, id); wined3d_context_vk_destroy_vk_buffer_view(context_vk, v->vk_view_buffer_float, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ef6e89f1f1..f58841fec73 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3914,6 +3914,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_2dms; VkDescriptorImageInfo vk_info_3d; VkDescriptorImageInfo vk_info_cube; + VkDescriptorImageInfo vk_info_1d_array; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; };

1 0

Henri Verbeet : dxgi: Pass an IWineDXGIFactory pointer to dxgi_get_output_from_window().
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 93077d4b4f7692102aac44c2c2d6da8a11c543cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=93077d4b4f7692102aac44c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 16:38:49 2021 +0200 dxgi: Pass an IWineDXGIFactory pointer to dxgi_get_output_from_window(). Since the factory and adapter interfaces may be wrapped, calling IDXGIAdapter_EnumOutputs() on a wrapped adapter may in turn return a wrapped output interface. Things would go poorly from there, so make sure we have a unwrapped interface here. Alternatively, we could have allowed output interfaces to be wrapped, but tests show that e.g. IDXGISwapChain_SetFullscreenState() fails when passed a wrapped output interface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 11 +++++++++-- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 14 +++++++------- dlls/dxgi/tests/dxgi.c | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 74260f9b769..07773052582 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -428,13 +428,20 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); struct wined3d_swapchain_desc wined3d_desc; struct IDXGIOutput *containing_output; + struct dxgi_factory *dxgi_factory; struct d3d11_swapchain *object; HRESULT hr; TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", iface, factory, window, desc, fullscreen_desc, output, swapchain); - if (FAILED(hr = dxgi_get_output_from_window(factory, window, &containing_output))) + if (!(dxgi_factory = unsafe_impl_from_IDXGIFactory(factory))) + { + WARN("Factory %p is not a valid dxgi factory.\n", factory); + return E_FAIL; + } + + if (FAILED(hr = dxgi_get_output_from_window(&dxgi_factory->IWineDXGIFactory_iface, window, &containing_output))) { WARN("Failed to get output from window %p, hr %#x.\n", window, hr); return hr; @@ -544,7 +551,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l } window = dxgi_factory_get_device_window(dxgi_factory); - if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) + if (FAILED(hr = dxgi_get_output_from_window(&dxgi_factory->IWineDXGIFactory_iface, window, &output))) { ERR("Failed to get output from window %p.\n", window); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 8037b401a7f..34e53af2138 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -96,7 +96,7 @@ void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; -HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) +HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 585be83634c..5b3ca5b5762 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,7 +111,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) +HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) { unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; @@ -126,7 +126,7 @@ HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOut return DXGI_ERROR_INVALID_CALL; } - for (adapter_idx = 0; SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + for (adapter_idx = 0; SUCCEEDED(hr = IWineDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); ++adapter_idx) { for (output_idx = 0; SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, @@ -585,7 +585,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh } window = d3d11_swapchain_get_hwnd(swapchain); - return dxgi_get_output_from_window((IDXGIFactory *)swapchain->factory, window, output); + return dxgi_get_output_from_window(swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -2453,7 +2453,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); IUnknown *device_parent; - IDXGIFactory *factory; + IWineDXGIFactory *factory; IDXGIAdapter *adapter; HRESULT hr; @@ -2473,7 +2473,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh return hr; } - if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory))) + if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IWineDXGIFactory, (void **)&factory))) { WARN("Failed to get factory, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); @@ -2481,7 +2481,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh } hr = dxgi_get_output_from_window(factory, swapchain->window, output); - IDXGIFactory_Release(factory); + IWineDXGIFactory_Release(factory); IDXGIAdapter_Release(adapter); return hr; } @@ -3041,7 +3041,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } - if (FAILED(hr = dxgi_get_output_from_window((IDXGIFactory *)factory, window, &output))) + if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) { WARN("Failed to get output from window %p, hr %#x.\n", window, hr); return hr; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b10a19c3db9..57547f1b540 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5465,8 +5465,8 @@ static void test_object_wrapping(void) hr = IDXGIAdapter_GetDesc(&wrapper.IDXGIAdapter_iface, &desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); - todo_wine ok(!wrapper.factory.wrapped_adapter_count, - "Got unexpected wrapped adapter count %u.\n", wrapper.factory.wrapped_adapter_count); + ok(!wrapper.factory.wrapped_adapter_count, "Got unexpected wrapped adapter count %u.\n", + wrapper.factory.wrapped_adapter_count); ok(!wrapper.wrapped_output_count, "Got unexpected wrapped output count %u.\n", wrapper.wrapped_output_count); refcount = IDXGIAdapter_Release(&wrapper.IDXGIAdapter_iface);

1 0

Henri Verbeet : dxgi: Store an IWineDXGIFactory pointer in struct d3d11_swapchain.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: 55f6cda90ea5fa7d4f170b9e31a216cc606daa5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f6cda90ea5fa7d4f170b9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 16:38:48 2021 +0200 dxgi: Store an IWineDXGIFactory pointer in struct d3d11_swapchain. Like we already do in struct d3d12_swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index acba3544e39..8037b401a7f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -179,7 +179,7 @@ struct d3d11_swapchain struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_state_parent state_parent; IWineDXGIDevice *device; - IDXGIFactory *factory; + IWineDXGIFactory *factory; IDXGIOutput *target; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 82e5fbf811d..585be83634c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -248,7 +248,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) IDXGIOutput_Release(swapchain->target); } if (swapchain->factory) - IDXGIFactory_Release(swapchain->factory); + IWineDXGIFactory_Release(swapchain->factory); wined3d_swapchain_decref(swapchain->wined3d_swapchain); if (device) IWineDXGIDevice_Release(device); @@ -302,7 +302,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetParent(IDXGISwapChain1 *ifac return E_NOINTERFACE; } - return IDXGIFactory_QueryInterface(swapchain->factory, riid, parent); + return IWineDXGIFactory_QueryInterface(swapchain->factory, riid, parent); } /* IDXGIDeviceSubObject methods */ @@ -585,7 +585,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh } window = d3d11_swapchain_get_hwnd(swapchain); - return dxgi_get_output_from_window(swapchain->factory, window, output); + return dxgi_get_output_from_window((IDXGIFactory *)swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -849,8 +849,8 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) return E_INVALIDARG; - if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, &IID_IDXGIFactory, - (void **)&swapchain->factory))) + if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, + &IID_IWineDXGIFactory, (void **)&swapchain->factory))) { WARN("Failed to get adapter parent, hr %#x.\n", hr); return hr; @@ -914,7 +914,7 @@ cleanup: wined3d_private_store_cleanup(&swapchain->private_store); wined3d_mutex_unlock(); if (swapchain->factory) - IDXGIFactory_Release(swapchain->factory); + IWineDXGIFactory_Release(swapchain->factory); if (swapchain->device) IWineDXGIDevice_Release(swapchain->device); return hr;

1 0

Henri Verbeet : dxgi/tests: Test that we don't use objects returned by wrapped interfaces internally.
by Alexandre Julliard 05 May '21

05 May '21

Module: wine Branch: master Commit: add2e8c928c363fdd67bf8ae2a8c22b73835e92e URL: https://source.winehq.org/git/wine.git/?a=commit;h=add2e8c928c363fdd67bf8ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 16:38:47 2021 +0200 dxgi/tests: Test that we don't use objects returned by wrapped interfaces internally. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 879fea94411..b10a19c3db9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5201,10 +5201,132 @@ static void test_output_desc(void) ok(!refcount, "IDXGIFactory has %u references left.\n", refcount); } +struct dxgi_factory +{ + IDXGIFactory IDXGIFactory_iface; + IDXGIFactory *wrapped_iface; + unsigned int wrapped_adapter_count; +}; + +static inline struct dxgi_factory *impl_from_IDXGIFactory(IDXGIFactory *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_factory, IDXGIFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory *iface, REFIID iid, void **out) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + + if (IsEqualGUID(iid, &IID_IDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIObject) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IDXGIFactory_AddRef(iface); + *out = iface; + return S_OK; + } + return IDXGIFactory_QueryInterface(factory->wrapped_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IDXGIFactory *iface) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_AddRef(factory->wrapped_iface); +} + +static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory *iface) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_Release(factory->wrapped_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_SetPrivateData(factory->wrapped_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory *iface, + REFGUID guid, const IUnknown *object) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_SetPrivateDataInterface(factory->wrapped_iface, guid, object); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IDXGIFactory *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_GetPrivateData(factory->wrapped_iface, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IDXGIFactory *iface, REFIID iid, void **parent) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_GetParent(factory->wrapped_iface, iid, parent); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory *iface, + UINT adapter_idx, IDXGIAdapter **adapter) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + HRESULT hr; + + if (SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory->wrapped_iface, adapter_idx, adapter))) + ++factory->wrapped_adapter_count; + return hr; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IDXGIFactory *iface, + HWND window, UINT flags) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_MakeWindowAssociation(factory->wrapped_iface, window, flags); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory *iface, HWND *window) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_GetWindowAssociation(factory->wrapped_iface, window); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory *iface, + IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_CreateSwapChain(factory->wrapped_iface, device, desc, swapchain); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory *iface, + HMODULE swrast, IDXGIAdapter **adapter) +{ + struct dxgi_factory *factory = impl_from_IDXGIFactory(iface); + return IDXGIFactory_CreateSoftwareAdapter(factory->wrapped_iface, swrast, adapter); +} + +static const struct IDXGIFactoryVtbl dxgi_factory_vtbl = +{ + dxgi_factory_QueryInterface, + dxgi_factory_AddRef, + dxgi_factory_Release, + dxgi_factory_SetPrivateData, + dxgi_factory_SetPrivateDataInterface, + dxgi_factory_GetPrivateData, + dxgi_factory_GetParent, + dxgi_factory_EnumAdapters, + dxgi_factory_MakeWindowAssociation, + dxgi_factory_GetWindowAssociation, + dxgi_factory_CreateSwapChain, + dxgi_factory_CreateSoftwareAdapter, +}; + struct dxgi_adapter { IDXGIAdapter IDXGIAdapter_iface; IDXGIAdapter *wrapped_iface; + struct dxgi_factory factory; + unsigned int wrapped_output_count; }; static inline struct dxgi_adapter *impl_from_IDXGIAdapter(IDXGIAdapter *iface) @@ -5263,14 +5385,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REFIID iid, void **parent) { struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); - return IDXGIAdapter_GetParent(adapter->wrapped_iface, iid, parent); + return IDXGIFactory_QueryInterface(&adapter->factory.IDXGIFactory_iface, iid, parent); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter *iface, UINT output_idx, IDXGIOutput **output) { struct dxgi_adapter *adapter = impl_from_IDXGIAdapter(iface); - return IDXGIAdapter_EnumOutputs(adapter->wrapped_iface, output_idx, output); + HRESULT hr; + + if (SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter->wrapped_iface, output_idx, output))) + ++adapter->wrapped_output_count; + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) @@ -5324,6 +5450,10 @@ static void test_object_wrapping(void) wrapper.IDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; wrapper.wrapped_iface = adapter; + wrapper.factory.IDXGIFactory_iface.lpVtbl = &dxgi_factory_vtbl; + wrapper.factory.wrapped_iface = factory; + wrapper.factory.wrapped_adapter_count = 0; + wrapper.wrapped_output_count = 0; hr = D3D10CreateDevice1(&wrapper.IDXGIAdapter_iface, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device); @@ -5335,6 +5465,9 @@ static void test_object_wrapping(void) hr = IDXGIAdapter_GetDesc(&wrapper.IDXGIAdapter_iface, &desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + todo_wine ok(!wrapper.factory.wrapped_adapter_count, + "Got unexpected wrapped adapter count %u.\n", wrapper.factory.wrapped_adapter_count); + ok(!wrapper.wrapped_output_count, "Got unexpected wrapped output count %u.\n", wrapper.wrapped_output_count); refcount = IDXGIAdapter_Release(&wrapper.IDXGIAdapter_iface); ok(!refcount, "Adapter has %u references left.\n", refcount);

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021