wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

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

27 May '20

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

Gijs Vermeulen : include: Add cfg.h.
by Alexandre Julliard 27 May '20

27 May '20

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

Arkadiusz Hiler : user32: Fix NULL dereference in UnregisterDeviceNotification.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 65e550d265c481ff80d796622258c7177b36d745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e550d265c481ff80d79662… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:36 2020 +0300 user32: Fix NULL dereference in UnregisterDeviceNotification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49211 Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/service.c | 3 +++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 924a6c9264..68d2b9e78e 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -2109,6 +2109,9 @@ BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) TRACE("%p\n", handle); + if (!handle) + return FALSE; + EnterCriticalSection( &service_cs ); list_remove( &registration->entry ); LeaveCriticalSection(&service_cs); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 92b18becd2..913fabfbd8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3004,6 +3004,12 @@ static void test_GetPointerType(void) ok(type == PT_MOUSE, " type %d\n", type ); } +static void test_UnregisterDeviceNotification(void) +{ + BOOL ret = UnregisterDeviceNotification(NULL); + ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret); +} + START_TEST(input) { POINT pos; @@ -3050,4 +3056,6 @@ START_TEST(input) test_GetPointerType(); else win_skip("GetPointerType is not available\n"); + + test_UnregisterDeviceNotification(); }

1 0

Arkadiusz Hiler : user32: Move *RegisterDeviceNotification*() to input.c.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8091922d9af2ae82bea37c7dbc26776c1407252a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8091922d9af2ae82bea37c7d… Author: Arkadiusz Hiler <arek(a)hiler.eu> Date: Tue May 26 23:01:35 2020 +0300 user32: Move *RegisterDeviceNotification*() to input.c. Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 69 ----------------------------------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 2f8648f177..1dd43a36a1 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -45,6 +45,7 @@ #include "winerror.h" #include "win.h" #include "user_private.h" +#include "dbt.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1298,3 +1299,71 @@ BOOL WINAPI EnableMouseInPointer(BOOL enable) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); + return 0; +} + +static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + FIXME("Support for service handles is not yet implemented!\n"); + return 0; +} + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ); +extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); + +/*********************************************************************** + * RegisterDeviceNotificationA (USER32.@) + * + * See RegisterDeviceNotificationW. + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +{ + TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", + hRecipient,pNotificationFilter,dwFlags); + if (pNotificationFilter) + FIXME("The notification filter will requires an A->W when filter support is implemented\n"); + return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); +} + +/*********************************************************************** + * RegisterDeviceNotificationW (USER32.@) + */ +HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) +{ + struct device_notification_details details; + + TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + + if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) + FIXME("unhandled flags %#x\n", flags); + + details.handle = handle; + + if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) + details.cb = devnotify_service_callback; + else + details.cb = devnotify_window_callback; + + return I_ScRegisterDeviceNotification( &details, filter, 0 ); +} + +/*********************************************************************** + * UnregisterDeviceNotification (USER32.@) + */ +BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + TRACE("%p\n", handle); + + return I_ScUnregisterDeviceNotification( handle ); +} diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 41909f9071..59b85baa58 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -31,7 +31,6 @@ #include "wingdi.h" #include "controls.h" #include "user_private.h" -#include "dbt.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -279,74 +278,6 @@ DWORD WINAPI RegisterTasklist (DWORD x) return TRUE; } -static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); - return 0; -} - -static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) -{ - FIXME("Support for service handles is not yet implemented!\n"); - return 0; -} - -struct device_notification_details -{ - DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); - HANDLE handle; -}; - -extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, - void *filter, DWORD flags ); -extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); - -/*********************************************************************** - * RegisterDeviceNotificationA (USER32.@) - * - * See RegisterDeviceNotificationW. - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) -{ - TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", - hRecipient,pNotificationFilter,dwFlags); - if (pNotificationFilter) - FIXME("The notification filter will requires an A->W when filter support is implemented\n"); - return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); -} - -/*********************************************************************** - * RegisterDeviceNotificationW (USER32.@) - */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) -{ - struct device_notification_details details; - - TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); - - if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) - FIXME("unhandled flags %#x\n", flags); - - details.handle = handle; - - if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) - details.cb = devnotify_service_callback; - else - details.cb = devnotify_window_callback; - - return I_ScRegisterDeviceNotification( &details, filter, 0 ); -} - -/*********************************************************************** - * UnregisterDeviceNotification (USER32.@) - */ -BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) -{ - TRACE("%p\n", handle); - - return I_ScUnregisterDeviceNotification( handle ); -} - /*********************************************************************** * GetAppCompatFlags (USER32.@) */

1 0

Jacek Caban : winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 6a05b84ecaf6fa1f3343011351f9bdd2e4e5eaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a05b84ecaf6fa1f33430113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 20:19:04 2020 +0200 winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds. Based on mingw-w64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index ae9177842b..34951766dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2675,6 +2675,13 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } +#elif defined(__arm__) && defined(__MINGW32__) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); + return teb; +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

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

27 May '20

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

Henri Verbeet : wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding the Vulkan index buffer.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 5d1fc2580819a3855248fbce94b46ff4b65f1e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d1fc2580819a3855248fbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:37 2020 +0430 wined3d: Use wined3d_buffer_vk_get_buffer_info() when binding the Vulkan index buffer. Since it updates "bo_user.valid". Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 5ca22bd113..5cb04310d6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2920,16 +2920,18 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { - struct wined3d_bo_vk *bo = &wined3d_buffer_vk(state->index_buffer)->bo; + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(state->index_buffer); + const VkDescriptorBufferInfo *buffer_info; VkIndexType idx_type; if (state->index_format == WINED3DFMT_R16_UINT) idx_type = VK_INDEX_TYPE_UINT16; else idx_type = VK_INDEX_TYPE_UINT32; - wined3d_context_vk_reference_bo(context_vk, bo); - VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + state->index_offset, idx_type)); + buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); + VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, + buffer_info->offset + state->index_offset, idx_type)); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL))

1 0

Henri Verbeet : wined3d: Also load the index buffer in wined3d_context_vk_apply_draw_state() if STATE_INDEXBUFFER was invalidated.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 2d22715561c1d4cb472a8aa0fc47eb4e203d90d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d22715561c1d4cb472a8aa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:36 2020 +0430 wined3d: Also load the index buffer in wined3d_context_vk_apply_draw_state() if STATE_INDEXBUFFER was invalidated. Otherwise we might try to bind a NULL buffer if the index buffer was not previously loaded. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c5f2789f7f..5ca22bd113 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2878,7 +2878,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_invalidate_state(&context_vk->c, STATE_STREAMSRC); } - if (indexed) + if (indexed || (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer)) { wined3d_buffer_load(state->index_buffer, &context_vk->c, state); if (!wined3d_buffer_vk(state->index_buffer)->bo_user.valid)

1 0

Henri Verbeet : wined3d: Map vkGetPhysicalDeviceFeatures2() to vkGetPhysicalDeviceFeatures2KHR().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 3da7d9d6bcebd6e07a9e2515766d2a4fa21f3122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3da7d9d6bcebd6e07a9e2515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 27 20:43:35 2020 +0430 wined3d: Map vkGetPhysicalDeviceFeatures2() to vkGetPhysicalDeviceFeatures2KHR(). Instead of to vkGetPhysicalDeviceFeaturess2KHR(), which doesn't typically exist. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3cccda3b2c..f8929ddf1f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1963,7 +1963,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!vk_ops->core_pfn) \ vk_ops->core_pfn = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #ext_pfn)); MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR) - MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeaturess2KHR) + MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeatures2KHR) #undef MAP_INSTANCE_FUNCTION vk_info->instance = instance;

1 0

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

27 May '20

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

← Newer
1
...
8
9
10
11
12
13
14
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020