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

Zhiyi Zhang : winex11.drv: Fake success for changing non-primary adapter settings.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: ae4804d502fecab835146043010f53377bf1b65a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4804d502fecab835146043… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:17 2020 +0800 winex11.drv: Fake success for changing non-primary adapter settings. Changing non-primary adapter settings is currently unsupported. Return success for non-primary adapter settings changes so that the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 3e7a5960f0..5609e2b43f 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -357,6 +357,13 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", + wine_dbgstr_w(devname)); + return DISP_CHANGE_SUCCESSFUL; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL)

1 0

Zebediah Figura : quartz/vmr9: Use TRACE for some implemented methods.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: f020fe051b02d7bda90a1fdb028a60e2ab7400f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f020fe051b02d7bda90a1fdb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:33 2020 -0500 quartz/vmr9: Use TRACE for some implemented methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 59 +++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a716a6e712..7fca3550d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1699,17 +1699,18 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessContr return S_OK; } -static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *source, RECT *dest) +static HRESULT WINAPI VMR9WindowlessControl_GetVideoPosition(IVMRWindowlessControl9 *iface, RECT *src, RECT *dst) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - if (source) - *source = This->window.src; + TRACE("filter %p, src %p, dst %p.\n", filter, src, dst); - if (dest) - *dest = This->window.dst; + if (src) + *src = filter->window.src; + + if (dst) + *dst = filter->window.dst; - FIXME("(%p/%p)->(%p/%p) stub\n", iface, This, source, dest); return S_OK; } @@ -1955,42 +1956,46 @@ static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotif return refcount; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator( + IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR cookie, IVMRSurfaceAllocator9 *allocator) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - /* FIXME: This code is not tested!!! */ - FIXME("(%p/%p)->(...) stub\n", iface, This); - This->cookie = id; + TRACE("filter %p, cookie %#Ix, allocator %p.\n", filter, cookie, allocator); - if (This->presenter) + filter->cookie = cookie; + + if (filter->presenter) return VFW_E_WRONG_STATE; - if (FAILED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRImagePresenter9, (void **)&This->presenter))) + if (FAILED(IVMRSurfaceAllocator9_QueryInterface(allocator, &IID_IVMRImagePresenter9, (void **)&filter->presenter))) return E_NOINTERFACE; - if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(alloc, &IID_IVMRSurfaceAllocatorEx9, (void **)&This->allocator))) - This->allocator_is_ex = 1; + if (SUCCEEDED(IVMRSurfaceAllocator9_QueryInterface(allocator, + &IID_IVMRSurfaceAllocatorEx9, (void **)&filter->allocator))) + filter->allocator_is_ex = 1; else { - This->allocator = (IVMRSurfaceAllocatorEx9 *)alloc; - IVMRSurfaceAllocator9_AddRef(alloc); - This->allocator_is_ex = 0; + filter->allocator = (IVMRSurfaceAllocatorEx9 *)allocator; + IVMRSurfaceAllocator9_AddRef(allocator); + filter->allocator_is_ex = 0; } return S_OK; } -static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, IDirect3DDevice9 *device, HMONITOR monitor) +static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocatorNotify9 *iface, + IDirect3DDevice9 *device, HMONITOR monitor) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); - FIXME("(%p/%p)->(...) semi-stub\n", iface, This); - if (This->allocator_d3d9_dev) - IDirect3DDevice9_Release(This->allocator_d3d9_dev); - This->allocator_d3d9_dev = device; - IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - This->allocator_mon = monitor; + TRACE("filter %p, device %p, monitor %p.\n", filter, device, monitor); + + if (filter->allocator_d3d9_dev) + IDirect3DDevice9_Release(filter->allocator_d3d9_dev); + filter->allocator_d3d9_dev = device; + IDirect3DDevice9_AddRef(device); + filter->allocator_mon = monitor; return S_OK; }

1 0

Alex Henrie : ws2_32/tests: Put WSAAddressToString tests in tables.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 73ef942c6537b9faaf6401387b91d408e972beb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ef942c6537b9faaf640138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 26 23:33:32 2020 -0600 ws2_32/tests: Put WSAAddressToString tests in tables. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 431 +++++++++++++---------------------------------- 1 file changed, 115 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ef942c6537b9faaf64…

1 0

Zhiyi Zhang : user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW().
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 8a4ec0addba76bf3b34a9782556364ab4161dc22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a4ec0addba76bf3b34a9782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:09 2020 +0800 user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW(). NULL device and mode parameters mean to restore all adapters to their registry settings. Since all user graphics drivers only support a primary adapter now, it's okay to restore only the primary adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 3 +++ dlls/winemac.drv/display.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 75 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 10f17bb4c3..e6f33006db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3300,6 +3300,9 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); + if (!devname && !devmode) + return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (!devname && devmode) { if (!get_primary_adapter(primary_adapter)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 851d549d5f..968b9277bb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -747,6 +747,23 @@ void check_retina_status(void) } } +static BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) @@ -755,7 +772,9 @@ void check_retina_status(void) LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid) { + WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_BADMODE; + DEVMODEW default_mode; int bpp; struct macdrv_display *displays; int num_displays; @@ -770,6 +789,22 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 24644db620..3e7a5960f0 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -252,6 +252,24 @@ static BOOL write_registry_settings(const DEVMODEW *dm) return ret; } +BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -318,9 +336,27 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; + DEVMODEW default_mode; DWORD i; + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ff0aeb7dab..52057e875d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; +extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;

1 0

Gijs Vermeulen : include: Add cfg.h.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 912d5437ea5728fad10c5f7e3c2285f6107ccf04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=912d5437ea5728fad10c5f7e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 25 17:17:38 2020 +0200 include: Add cfg.h. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cfg.h | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2f2d94d574..9796dd8e5d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -55,6 +55,7 @@ SOURCES = \ bthsdpdef.h \ cderr.h \ cdosys.idl \ + cfg.h \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cfg.h b/include/cfg.h new file mode 100644 index 0000000000..30d30b4bee --- /dev/null +++ b/include/cfg.h @@ -0,0 +1,197 @@ +/* + * Copyright 2020 Gijs Vermeulen + * + * 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 + */ + +#ifndef _CFG_INCLUDED_ +#define _CFG_INCLUDED_ + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, + PNP_VetoAlreadyRemoved +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + +#define CM_PROB_NOT_CONFIGURED (0x00000001) +#define CM_PROB_DEVLOADER_FAILED (0x00000002) +#define CM_PROB_OUT_OF_MEMORY (0x00000003) +#define CM_PROB_ENTRY_IS_WRONG_TYPE (0x00000004) +#define CM_PROB_LACKED_ARBITRATOR (0x00000005) +#define CM_PROB_BOOT_CONFIG_CONFLICT (0x00000006) +#define CM_PROB_FAILED_FILTER (0x00000007) +#define CM_PROB_DEVLOADER_NOT_FOUND (0x00000008) +#define CM_PROB_INVALID_DATA (0x00000009) +#define CM_PROB_FAILED_START (0x0000000A) +#define CM_PROB_LIAR (0x0000000B) +#define CM_PROB_NORMAL_CONFLICT (0x0000000C) +#define CM_PROB_NOT_VERIFIED (0x0000000D) +#define CM_PROB_NEED_RESTART (0x0000000E) +#define CM_PROB_REENUMERATION (0x0000000F) +#define CM_PROB_PARTIAL_LOG_CONF (0x00000010) +#define CM_PROB_UNKNOWN_RESOURCE (0x00000011) +#define CM_PROB_REINSTALL (0x00000012) +#define CM_PROB_REGISTRY (0x00000013) +#define CM_PROB_VXDLDR (0x00000014) +#define CM_PROB_WILL_BE_REMOVED (0x00000015) +#define CM_PROB_DISABLED (0x00000016) +#define CM_PROB_DEVLOADER_NOT_READY (0x00000017) +#define CM_PROB_DEVICE_NOT_THERE (0x00000018) +#define CM_PROB_MOVED (0x00000019) +#define CM_PROB_TOO_EARLY (0x0000001A) +#define CM_PROB_NO_VALID_LOG_CONF (0x0000001B) +#define CM_PROB_FAILED_INSTALL (0x0000001C) +#define CM_PROB_HARDWARE_DISABLED (0x0000001D) +#define CM_PROB_CANT_SHARE_IRQ (0x0000001E) +#define CM_PROB_FAILED_ADD (0x0000001F) +#define CM_PROB_DISABLED_SERVICE (0x00000020) +#define CM_PROB_TRANSLATION_FAILED (0x00000021) +#define CM_PROB_NO_SOFTCONFIG (0x00000022) +#define CM_PROB_BIOS_TABLE (0x00000023) +#define CM_PROB_IRQ_TRANSLATION_FAILED (0x00000024) +#define CM_PROB_FAILED_DRIVER_ENTRY (0x00000025) +#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD (0x00000026) +#define CM_PROB_DRIVER_FAILED_LOAD (0x00000027) +#define CM_PROB_DRIVER_SERVICE_KEY_INVALID (0x00000028) +#define CM_PROB_LEGACY_SERVICE_NO_DEVICES (0x00000029) +#define CM_PROB_DUPLICATE_DEVICE (0x0000002A) +#define CM_PROB_FAILED_POST_START (0x0000002B) +#define CM_PROB_HALTED (0x0000002C) +#define CM_PROB_PHANTOM (0x0000002D) +#define CM_PROB_SYSTEM_SHUTDOWN (0x0000002E) +#define CM_PROB_HELD_FOR_EJECT (0x0000002F) +#define CM_PROB_DRIVER_BLOCKED (0x00000030) +#define CM_PROB_REGISTRY_TOO_LARGE (0x00000031) +#define CM_PROB_SETPROPERTIES_FAILED (0x00000032) +#define CM_PROB_WAITING_ON_DEPENDENCY (0x00000033) +#define CM_PROB_UNSIGNED_DRIVER (0x00000034) +#define CM_PROB_USED_BY_DEBUGGER (0x00000035) +#define CM_PROB_DEVICE_RESET (0x00000036) +#define CM_PROB_CONSOLE_LOCKED (0x00000037) +#define CM_PROB_NEED_CLASS_CONFIG (0x00000038) +#define CM_PROB_GUEST_ASSIGNMENT_FAILED (0x00000039) + +#define NUM_CM_PROB_V1 (0x00000025) +#define NUM_CM_PROB_V2 (0x00000032) +#define NUM_CM_PROB_V3 (0x00000033) +#define NUM_CM_PROB_V4 (0x00000034) +#define NUM_CM_PROB_V5 (0x00000035) +#define NUM_CM_PROB_V6 (0x00000036) +#define NUM_CM_PROB_V7 (0x00000037) +#define NUM_CM_PROB_V8 (0x00000039) +#define NUM_CM_PROB_V9 (0x0000003A) + +#define NUM_CM_PROB NUM_CM_PROB_V9 + +#define DN_ROOT_ENUMERATED (0x00000001) +#define DN_DRIVER_LOADED (0x00000002) +#define DN_ENUM_LOADED (0x00000004) +#define DN_STARTED (0x00000008) +#define DN_MANUAL (0x00000010) +#define DN_NEED_TO_ENUM (0x00000020) +#define DN_NOT_FIRST_TIME (0x00000040) +#define DN_HARDWARE_ENUM (0x00000080) +#define DN_LIAR (0x00000100) +#define DN_HAS_MARK (0x00000200) +#define DN_HAS_PROBLEM (0x00000400) +#define DN_FILTERED (0x00000800) +#define DN_MOVED (0x00001000) +#define DN_DISABLEABLE (0x00002000) +#define DN_REMOVABLE (0x00004000) +#define DN_PRIVATE_PROBLEM (0x00008000) +#define DN_MF_PARENT (0x00010000) +#define DN_MF_CHILD (0x00020000) +#define DN_WILL_BE_REMOVED (0x00040000) + +#define DN_NOT_FIRST_TIMEE 0x00080000 +#define DN_STOP_FREE_RES 0x00100000 +#define DN_REBAL_CANDIDATE 0x00200000 +#define DN_BAD_PARTIAL 0x00400000 +#define DN_NT_ENUMERATOR 0x00800000 +#define DN_NT_DRIVER 0x01000000 + +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 + +#define DN_NEED_RESTART DN_LIAR +#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME +#define DN_LEGACY_DRIVER DN_MOVED +#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK +#define DN_DEVICE_DISCONNECTED DN_NEEDS_LOCKING +#define DN_QUERY_REMOVE_PENDING DN_MF_PARENT +#define DN_QUERY_REMOVE_ACTIVE DN_MF_CHILD + +#define DN_CHANGEABLE_FLAGS (DN_NOT_FIRST_TIME+DN_HARDWARE_ENUM+DN_HAS_MARK+DN_DISABLEABLE+DN_REMOVABLE+DN_MF_CHILD+DN_MF_PARENT+DN_NOT_FIRST_TIMEE+DN_STOP_FREE_RES+DN_REBAL_CANDIDATE+DN_NT_ENUMERATOR+DN_NT_DRIVER+DN_SILENT_INSTALL+DN_NO_SHOW_IN_DM) + +#define LCPRI_FORCECONFIG (0x00000000) +#define LCPRI_BOOTCONFIG (0x00000001) +#define LCPRI_DESIRED (0x00002000) +#define LCPRI_NORMAL (0x00003000) +#define LCPRI_LASTBESTCONFIG (0x00003FFF) +#define LCPRI_SUBOPTIMAL (0x00005000) +#define LCPRI_LASTSOFTCONFIG (0x00007FFF) +#define LCPRI_RESTART (0x00008000) +#define LCPRI_REBOOT (0x00009000) +#define LCPRI_POWEROFF (0x0000A000) +#define LCPRI_HARDRECONFIG (0x0000C000) +#define LCPRI_HARDWIRED (0x0000E000) +#define LCPRI_IMPOSSIBLE (0x0000F000) +#define LCPRI_DISABLED (0x0000FFFF) +#define MAX_LCPRI (0x0000FFFF) + +#define CM_DEVICE_PANEL_SIDE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SIDE_TOP (0x00000001) +#define CM_DEVICE_PANEL_SIDE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_SIDE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_SIDE_RIGHT (0x00000004) +#define CM_DEVICE_PANEL_SIDE_FRONT (0x00000005) +#define CM_DEVICE_PANEL_SIDE_BACK (0x00000006) + +#define CM_DEVICE_PANEL_EDGE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_EDGE_TOP (0x00000001) +#define CM_DEVICE_PANEL_EDGE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_EDGE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_EDGE_RIGHT (0x00000004) + +#define CM_DEVICE_PANEL_SHAPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SHAPE_RECTANGLE (0x00000001) +#define CM_DEVICE_PANEL_SHAPE_OVAL (0x00000002) + +#define CM_DEVICE_PANEL_ORIENTATION_HORIZONTAL (0x00000000) +#define CM_DEVICE_PANEL_ORIENTATION_VERTICAL (0x00000001) + +#define CM_DEVICE_PANEL_JOINT_TYPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_JOINT_TYPE_PLANAR (0x00000001) +#define CM_DEVICE_PANEL_JOINT_TYPE_HINGE (0x00000002) +#define CM_DEVICE_PANEL_JOINT_TYPE_PIVOT (0x00000003) +#define CM_DEVICE_PANEL_JOINT_TYPE_SWIVEL (0x00000004) + +#endif /* _CFG_INCLUDED_ */

1 0

Zebediah Figura : quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs().
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: dc93d5f856cd14eddc2db688248a700c256d17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc93d5f856cd14eddc2db688… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 27 14:26:22 2020 -0500 quartz/vmr9: Fake success from IVMRMixerConrol9::SetMixingPrefs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 33 +++++++++++++++++++++++++++++++++ dlls/quartz/vmr9.c | 14 +++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index dfa9dae73e..0a8ae371a6 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3876,6 +3876,38 @@ out: DestroyWindow(window); } +static void test_mixing_prefs(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowed); + IVMRMixerControl9 *mixer_control; + DWORD flags; + HRESULT hr; + ULONG ref; + + set_mixing_mode(filter, 1); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + hr = IVMRMixerControl9_SetMixingPrefs(mixer_control, MixerPref9_NoDecimation + | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering | MixerPref9_RenderTargetRGB); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRMixerControl9_GetMixingPrefs(mixer_control, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(flags == (MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_PointFiltering + | MixerPref9_RenderTargetRGB), "Got flags %#x.\n", flags); + + IVMRMixerControl9_Release(mixer_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3910,6 +3942,7 @@ START_TEST(vmr9) test_surface_allocator_notify_refcount(); test_basic_video(); test_windowless_size(); + test_mixing_prefs(); CoUninitialize(); } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 81e265f104..a716a6e712 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -84,6 +84,7 @@ struct quartz_vmr BOOL allocator_is_ex; DWORD stream_count; + DWORD mixing_prefs; /* * The Video Mixing Renderer supports 3 modes, renderless, windowless and windowed @@ -2227,7 +2228,10 @@ static HRESULT WINAPI mixer_control9_SetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %#x, stub!\n", filter, flags); - return E_NOTIMPL; + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->mixing_prefs = flags; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; } static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DWORD *flags) @@ -2236,8 +2240,9 @@ static HRESULT WINAPI mixer_control9_GetMixingPrefs(IVMRMixerControl9 *iface, DW FIXME("filter %p, flags %p, stub!\n", filter, flags); - *flags = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; - + EnterCriticalSection(&filter->renderer.filter.csFilter); + *flags = filter->mixing_prefs; + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } @@ -2500,6 +2505,9 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY + | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK;

1 0

Zhiyi Zhang : user32: Fake success for detaching adapters.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: f1e7d5bbd6e8817f7266c7144b747115a52893da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e7d5bbd6e8817f7266c714… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:39 2020 +0800 user32: Fake success for detaching adapters. It is currently unsupported. This helps later patches so that settings handlers using a new interface can be introduced without detaching adapter support, making patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 +++++++++++- dlls/winemac.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/settings.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e6f33006db..82ed851364 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3287,6 +3287,15 @@ static void trace_devmode(const DEVMODEW *devmode) TRACE("\n"); } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) */ @@ -3318,7 +3327,8 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmICMMethod)) return DISP_CHANGE_BADMODE; - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + if (is_detached_mode(devmode) || + ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 402f54982a..7d9ff2d7c6 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -765,6 +765,15 @@ static BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) * @@ -811,6 +820,12 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 5609e2b43f..70ce35361b 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -329,6 +329,15 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } +BOOL is_detached_mode(const DEVMODEW *mode) +{ + return mode->dmFields & DM_POSITION && + mode->dmFields & DM_PELSWIDTH && + mode->dmFields & DM_PELSHEIGHT && + mode->dmPelsWidth == 0 && + mode->dmPelsHeight == 0; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -364,6 +373,12 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 52057e875d..5021c71a41 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -660,6 +660,7 @@ extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int he extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN;

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandText.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 4963da2538b4c578336497d4272fabd4acee30f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4963da2538b4c578336497d4… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Wed May 27 17:19:03 2020 +0300 msado15: Implement _Command get/put CommandText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49264 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 30 +++++++++++++++++++++++------- dlls/msado15/tests/msado15.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 9081f1554f..eb7b3a035e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,9 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; - CommandTypeEnum type; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; + BSTR text; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -79,6 +80,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + heap_free( command->text ); heap_free( command ); } return ref; @@ -137,14 +139,27 @@ static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT con static HRESULT WINAPI command_get_CommandText( _Command *iface, BSTR *text ) { - FIXME( "%p, %p\n", iface, text ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + BSTR cmd_text = NULL; + + TRACE( "%p, %p\n", command, text ); + + if (command->text && !(cmd_text = SysAllocString( command->text ))) return E_OUTOFMEMORY; + *text = cmd_text; + return S_OK; } static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) { - FIXME( "%p, %s\n", iface, debugstr_w(text) ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", command, debugstr_w( text ) ); + + if (text && !(source = strdupW( text ))) return E_OUTOFMEMORY; + heap_free( command->text ); + command->text = source; + return S_OK; } static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout ) @@ -327,6 +342,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; + command->text = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b17430a93d..9834f55863 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -743,6 +743,7 @@ static void test_Command(void) Command15 *command15; Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; + BSTR cmd_text = (BSTR)"test"; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -771,6 +772,31 @@ static void test_Command(void) hr = _Command_put_CommandType( command, 0xdeadbeef ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !cmd_text, "got %s\n", wine_dbgstr_w( cmd_text )); + + hr = _Command_put_CommandText( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + cmd_text = SysAllocString( L"" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_text && !*cmd_text, "got %p\n", cmd_text ); + + cmd_text = SysAllocString( L"test" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + _Command_Release( command ); }

1 0

Henri Verbeet : wined3d: Implement pipeline statistics queries for the Vulkan adapter.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 7a03ccfbe9313eb7ccb0b050dddf570a1e5f2ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a03ccfbe9313eb7ccb0b050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:34 2020 +0430 wined3d: Implement pipeline statistics queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 6 ++++++ dlls/wined3d/query.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 45 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index af29ef7e7a..c5f2789f7f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1231,6 +1231,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_timestamp_query_pools; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + free_pools = &context_vk->free_pipeline_statistics_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1291,6 +1295,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_cleanup_resources(context_vk); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3063,6 +3068,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->active_queries); list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); + list_init(&context_vk->free_pipeline_statistics_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9179350147..3af5649990 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1408,6 +1408,21 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, pool_info.pipelineStatistics = 0; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + pool_info.queryType = VK_QUERY_TYPE_PIPELINE_STATISTICS; + pool_info.pipelineStatistics = VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_VERTICES_BIT + | VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_VERTEX_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT + | VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_CONTROL_SHADER_PATCHES_BIT + | VK_QUERY_PIPELINE_STATISTIC_TESSELLATION_EVALUATION_SHADER_INVOCATIONS_BIT + | VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1428,12 +1443,15 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk, const struct wined3d_query_pool_idx_vk *pool_idx) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_query_data_pipeline_statistics *ps_tmp; const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_query_data_pipeline_statistics *ps_result; VkResult vr; union { uint64_t occlusion; uint64_t timestamp; + struct wined3d_query_data_pipeline_statistics pipeline_statistics; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1457,6 +1475,22 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, result->timestamp = tmp.timestamp; break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + ps_result = &result->pipeline_statistics; + ps_tmp = &tmp.pipeline_statistics; + ps_result->vertices_submitted += ps_tmp->vertices_submitted; + ps_result->primitives_submitted += ps_tmp->primitives_submitted; + ps_result->vs_invocations += ps_tmp->vs_invocations; + ps_result->gs_invocations += ps_tmp->gs_invocations; + ps_result->gs_primitives += ps_tmp->gs_primitives; + ps_result->clipping_input_primitives += ps_tmp->clipping_input_primitives; + ps_result->clipping_output_primitives += ps_tmp->clipping_output_primitives; + ps_result->ps_invocations += ps_tmp->ps_invocations; + ps_result->hs_invocations += ps_tmp->hs_invocations; + ps_result->ds_invocations += ps_tmp->ds_invocations; + ps_result->cs_invocations += ps_tmp->cs_invocations; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1763,6 +1797,10 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(struct wined3d_query_data_timestamp_disjoint); break; + case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS: + data_size = sizeof(struct wined3d_query_data_pipeline_statistics); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f8c212fbf..ae78a60f2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2496,6 +2496,7 @@ struct wined3d_context_vk struct wined3d_pending_queries_vk pending_queries; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; + struct list free_pipeline_statistics_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes;

1 0

Jacek Caban : setjmp.h: Use __intrinsic_setjmpex when using ucrt.
by Alexandre Julliard May 27, 2020

May 27, 2020

Module: wine Branch: master Commit: 0413e2a523e96b70ea4e8ba598b61460b1500d75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0413e2a523e96b70ea4e8ba5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 19:13:09 2020 +0200 setjmp.h: Use __intrinsic_setjmpex when using ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 837a876820..4b73703629 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -147,6 +147,9 @@ int __cdecl _setjmp(jmp_buf); void __cdecl longjmp(jmp_buf,int); #if defined(_WIN64) && defined(__GNUC__) +# ifdef _UCRT +# define _setjmpex __intrinsic_setjmpex +# endif int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0))

1 0