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

[PATCH v4 3/6] winex11.drv: Store monitor information in the wineserver for EnumDisplayMonitors().
by Zhiyi Zhang May 31, 2021

May 31, 2021

Fix a regression that Office 2016/365 has a 640x480 main window. Office 2016/365 hooks NtOpenKeyEx() and prevents access to SetupAPI device properties. After querying monitor information from SetupAPI failed, EnumDisplayMonitors() reports a fallback monitor of size 640x480. As to why store the monitor information in the wineserver, it seems that EnumDisplayMonitors() reports monitors connected to current user logon session. For instance, EnumDisplayMonitors() always report one monitor when called by services. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 82 ++++++++++++++++++++++ dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/display.c | 74 ++++++++++++++++++-- server/Makefile.in | 1 + server/display.c | 133 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 39 +++++++++++ server/trace.c | 38 +++++++++++ server/user.h | 13 +++- 8 files changed, 374 insertions(+), 7 deletions(-) create mode 100644 server/display.c diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1c943767927..846d5b9cc36 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -46,6 +46,7 @@ #include "win.h" #include "user_private.h" #include "wine/gdi_driver.h" +#include "wine/server.h" #include "wine/asm.h" #include "wine/debug.h" @@ -3974,9 +3975,35 @@ fail: BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) { UINT index = (UINT_PTR)handle - 1; + NTSTATUS status; TRACE("(%p, %p)\n", handle, info); + SERVER_START_REQ( get_monitor_info ) + { + req->handle = wine_server_user_handle( handle ); + if (info->cbSize >= sizeof(MONITORINFOEXW)) + wine_server_set_reply( req, ((MONITORINFOEXW *)info)->szDevice, + sizeof(((MONITORINFOEXW *)info)->szDevice) - sizeof(WCHAR) ); + if (!(status = wine_server_call( req ))) + { + SetRect( &info->rcMonitor, reply->monitor_rect.left, reply->monitor_rect.top, + reply->monitor_rect.right, reply->monitor_rect.bottom ); + SetRect( &info->rcWork, reply->work_rect.left, reply->work_rect.top, + reply->work_rect.right, reply->work_rect.bottom ); + if (!info->rcMonitor.left && !info->rcMonitor.top && info->rcMonitor.right && info->rcMonitor.bottom) + info->dwFlags = MONITORINFOF_PRIMARY; + else + info->dwFlags = 0; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + ((MONITORINFOEXW *)info)->szDevice[wine_server_reply_size( req ) / sizeof(WCHAR)] = 0; + } + } + SERVER_END_REQ; + + if (!status) + return TRUE; + /* Fallback to report one monitor */ if (handle == NULLDRV_DEFAULT_HMONITOR) { @@ -3990,7 +4017,10 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) } if (!update_monitor_cache()) + { + SetLastError( ERROR_INVALID_MONITOR_HANDLE ); return FALSE; + } EnterCriticalSection( &monitors_section ); if (index < monitor_count) @@ -4111,11 +4141,63 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { + struct enum_monitor_entry entries[4], *entry_ptr; + unsigned int status, count, entry_count; RECT monitor_rect; + HMONITOR monitor; DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + entry_count = ARRAY_SIZE(entries); + entry_ptr = entries; + while (TRUE) + { + SERVER_START_REQ(enum_monitors) + { + wine_server_set_reply( req, entry_ptr, entry_count * sizeof(*entry_ptr) ); + status = wine_server_call( req ); + count = reply->count; + } + SERVER_END_REQ; + + if (!status) + { + for (i = 0; i < count; ++i) + { + monitor = wine_server_ptr_handle( entry_ptr[i].handle ); + monitor_rect.top = entry_ptr[i].monitor_rect.top; + monitor_rect.left = entry_ptr[i].monitor_rect.left; + monitor_rect.right = entry_ptr[i].monitor_rect.right; + monitor_rect.bottom = entry_ptr[i].monitor_rect.bottom; + if (!proc( monitor, hdc, &monitor_rect, lp )) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return FALSE; + } + } + + if (count) + { + if (entry_ptr != entries) + heap_free( entry_ptr ); + return TRUE; + } + } + + if (entry_ptr != entries) + heap_free( entry_ptr ); + + if (count <= entry_count) + break; + + entry_count = count; + entry_ptr = heap_calloc( entry_count, sizeof(*entry_ptr) ); + if (!entry_ptr) + break; + } + if (update_monitor_cache()) { while (TRUE) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..b73ea8cfc90 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2004,7 +2004,6 @@ static BOOL CALLBACK test_handle_proc(HMONITOR full_monitor, HDC hdc, LPRECT rec monitor = (HMONITOR)((ULONG_PTR)full_monitor | ((ULONG_PTR)~0u << 16)); SetLastError(0xdeadbeef); ret = GetMonitorInfoW(monitor, &monitor_info); - todo_wine_if(((ULONG_PTR)full_monitor >> 16) == 0) ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); monitor = (HMONITOR)((ULONG_PTR)full_monitor & 0xffff); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..f6b1cead7a3 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -34,6 +34,8 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/server.h" #include "wine/unicode.h" #include "x11drv.h" @@ -47,7 +49,6 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1 DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; @@ -625,10 +626,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - /* RcWork */ - if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, - (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) - goto done; /* Adapter name */ length = sprintfW(bufferW, adapter_name_fmtW, video_index + 1); if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, @@ -697,6 +694,62 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Wine server monitor list management */ + +struct wine_server_monitor_info +{ + unsigned int entry_count; + unsigned int entry_capacity; + struct update_monitor_entry *entries; +}; + +static BOOL wine_server_add_monitor_info(struct wine_server_monitor_info *info, + const struct x11drv_monitor *monitor, int adapter_index) +{ + struct update_monitor_entry *entry, *new_entries; + unsigned int length; + + if (info->entry_count <= info->entry_capacity) + info->entry_capacity = info->entry_capacity ? info->entry_capacity * 2 : 2; + + if (info->entries) + new_entries = heap_realloc(info->entries, info->entry_capacity * sizeof(*new_entries)); + else + new_entries = heap_calloc(info->entry_capacity, sizeof(*new_entries)); + + if (!new_entries) + return FALSE; + + info->entries = new_entries; + entry = &info->entries[info->entry_count++]; + entry->monitor_rect.top = monitor->rc_monitor.top; + entry->monitor_rect.left = monitor->rc_monitor.left; + entry->monitor_rect.right = monitor->rc_monitor.right; + entry->monitor_rect.bottom = monitor->rc_monitor.bottom; + entry->work_rect.top = monitor->rc_work.top; + entry->work_rect.left = monitor->rc_work.left; + entry->work_rect.right = monitor->rc_work.right; + entry->work_rect.bottom = monitor->rc_work.bottom; + length = sprintfW(entry->adapter_name, adapter_name_fmtW, adapter_index + 1); + entry->adapter_name_len = length * sizeof(WCHAR); + return TRUE; +} + +static void wine_server_submit_monitor_info(const struct wine_server_monitor_info *info) +{ + unsigned int status; + + SERVER_START_REQ(update_monitors) + { + wine_server_add_data(req, info->entries, info->entry_count * sizeof(*info->entries)); + status = wine_server_call(req); + } + SERVER_END_REQ; + + if (status) + ERR("Failed to update the monitor list in the wine server, status %#x\n", status); +} + void X11DRV_DisplayDevices_Init(BOOL force) { HANDLE mutex; @@ -707,6 +760,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; + struct wine_server_monitor_info info = {0}; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -766,6 +820,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; + + /* EnumDisplayMonitors() doesn't enumerate mirrored replicas and inactive monitors */ + if (monitor != 0 || !(monitors[monitor].state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + + if (!wine_server_add_monitor_info(&info, &monitors[monitor], video_index)) + goto done; } handler->free_monitors(monitors); @@ -777,7 +838,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + wine_server_submit_monitor_info(&info); + done: + heap_free(info.entries); cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b1aa85862c1 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ debugger.c \ device.c \ directory.c \ + display.c \ event.c \ fd.c \ file.c \ diff --git a/server/display.c b/server/display.c new file mode 100644 index 00000000000..8e8ac2d1338 --- /dev/null +++ b/server/display.c @@ -0,0 +1,133 @@ +/* + * Server-side display device management + * + * Copyright (C) 2021 Zhiyi Zhang 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 "config.h" + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" + +#include "request.h" +#include "user.h" + +static struct list monitor_list = LIST_INIT(monitor_list); +static unsigned int monitor_count; + +/* retrieve a pointer to a monitor from its handle */ +static struct monitor *get_monitor( user_handle_t handle ) +{ + struct monitor *monitor; + + if (!(monitor = get_user_object( handle, USER_MONITOR ))) + set_win32_error( ERROR_INVALID_MONITOR_HANDLE ); + return monitor; +} + +/* create a monitor */ +static void create_monitor( const struct update_monitor_entry *entry ) +{ + struct monitor *monitor; + + if (!(monitor = mem_alloc( sizeof(*monitor) ))) + goto failed; + + if (!(monitor->adapter_name = memdup( entry->adapter_name, entry->adapter_name_len ))) + goto failed; + monitor->adapter_name_len = entry->adapter_name_len; + + if (!(monitor->handle = alloc_user_handle( monitor, USER_MONITOR ))) + goto failed; + + monitor->monitor_rect = entry->monitor_rect; + monitor->work_rect = entry->work_rect; + list_add_tail( &monitor_list, &monitor->entry ); + ++monitor_count; + return; + +failed: + if (monitor) + { + if (monitor->adapter_name) + free( monitor->adapter_name ); + free( monitor ); + } +} + +/* modify the list of monitors */ +DECL_HANDLER(update_monitors) +{ + const struct update_monitor_entry *entries; + struct monitor *monitor, *monitor2; + unsigned int entry_count, i; + + LIST_FOR_EACH_ENTRY_SAFE(monitor, monitor2, &monitor_list, struct monitor, entry) + { + list_remove( &monitor->entry ); + free_user_handle( monitor->handle ); + free( monitor->adapter_name ); + free( monitor ); + } + monitor_count = 0; + + entries = get_req_data(); + entry_count = get_req_data_size() / sizeof(*entries); + for (i = 0; i < entry_count; ++i) + create_monitor( &entries[i] ); +} + +/* get information about a monitor */ +DECL_HANDLER(get_monitor_info) +{ + struct monitor *monitor; + + if (!(monitor = get_monitor( req->handle ))) + return; + + reply->monitor_rect = monitor->monitor_rect; + reply->work_rect = monitor->work_rect; + set_reply_data( monitor->adapter_name, min(monitor->adapter_name_len, get_reply_max_size()) ); +} + +/* enumerate monitors */ +DECL_HANDLER(enum_monitors) +{ + struct enum_monitor_entry *entries; + unsigned int size, i = 0; + struct monitor *monitor; + + reply->count = monitor_count; + size = reply->count * sizeof(*entries); + if (size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + if (!(entries = set_reply_data_size( size ))) + return; + + LIST_FOR_EACH_ENTRY(monitor, &monitor_list, struct monitor, entry) + { + entries[i].handle = monitor->handle; + entries[i].monitor_rect = monitor->monitor_rect; + ++i; + } +} diff --git a/server/protocol.def b/server/protocol.def index 6d8208b128b..3d536a0a237 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2693,6 +2693,45 @@ enum coords_relative #define SET_USER_OBJECT_GET_FULL_NAME 2 +struct update_monitor_entry +{ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR adapter_name[32]; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length in bytes */ +}; + +struct enum_monitor_entry +{ + user_handle_t handle; /* handle to the monitor */ + rectangle_t monitor_rect; /* monitor rectangle */ +}; + + +/* Modify the list of monitors */ +(a)REQ(update_monitors) + VARARG(monitors,update_monitor_entry); /* A list of monitors to be created */ +(a)END + + +/* Get information about a monitor */ +(a)REQ(get_monitor_info) + user_handle_t handle; /* handle to the monitor */ +(a)REPLY + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + VARARG(adapter,unicode_str); /* adapter name */ +(a)END + + +/* Enumerate monitors */ +(a)REQ(enum_monitors) +(a)REPLY + unsigned int count; /* total count of monitors */ + VARARG(monitors,enum_monitor_entry); /* A list of monitors enumerated */ +(a)END + + /* Register a hotkey */ @REQ(register_hotkey) user_handle_t window; /* handle to the window */ diff --git a/server/trace.c b/server/trace.c index ad7236dd393..b11babfdecb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1372,6 +1372,44 @@ static void dump_varargs_handle_infos( const char *prefix, data_size_t size ) fputc( '}', stderr ); } +static void dump_varargs_update_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct update_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + dump_rectangle( "{monitor_rect=", &entry->monitor_rect ); + dump_rectangle( ",work_rect=", &entry->work_rect ); + fprintf( stderr, ",adapter_name=L\"" ); + dump_strW( entry->adapter_name, entry->adapter_name_len, stderr, "\"\"" ); + fprintf( stderr, "\"}" ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + +static void dump_varargs_enum_monitor_entry( const char *prefix, data_size_t size ) +{ + const struct enum_monitor_entry *entry; + + fprintf( stderr, "%s{", prefix ); + while (size >= sizeof(*entry)) + { + entry = cur_data; + fprintf( stderr, "{handle=%08x", entry->handle ); + dump_rectangle( ",monitor_rect=", &entry->monitor_rect ); + fputc( '}', stderr ); + size -= sizeof(*entry); + remove_data( sizeof(*entry) ); + if (size) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + typedef void (*dump_func)( const void *req ); /* Everything below this line is generated automatically by tools/make_requests */ diff --git a/server/user.h b/server/user.h index 80f7e91f12c..a9807f1402d 100644 --- a/server/user.h +++ b/server/user.h @@ -36,7 +36,8 @@ enum user_object { USER_WINDOW = 1, USER_HOOK, - USER_CLIENT /* arbitrary client handle */ + USER_CLIENT, /* arbitrary client handle */ + USER_MONITOR }; #define DESKTOP_ATOM ((atom_t)32769) @@ -79,6 +80,16 @@ struct desktop unsigned char keystate[256]; /* asynchronous key state */ }; +struct monitor +{ + user_handle_t handle; /* monitor handle */ + struct list entry; /* entry in global monitor list */ + rectangle_t monitor_rect; /* monitor rectangle */ + rectangle_t work_rect; /* monitor work area rectangle */ + WCHAR *adapter_name; /* adapter name */ + data_size_t adapter_name_len; /* adapter name length */ +}; + /* user handles functions */ extern user_handle_t alloc_user_handle( void *ptr, enum user_object type ); -- 2.30.2

2 5

[PATCH 1/6] propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().
by Nikolay Sivov May 31, 2021

May 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's used to compare MF_ATTRIBUTE_BLOB attributes. dlls/propsys/propvar.c | 13 ++++++- dlls/propsys/tests/propsys.c | 75 +++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index a18d83eabab..977fbebb918 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -798,7 +798,10 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) if (propvar->vt == VT_CLSID) return !propvar->puuid; - /* FIXME: vectors, byrefs, errors? */ + if (propvar->vt & VT_VECTOR) + return !propvar->caub.cElems; + + /* FIXME: byrefs, errors? */ return FALSE; } @@ -807,6 +810,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 { const PROPVARIANT *propvar2_converted; PROPVARIANT propvar2_static; + unsigned int count; HRESULT hr; INT res=-1; @@ -894,6 +898,13 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 res = memcmp(propvar1->puuid, propvar2->puuid, sizeof(*propvar1->puuid)); if (res) res = res > 0 ? 1 : -1; break; + case VT_VECTOR | VT_UI1: + count = min(propvar1->caub.cElems, propvar2->caub.cElems); + res = count ? memcmp(propvar1->caub.pElems, propvar2->caub.pElems, sizeof(*propvar1->caub.pElems) * count) : 0; + if (res) res = res > 0 ? 1 : -1; + if (!res && propvar1->caub.cElems != propvar2->caub.cElems) + res = propvar1->caub.cElems > propvar2->caub.cElems ? 1 : -1; + break; default: FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 07d035376d9..9ffa048a8b7 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -666,15 +666,18 @@ static void test_PropVariantToStringAlloc(void) CoTaskMemFree(str); } -static void test_PropVariantCompare(void) +static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; static const WCHAR str_bW[] = {'b', 0}; SAFEARRAY emptysafearray; + unsigned char bytevector1[] = {1,2,3}; + unsigned char bytevector2[] = {4,5,6}; PropVariantInit(&empty); PropVariantInit(&null); @@ -847,6 +850,74 @@ todo_wine res = PropVariantCompareEx(&r8_2, &r8_0, 0, 0); ok(res == 1, "res=%i\n", res); + /* VT_VECTOR | VT_UI1 */ + var1.vt = VT_VECTOR | VT_UI1; + var1.caub.cElems = 1; + var1.caub.pElems = bytevector1; + var2.vt = VT_VECTOR | VT_UI1; + var2.caub.cElems = 1; + var2.caub.pElems = bytevector2; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Vector length mismatch */ + var1.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector2; + var2.caub.pElems = bytevector1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector2; + + var1.caub.cElems = 1; + var2.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Length mismatch over same data */ + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector1; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.cElems = 1; + var2.caub.cElems = 1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + + var1.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var2.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + SysFreeString(str_2.bstrVal); SysFreeString(str_02.bstrVal); SysFreeString(str_b.bstrVal); @@ -1957,7 +2028,7 @@ START_TEST(propsys) test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); - test_PropVariantCompare(); + test_PropVariantCompareEx(); test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); -- 2.30.2

1 5

[PATCH] mfmediaengine: Add missing initialization of vertex buffer components (Coverity).
by Nikolay Sivov May 31, 2021

May 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4f01f6ddada..510b1c5885f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2054,15 +2054,19 @@ static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engin quad[0].x = 2.0f * rect.left / desc.Width - 1.0f; quad[0].y = -2.0f * rect.bottom / desc.Height + 1.0f; + quad[0].z = 0.0f; quad[1].x = quad[0].x; quad[1].y = -2.0f * rect.top / desc.Height + 1.0f; + quad[1].z = 0.0f; quad[2].x = 2.0f * rect.right / desc.Width - 1.0f; quad[2].y = quad[0].y; + quad[2].z = 0.0f; quad[3].x = quad[2].x; quad[3].y = quad[1].y; + quad[3].z = 0.0f; set_rect(&dst, dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); } -- 2.30.2

1 0

[PATCH] mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method.
by Nikolay Sivov May 31, 2021

May 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/topology.c | 99 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index bbed2cba893..a054eca27e1 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2010,7 +2010,10 @@ struct connect_context IMFTopologyNode *upstream_node; IMFTopologyNode *sink; IMFMediaTypeHandler *sink_handler; - const GUID *converter_category; + unsigned int output_index; + unsigned int input_index; + GUID converter_category; + GUID decoder_category; }; typedef HRESULT (*p_connect_func)(struct transform_output_type *output_type, struct connect_context *context); @@ -2142,7 +2145,7 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s sink_ctx = *context; sink_ctx.upstream_node = node; - if (SUCCEEDED(hr = topology_loader_enumerate_output_types(context->converter_category, output_type->type, + if (SUCCEEDED(hr = topology_loader_enumerate_output_types(&context->converter_category, output_type->type, connect_to_sink, &sink_ctx))) { hr = IMFTopology_AddNode(context->context->output_topology, node); @@ -2225,13 +2228,62 @@ static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, return S_OK; } +static HRESULT topology_loader_connect(IMFMediaTypeHandler *sink_handler, unsigned int sink_method, + struct connect_context *sink_ctx, struct connect_context *convert_ctx, IMFMediaType *media_type) +{ + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) + && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + { + hr = IMFTopologyNode_ConnectOutput(sink_ctx->upstream_node, sink_ctx->output_index, sink_ctx->sink, sink_ctx->input_index); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->converter_category, media_type, connect_to_sink, sink_ctx); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->decoder_category, media_type, + connect_to_converter, convert_ctx); + } + + return hr; +} + +static HRESULT topology_loader_foreach_source_type(IMFMediaTypeHandler *sink_handler, IMFMediaTypeHandler *source_handler, + unsigned int sink_method, struct connect_context *sink_ctx, struct connect_context *convert_ctx) +{ + unsigned int index = 0; + IMFMediaType *media_type; + HRESULT hr; + + while (SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(source_handler, index++, &media_type))) + { + hr = topology_loader_connect(sink_handler, sink_method, sink_ctx, convert_ctx, media_type); + if (SUCCEEDED(hr)) break; + IMFMediaType_Release(media_type); + media_type = NULL; + } + + if (media_type) + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(source_handler, media_type); + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context *context, IMFTopologyNode *source, unsigned int output_index, IMFTopologyNode *sink, unsigned int input_index) { IMFMediaTypeHandler *source_handler = NULL, *sink_handler = NULL; struct connect_context convert_ctx, sink_ctx; MF_CONNECT_METHOD source_method, sink_method; - GUID decode_cat, convert_cat; + unsigned int enumerate_source_types = 0; IMFMediaType *media_type; HRESULT hr; @@ -2248,35 +2300,46 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context if (FAILED(IMFTopologyNode_GetUINT32(sink, &MF_TOPONODE_CONNECT_METHOD, &sink_method))) sink_method = MF_CONNECT_ALLOW_DECODER; - if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &decode_cat, &convert_cat))) - goto done; - sink_ctx.context = context; sink_ctx.upstream_node = source; sink_ctx.sink = sink; sink_ctx.sink_handler = sink_handler; + sink_ctx.output_index = output_index; + sink_ctx.input_index = input_index; convert_ctx = sink_ctx; - convert_ctx.converter_category = &convert_cat; + if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &convert_ctx.decoder_category, + &convert_ctx.converter_category))) + goto done; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) + IMFTopology_GetUINT32(context->output_topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, &enumerate_source_types); + + if (enumerate_source_types) { - /* Direct connection. */ - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) - && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + if (source_method & MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES) { - hr = IMFTopologyNode_ConnectOutput(source, output_index, sink, input_index); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + else { - hr = topology_loader_enumerate_output_types(&convert_cat, media_type, connect_to_sink, &sink_ctx); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_DIRECT, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_CONVERTER, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + } + else + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) { - hr = topology_loader_enumerate_output_types(&decode_cat, media_type, connect_to_converter, &convert_ctx); + hr = topology_loader_connect(sink_handler, sink_method, &sink_ctx, &convert_ctx, media_type); + IMFMediaType_Release(media_type); } - - IMFMediaType_Release(media_type); } done: -- 2.30.2

1 0

[PATCH 1/5] reg: Remove two unused string resources
by Hugh McMaster May 31, 2021

May 31, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/reg.rc | 2 -- programs/reg/resource.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index c091023384c..1b451dc016b 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -132,7 +132,6 @@ STRINGTABLE STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n" STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'\n" - STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n" STRING_MATCHES_FOUND, "Search complete. Number of matches found: %1!d!\n" STRING_INVALID_SYNTAX, "reg: Invalid syntax. " STRING_INVALID_OPTION, "reg: Invalid option [%1]. " @@ -146,7 +145,6 @@ STRINGTABLE \ The name and path of the registry file to import.\n\n" STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" - STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" STRING_EXPORT_USAGE, "REG EXPORT <key> <file> [/y]\n\n\ diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 670d297389a..2a84c1025b3 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -45,7 +45,6 @@ #define STRING_DELETE_SUBKEY 122 #define STRING_INVALID_STRING 123 #define STRING_VALUEALL_FAILED 124 -#define STRING_GENERAL_FAILURE 125 #define STRING_MATCHES_FOUND 126 #define STRING_INVALID_SYNTAX 127 #define STRING_INVALID_OPTION 128 @@ -54,7 +53,6 @@ #define STRING_VALUE_NOT_SET 131 #define STRING_IMPORT_USAGE 132 #define STRING_FILE_NOT_FOUND 133 -#define STRING_OPEN_KEY_FAILED 134 #define STRING_ESCAPE_SEQUENCE 135 #define STRING_EXPORT_USAGE 136 #define STRING_INVALID_SYSTEM_KEY 137 -- 2.32.0.rc0

1 4

[PATCH] ntdll: IOCTL_AFD_WINE_SENDMSG irda member misreference
by Roberto Pungartnik May 31, 2021

May 31, 2021

2 1

[PATCH] dxgi: Return S_OK from d3d11_swapchain_GetLastPresentCount().
by Andrey Gusev May 31, 2021

May 31, 2021

Fixes crash for Metal Gear Solid V: Ground Zeroes. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/swapchain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5b3ca5b5762..20e6fe3384a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -601,7 +601,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetLastPresentCount(IDXGISwapCh { FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); - return E_NOTIMPL; + if (last_present_count) + *last_present_count = 0; + + return S_OK; } /* IDXGISwapChain1 methods */ -- 2.31.1

2 1

[PATCH 1/3] include: Add HID generic multi axis controller usage.
by Rémi Bernon May 31, 2021

May 31, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index d5f55bd2276..268ee4d05e8 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -45,6 +45,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_GENERIC_GAMEPAD ((USAGE) 0x05) #define HID_USAGE_GENERIC_KEYBOARD ((USAGE) 0x06) #define HID_USAGE_GENERIC_KEYPAD ((USAGE) 0x07) +#define HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER ((USAGE) 0x08) #define HID_USAGE_GENERIC_SYSTEM_CTL ((USAGE) 0x80) #define HID_USAGE_GENERIC_X ((USAGE) 0x30) #define HID_USAGE_GENERIC_Y ((USAGE) 0x31) -- 2.31.0

1 2

[PATCH 1/5] dinput: Factor out device creation interface queries.
by Rémi Bernon May 31, 2021

May 31, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 32 +++++++++++++--------------- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick_linux.c | 34 ++++-------------------------- dlls/dinput/joystick_linuxinput.c | 34 ++++-------------------------- dlls/dinput/joystick_osx.c | 33 ++++------------------------- dlls/dinput/keyboard.c | 35 ++++--------------------------- dlls/dinput/mouse.c | 34 ++++-------------------------- 7 files changed, 36 insertions(+), 168 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 85de9f79b81..3d6d5732cfb 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -644,9 +644,15 @@ static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGU return DI_OK; } -static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, LPVOID *pvOut, BOOL unicode) +static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx( IDirectInput7W *iface, REFGUID rguid, REFIID riid, + LPVOID *pvOut, LPUNKNOWN lpUnknownOuter ) { + IDirectInputDevice8W *device; + IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); unsigned int i; + HRESULT hr; + + TRACE( "(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid( rguid ), debugstr_guid( riid ), pvOut, lpUnknownOuter ); if (pvOut) *pvOut = NULL; @@ -660,31 +666,23 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, /* Loop on all the devices to see if anyone matches the given GUID */ for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { - HRESULT ret; - if (!dinput_devices[i]->create_device) continue; - if ((ret = dinput_devices[i]->create_device(This, rguid, riid, pvOut, unicode)) == DI_OK) - return DI_OK; + if (SUCCEEDED(hr = dinput_devices[i]->create_device( This, rguid, &device ))) + { + hr = IDirectInputDevice8_QueryInterface( device, riid, pvOut ); + IDirectInputDevice8_Release( device ); + return hr; + } } WARN("invalid device GUID %s\n", debugstr_guid(rguid)); return DIERR_DEVICENOTREG; } -static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, REFGUID rguid, - REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) -{ - IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - - TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); - - return create_device(This, rguid, riid, pvOut, TRUE); -} - static HRESULT WINAPI IDirectInputWImpl_CreateDevice(LPDIRECTINPUT7W iface, REFGUID rguid, LPDIRECTINPUTDEVICEW* pdev, LPUNKNOWN punk) { - return IDirectInput7_CreateDeviceEx( iface, rguid, NULL, (LPVOID *)pdev, punk ); + return IDirectInput7_CreateDeviceEx( iface, rguid, &IID_IDirectInputDeviceW, (LPVOID *)pdev, punk ); } /******************************************************************************* @@ -713,7 +711,7 @@ static HRESULT WINAPI IDirectInput8WImpl_CreateDevice(LPDIRECTINPUT8W iface, REF LPDIRECTINPUTDEVICE8W* pdev, LPUNKNOWN punk) { IDirectInputImpl *This = impl_from_IDirectInput8W( iface ); - return IDirectInput7_CreateDeviceEx( &This->IDirectInput7W_iface, rguid, NULL, (LPVOID *)pdev, punk ); + return IDirectInput7_CreateDeviceEx( &This->IDirectInput7W_iface, rguid, &IID_IDirectInputDevice8W, (LPVOID *)pdev, punk ); } static HRESULT WINAPI IDirectInput8WImpl_EnumDevices(LPDIRECTINPUT8W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback, diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 256c30d3dc0..404eaad1d52 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -57,7 +57,7 @@ struct dinput_device { const char *name; HRESULT (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id); HRESULT (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); - HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); + HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out); }; struct DevicePlayer { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 0c1560617dd..32e355c47e8 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -587,13 +587,13 @@ static unsigned short get_joystick_index(REFGUID guid) return MAX_JOYSTICKS; } -static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) +static HRESULT joydev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) { unsigned short index; - TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); + TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); find_joystick_devices(); - *pdev = NULL; + *out = NULL; if ((index = get_joystick_index(rguid)) < MAX_JOYSTICKS && joystick_devices_count && index < joystick_devices_count) @@ -601,37 +601,11 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF JoystickImpl *This; HRESULT hr; - if (riid == NULL) - ;/* nothing */ - else if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) - { - unicode = 0; - } - else if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) - { - unicode = 1; - } - else - { - WARN("no interface\n"); - return DIERR_NOINTERFACE; - } - if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; TRACE( "Created a Joystick device (%p)\n", This ); - if (unicode) - *pdev = &This->generic.base.IDirectInputDevice8W_iface; - else - *pdev = &This->generic.base.IDirectInputDevice8A_iface; - + *out = &This->generic.base.IDirectInputDevice8W_iface; return hr; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3bc6114322f..0b7a4e63c8f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -612,13 +612,13 @@ static unsigned short get_joystick_index(REFGUID guid) return MAX_JOYDEV; } -static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) +static HRESULT joydev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) { unsigned short index; - TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); + TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); find_joydevs(); - *pdev = NULL; + *out = NULL; if ((index = get_joystick_index(rguid)) < MAX_JOYDEV && have_joydevs && index < have_joydevs) @@ -626,37 +626,11 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF JoystickImpl *This; HRESULT hr; - if (riid == NULL) - ;/* nothing */ - else if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) - { - unicode = 0; - } - else if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) - { - unicode = 1; - } - else - { - WARN("no interface\n"); - return DIERR_NOINTERFACE; - } - if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; TRACE( "Created a Joystick device (%p)\n", This ); - if (unicode) - *pdev = &This->generic.base.IDirectInputDevice8W_iface; - else - *pdev = &This->generic.base.IDirectInputDevice8A_iface; - + *out = &This->generic.base.IDirectInputDevice8W_iface; return DI_OK; } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e29a7bd9726..38a708d4cae 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1323,13 +1323,13 @@ static unsigned short get_joystick_index(REFGUID guid) return 0xffff; } -static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) +static HRESULT joydev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) { unsigned short index; int joystick_devices_count; - TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); - *pdev = NULL; + TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); + *out = NULL; if ((joystick_devices_count = find_joystick_devices()) == 0) return DIERR_DEVICENOTREG; @@ -1340,36 +1340,11 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF JoystickImpl *This; HRESULT hr; - if (riid == NULL) - ;/* nothing */ - else if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) - { - unicode = 0; - } - else if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) - { - unicode = 1; - } - else - { - WARN("no interface\n"); - return DIERR_NOINTERFACE; - } - if (FAILED(hr = alloc_device( rguid, dinput, &This, index ))) return hr; TRACE( "Created a Joystick device (%p)\n", This ); - if (unicode) - *pdev = &This->generic.base.IDirectInputDevice8W_iface; - else - *pdev = &This->generic.base.IDirectInputDevice8A_iface; + *out = &This->generic.base.IDirectInputDevice8W_iface; return hr; } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c64051e8663..0e371e31b99 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -283,48 +283,21 @@ failed: return DIERR_OUTOFMEMORY; } - -static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) +static HRESULT keyboarddev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) { - TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); - *pdev = NULL; + TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); + *out = NULL; if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ { SysKeyboardImpl *This; HRESULT hr; - if (riid == NULL) - ;/* nothing */ - else if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) - { - unicode = 0; - } - else if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) - { - unicode = 1; - } - else - { - WARN("no interface\n"); - return DIERR_NOINTERFACE; - } - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; TRACE( "Created a Keyboard device (%p)\n", This ); - if (unicode) - *pdev = &This->base.IDirectInputDevice8W_iface; - else - *pdev = &This->base.IDirectInputDevice8A_iface; - + *out = &This->base.IDirectInputDevice8W_iface; return DI_OK; } diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ef503526c35..09cfe945a50 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -240,47 +240,21 @@ failed: return DIERR_OUTOFMEMORY; } -static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode) +static HRESULT mousedev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) { - TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); - *pdev = NULL; + TRACE( "%p %s %p\n", dinput, debugstr_guid( rguid ), out ); + *out = NULL; if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ { SysMouseImpl *This; HRESULT hr; - if (riid == NULL) - ;/* nothing */ - else if (IsEqualGUID(&IID_IDirectInputDeviceA, riid) || - IsEqualGUID(&IID_IDirectInputDevice2A, riid) || - IsEqualGUID(&IID_IDirectInputDevice7A, riid) || - IsEqualGUID(&IID_IDirectInputDevice8A, riid)) - { - unicode = 0; - } - else if (IsEqualGUID(&IID_IDirectInputDeviceW, riid) || - IsEqualGUID(&IID_IDirectInputDevice2W, riid) || - IsEqualGUID(&IID_IDirectInputDevice7W, riid) || - IsEqualGUID(&IID_IDirectInputDevice8W, riid)) - { - unicode = 1; - } - else - { - WARN("no interface\n"); - return DIERR_NOINTERFACE; - } - if (FAILED(hr = alloc_device( rguid, dinput, &This ))) return hr; TRACE( "Created a Mouse device (%p)\n", This ); - if (unicode) - *pdev = &This->base.IDirectInputDevice8W_iface; - else - *pdev = &This->base.IDirectInputDevice8A_iface; - + *out = &This->base.IDirectInputDevice8W_iface; return DI_OK; } -- 2.31.0

1 4

[PATCH] winex11.drv: Always add MWM_FUNC_CLOSE to enabled windows.
by Zhiyi Zhang May 31, 2021

May 31, 2021

Some window managers require MWM_FUNC_CLOSE to be present for a window to be allowed to close. For example, on KWin, a window of style WS_POPUP | WS_VISIBLE has a close button drawn on top of its taskbar preview. But when you press it, the window manager refuses to close it. On Mutter, windows without MWN_FUNC_CLOSE doesn't have a close button on the window preview. On Windows 10, enabled windows without WS_SYSMENU always has a close button on their taskbar window preview and can always be closed with the close button. On Windows 7, enabled windows without WS_SYSMENU has no close button on the window preview but still can be closed with the right-click menu on the taskbar. This patch changes the behavior to match that of Windows 10. Fix WeChat image preview window cannot be closed from KDE panels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 386f21c85d4..4e856a41865 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -749,9 +749,9 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s if (is_window_resizable( data, style )) mwm_hints.functions |= MWM_FUNC_RESIZE; if (!(style & WS_DISABLED)) { + mwm_hints.functions |= MWM_FUNC_CLOSE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; /* The window can be programmatically minimized even without a minimize box button. Allow the WM to restore it. */ -- 2.30.2

1 0