May 2021 - Wine-Commits - list.winehq.org

Zhiyi Zhang : bcrypt: Fix a compiler warning on Mac.
by Alexandre Julliard May 5, 2021

May 5, 2021

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

Arkadiusz Hiler : ucrtbase: Add tests for _beginthread[ex]().
by Alexandre Julliard May 5, 2021

May 5, 2021

Module: wine Branch: master Commit: f80ac265e5fbd1b4c0c0c346f0cc232385a8f868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80ac265e5fbd1b4c0c0c346… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 5 13:03:13 2021 +0300 ucrtbase: Add tests for _beginthread[ex](). 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/ucrtbase/tests/Makefile.in | 7 +- dlls/ucrtbase/tests/thread.c | 147 +++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/tests/threaddll.c | 67 +++++++++++++++++ dlls/ucrtbase/tests/threaddll.h | 30 ++++++++ dlls/ucrtbase/tests/threaddll.spec | 3 + 5 files changed, 252 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index 259880a7d90..4df5684290c 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -2,9 +2,12 @@ TESTDLL = ucrtbase.dll IMPORTS = ucrtbase EXTRADEFS = -fno-builtin -C_SRCS = \ +SOURCES = \ cpp.c \ misc.c \ printf.c \ scanf.c \ - string.c + string.c \ + thread.c \ + threaddll.c \ + threaddll.spec diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c new file mode 100644 index 00000000000..01f46029c06 --- /dev/null +++ b/dlls/ucrtbase/tests/thread.c @@ -0,0 +1,147 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <errno.h> +#include <stdarg.h> +#include <process.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +#include "threaddll.h" + +enum beginthread_method +{ + use_beginthread, + use_beginthreadex +}; + +static char *get_thread_dll_path(void) +{ + static char path[MAX_PATH]; + const char dll_name[] = "threaddll.dll"; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathA(ARRAY_SIZE(path), path); + strcat(path, dll_name); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s: %u.\n", + debugstr_a(path), GetLastError()); + + res = FindResourceA(NULL, dll_name, "TESTDLL"); + ok(!!res, "Failed to load resource: %u\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource\n"); + CloseHandle(file); + + return path; +} + +static void set_thead_dll_detach_event(HANDLE dll, HANDLE event) +{ + void WINAPI (*_set_detach_event)(HANDLE event); + _set_detach_event = (void*) GetProcAddress(dll, "set_detach_event"); + ok(_set_detach_event != NULL, "Failed to get set_detach_event: %u\n", GetLastError()); + _set_detach_event(event); +} + +static void test_thread_library_reference(char *thread_dll, + enum beginthread_method beginthread_method, + enum thread_exit_method exit_method) +{ + HANDLE detach_event; + HMODULE dll; + DWORD ret; + uintptr_t thread_handle; + struct threaddll_args args; + + args.exit_method = exit_method; + + detach_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(detach_event != NULL, "Failed to create an event: %u\n", GetLastError()); + args.confirm_running = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(args.confirm_running != NULL, "Failed to create an event: %u\n", GetLastError()); + args.past_free = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(args.past_free != NULL, "Failed to create an event: %u\n", GetLastError()); + + dll = LoadLibraryA(thread_dll); + ok(dll != NULL, "Failed to load the test dll: %u\n", GetLastError()); + + set_thead_dll_detach_event(dll, detach_event); + + if (beginthread_method == use_beginthreadex) + { + _beginthreadex_start_routine_t proc = (void*) GetProcAddress(dll, "stdcall_thread_proc"); + ok(proc != NULL, "Failed to get stdcall_thread_proc: %u\n", GetLastError()); + thread_handle = _beginthreadex(NULL, 0, proc, &args, 0, NULL); + } + else + { + _beginthread_start_routine_t proc = (void*) GetProcAddress(dll, "cdecl_thread_proc"); + ok(proc != NULL, "Failed to get stdcall_thread_proc: %u\n", GetLastError()); + thread_handle = _beginthread(proc, 0, &args); + } + + ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); + + ret = WaitForSingleObject(args.confirm_running, 200); + ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); + + ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + + ret = WaitForSingleObject(detach_event, 0); + ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); + + ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + + if (beginthread_method == use_beginthreadex) + { + ret = WaitForSingleObject((HANDLE)thread_handle, 200); + ok(ret == WAIT_OBJECT_0, "Thread has not exited, ret: %d, err: %u\n", ret, GetLastError()); + } + + ret = WaitForSingleObject(detach_event, 200); + ok(ret == WAIT_OBJECT_0, "Detach event was not signaled, ret: %d, err: %u\n", ret, GetLastError()); + + if (beginthread_method == use_beginthreadex) + CloseHandle((HANDLE)thread_handle); + + CloseHandle(args.past_free); + CloseHandle(args.confirm_running); + CloseHandle(detach_event); +} + +START_TEST(thread) +{ + BOOL ret; + char *thread_dll = get_thread_dll_path(); + + test_thread_library_reference(thread_dll, use_beginthread, thread_exit_return); + test_thread_library_reference(thread_dll, use_beginthread, thread_exit_endthread); + test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_return); + test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_endthreadex); + + ret = DeleteFileA(thread_dll); + ok(ret, "Failed to remove the test dll, err: %u", GetLastError()); +} diff --git a/dlls/ucrtbase/tests/threaddll.c b/dlls/ucrtbase/tests/threaddll.c new file mode 100644 index 00000000000..72b8074054a --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.c @@ -0,0 +1,67 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include "threaddll.h" + +static HANDLE detach_event; + +void CDECL _endthread(void); +void CDECL _endthreadex(unsigned int); + +void WINAPI set_detach_event(HANDLE event) +{ + detach_event = event; +} + +static unsigned internal_thread_proc(void *param) +{ + struct threaddll_args *args = param; + SetEvent(args->confirm_running); + WaitForSingleObject(args->past_free, INFINITE); + + if (args->exit_method == thread_exit_endthread) + _endthread(); + else if (args->exit_method == thread_exit_endthreadex) + _endthreadex(0); + + return 0; +} + +unsigned WINAPI stdcall_thread_proc(void *param) +{ + return internal_thread_proc(param); +} + +void CDECL cdecl_thread_proc(void *param) +{ + internal_thread_proc(param); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_DETACH: + if (detach_event) SetEvent(detach_event); + break; + } + + return TRUE; +} diff --git a/dlls/ucrtbase/tests/threaddll.h b/dlls/ucrtbase/tests/threaddll.h new file mode 100644 index 00000000000..1d8d085798f --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.h @@ -0,0 +1,30 @@ +/* + * Copyright 2021 Arkadiusz Hiler for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +enum thread_exit_method { + thread_exit_return, + thread_exit_endthread, + thread_exit_endthreadex +}; + +struct threaddll_args +{ + HANDLE confirm_running; + HANDLE past_free; + enum thread_exit_method exit_method; +}; diff --git a/dlls/ucrtbase/tests/threaddll.spec b/dlls/ucrtbase/tests/threaddll.spec new file mode 100644 index 00000000000..8422c096946 --- /dev/null +++ b/dlls/ucrtbase/tests/threaddll.spec @@ -0,0 +1,3 @@ +@ stdcall set_detach_event(ptr) +@ stdcall stdcall_thread_proc(ptr) +@ cdecl cdecl_thread_proc(ptr)

1 0

Rémi Bernon : user32: Add current keyboard layout to thread data.
by Alexandre Julliard May 5, 2021

May 5, 2021

Module: wine Branch: master Commit: 179c57603a7fc2c65379e1a054ba006b79fda6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=179c57603a7fc2c65379e1a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:48 2021 +0200 user32: Add current keyboard layout to thread data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 2 ++ dlls/user32/input.c | 4 ++++ dlls/user32/user_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index d00fc8584c6..a3d92e84aef 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -728,8 +728,10 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_INPUTLANGCHANGE: { + struct user_thread_info *info = get_user_thread_info(); int count = 0; HWND *win_array = WIN_ListChildren( hwnd ); + info->kbd_layout = (HKL)lParam; if (!win_array) break; diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1f795e43545..8e5ab91baf3 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1316,6 +1316,7 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, */ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) { + struct user_thread_info *info = get_user_thread_info(); HKL old_layout; TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); @@ -1330,7 +1331,10 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) } if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) + { + if (old_layout) info->kbd_layout = layout; return old_layout; + } return get_locale_kbd_layout(); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 5f8059a12a0..7ac65a34db3 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -199,6 +199,7 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ struct user_key_state_info *key_state; /* Cache of global key state */ + HKL kbd_layout; /* Current keyboard layout */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */

1 0

Arkadiusz Hiler : msvcrt: Make _beginthread() error out as documented.
by Alexandre Julliard May 5, 2021

May 5, 2021

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

Henri Verbeet : wined3d: Implement Vulkan NULL 1D array image shader resource view descriptors.
by Alexandre Julliard May 5, 2021

May 5, 2021

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

Paul Gofman : gamingtcui: Add stub for ShowProfileCardUI().
by Alexandre Julliard May 5, 2021

May 5, 2021

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 : dxgi/tests: Test that we don't use objects returned by wrapped interfaces internally.
by Alexandre Julliard May 5, 2021

May 5, 2021

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

Henri Verbeet : dxgi: Store an IWineDXGIFactory pointer in struct d3d11_swapchain.
by Alexandre Julliard May 5, 2021

May 5, 2021

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: Pass an IWineDXGIFactory pointer to dxgi_get_output_from_window().
by Alexandre Julliard May 5, 2021

May 5, 2021

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

Rémi Bernon : winemac.drv: Call ActivateKeyboardLayout when layout changes.
by Alexandre Julliard May 5, 2021

May 5, 2021

Module: wine Branch: master Commit: db901b91eff6d9a71978eea1c042e9259ad2b945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db901b91eff6d9a71978eea1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 5 11:46:49 2021 +0200 winemac.drv: Call ActivateKeyboardLayout when layout changes. To update user32 current keyboard layout as well. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 5 +++++ dlls/winemac.drv/macdrv_main.c | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6732c5755ee..0648b00a4f1 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1054,6 +1054,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) macdrv_compute_keyboard_layout(thread_data); + ActivateKeyboardLayout(thread_data->active_keyboard_layout, 0); + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); } @@ -1169,6 +1171,9 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) TRACE("hkl %p flags %04x\n", hkl, flags); + if (hkl == thread_data->active_keyboard_layout) + return hkl; + EnterCriticalSection(&layout_list_section); update_layout_list(); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 694a46b11e6..203e993ee93 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -384,6 +384,7 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) set_queue_display_fd(macdrv_get_event_queue_fd(data->queue)); TlsSetValue(thread_data_tls_index, data); + ActivateKeyboardLayout(data->active_keyboard_layout, 0); return data; }

1 0