wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Aric Stewart : winebus.sys: Reports for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 2b568a1148607dbd8f6259e7db3443af4aa1bdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b568a1148607dbd8f6259e7d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:37 2016 -0600 winebus.sys: Reports for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 954b021..e728b34 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -107,6 +107,7 @@ DEFINE_GUID(GUID_DEVCLASS_IOHID, 0x989D309D,0x0470,0x4E1A,0x89,0x38,0x50,0x1F,0x struct platform_private { IOHIDDeviceRef device; + uint8_t *buffer; }; static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -129,6 +130,14 @@ static DWORD CFNumberToDWORD(CFNumberRef num) return dwNum; } +static void handle_IOHIDDeviceIOHIDReportCallback(void *context, + IOReturn result, void *sender, IOHIDReportType type, + uint32_t reportID, uint8_t *report, CFIndex report_length) +{ + DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; + process_hid_report(device, report, report_length); +} + static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { struct platform_private *private = impl_from_DEVICE_OBJECT(device); @@ -192,7 +201,19 @@ static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DW static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) { - return STATUS_NOT_IMPLEMENTED; + DWORD length; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFNumberRef num; + + if (private->buffer) + return STATUS_SUCCESS; + + num = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDMaxInputReportSizeKey)); + length = CFNumberToDWORD(num); + private->buffer = HeapAlloc(GetProcessHeap(), 0, length); + + IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, device); + return STATUS_SUCCESS; } static NTSTATUS set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -250,6 +271,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * { struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->device = IOHIDDevice; + private->buffer = NULL; IoInvalidateDeviceRelations(device, BusRelations); } } @@ -258,6 +280,9 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, { DEVICE_OBJECT *device; TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); + IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); + /* Note: Yes, we leak the buffer. But according to research there is no + safe way to deallocate that buffer. */ device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) {

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_STRING for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 0d96ffbca924f6ba69a05375f2d43d0de3d7e47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d96ffbca924f6ba69a05375f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:34 2016 -0600 winebus.sys: IOCTL_HID_GET_STRING for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 50b5d76..954b021 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -88,6 +88,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ddk/hidtypes.h" #include "wine/debug.h" #include "bus.h" @@ -156,7 +157,37 @@ static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - return STATUS_NOT_IMPLEMENTED; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFStringRef str; + switch (index) + { + case HID_STRING_ID_IPRODUCT: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDProductKey)); + break; + case HID_STRING_ID_IMANUFACTURER: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDManufacturerKey)); + break; + case HID_STRING_ID_ISERIALNUMBER: + str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDSerialNumberKey)); + break; + default: + ERR("Unknown string index\n"); + return STATUS_NOT_IMPLEMENTED; + } + + if (str) + { + if (length < CFStringGetLength(str) + 1) + return STATUS_BUFFER_TOO_SMALL; + CFStringToWSTR(str, buffer, length); + } + else + { + if (!length) return STATUS_BUFFER_TOO_SMALL; + buffer[0] = 0; + } + + return STATUS_SUCCESS; } static NTSTATUS begin_report_processing(DEVICE_OBJECT *device)

1 0

Aric Stewart : winebus.sys: IOCTL_HID_GET_DEVICE_DESCRIPTOR for iohid.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 7221693538d1dfa814cf5cefd22d49f5efc8527d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7221693538d1dfa814cf5cefd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:31 2016 -0600 winebus.sys: IOCTL_HID_GET_DEVICE_DESCRIPTOR for iohid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 76db0a2..50b5d76 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -140,7 +140,18 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) { - return STATUS_NOT_IMPLEMENTED; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + CFDataRef data = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDReportDescriptorKey)); + int data_length = CFDataGetLength(data); + const UInt8 *ptr; + + *out_length = data_length; + if (length < data_length) + return STATUS_BUFFER_TOO_SMALL; + + ptr = CFDataGetBytePtr(data); + memcpy(buffer, ptr, data_length); + return STATUS_SUCCESS; } static NTSTATUS get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length)

1 0

Aric Stewart : winebus.sys: Implement removing IOHID devices.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 3b132cb9ec91b903ba3da19b019fc8b8e94b4554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b132cb9ec91b903ba3da19b0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:27 2016 -0600 winebus.sys: Implement removing IOHID devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 866241e..76db0a2 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -130,7 +130,12 @@ static DWORD CFNumberToDWORD(CFNumberRef num) static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) { - return 0; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + IOHIDDeviceRef dev2 = (IOHIDDeviceRef)platform_dev; + if (private->device != dev2) + return 1; + else + return 0; } static NTSTATUS get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) @@ -207,6 +212,18 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } } +static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) +{ + DEVICE_OBJECT *device; + TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); + device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); + if (device) + { + IoInvalidateDeviceRelations(device, RemovalRelations); + bus_remove_hid_device(device); + } +} + /* This puts the relevant run loop for event handling into a WINE thread */ static DWORD CALLBACK runloop_thread(void *args) { @@ -214,6 +231,7 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerSetDeviceMatching(hid_manager, NULL); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) { @@ -227,6 +245,7 @@ static DWORD CALLBACK runloop_thread(void *args) TRACE("Run Loop exiting\n"); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); CFRelease(hid_manager); return 1;

1 0

Aric Stewart : winebus.sys: Add OS/X IOHID bus.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 8284be37fc40657301b0ca14f26274d87d8a2b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8284be37fc40657301b0ca14f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 7 13:42:23 2016 -0600 winebus.sys: Add OS/X IOHID bus. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 3 +- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 265 +++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 3 + 4 files changed, 271 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8284be37fc40657301b0c…

1 0

Huw Davies : rsaenh/tests: Skip broken TLS1 tests on Windows 8 and greater.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 0a17b701403411804d401416aff970a229b517f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a17b701403411804d401416a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 7 17:03:47 2016 +0000 rsaenh/tests: Skip broken TLS1 tests on Windows 8 and greater. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index ebdbba8..4286db0 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2801,8 +2801,18 @@ static void test_schannel_provider(void) if (!result) return; result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); - ok (result, "%08x\n", GetLastError()); - if (!result) return; + ok (result || + broken(!result), /* Windows 8 and greater */ + "%08x\n", GetLastError()); + if (!result) + { + win_skip("Broken TLS1 hash creation\n"); + CryptDestroyKey(hRSAKey); + CryptDestroyKey(hMasterSecret); + CryptReleaseContext(hProv, 0); + CryptAcquireContextA(&hProv, NULL, NULL, PROV_RSA_SCHANNEL, CRYPT_DELETEKEYSET); + return; + } /* Deriving the server write encryption key from the master hash can't * succeed before the encryption key algorithm is set.

1 0

Andrey Gusev : api-ms-win-dx-d3dkmt-l1-1-0: Add dll.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: d4fab3b42b485e403ef67099c4a90b6a9d36be26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fab3b42b485e403ef67099c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 8 14:56:39 2016 +0200 api-ms-win-dx-d3dkmt-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in | 1 + .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 97 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 102 insertions(+) diff --git a/configure b/configure index 663677e..3e183c2 100755 --- a/configure +++ b/configure @@ -1004,6 +1004,7 @@ enable_api_ms_win_downlevel_shlwapi_l1_1_0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 +enable_api_ms_win_dx_d3dkmt_l1_1_0 enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_consumer_l1_1_0 enable_api_ms_win_eventing_controller_l1_1_0 @@ -17710,6 +17711,7 @@ wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlev wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 +wine_fn_config_dll api-ms-win-dx-d3dkmt-l1-1-0 enable_api_ms_win_dx_d3dkmt_l1_1_0 wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-consumer-l1-1-0 enable_api_ms_win_eventing_consumer_l1_1_0 wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_eventing_controller_l1_1_0 diff --git a/configure.ac b/configure.ac index 6c8d671..8fb0de1 100644 --- a/configure.ac +++ b/configure.ac @@ -2781,6 +2781,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-dx-d3dkmt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-consumer-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in new file mode 100644 index 0000000..02499fa --- /dev/null +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-dx-d3dkmt-l1-1-0.dll diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec new file mode 100644 index 0000000..15a2d1d --- /dev/null +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -0,0 +1,97 @@ +@ stub D3DKMTAcquireKeyedMutex +@ stub D3DKMTAcquireKeyedMutex2 +@ stub D3DKMTCacheHybridQueryValue +@ stub D3DKMTCheckExclusiveOwnership +@ stub D3DKMTCheckMonitorPowerState +@ stub D3DKMTCheckOcclusion +@ stub D3DKMTCheckSharedResourceAccess +@ stub D3DKMTCheckVidPnExclusiveOwnership +@ stub D3DKMTCloseAdapter +@ stub D3DKMTConfigureSharedResource +@ stub D3DKMTCreateAllocation +@ stub D3DKMTCreateAllocation2 +@ stub D3DKMTCreateContext +@ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory +@ stub D3DKMTCreateDevice +@ stub D3DKMTCreateKeyedMutex +@ stub D3DKMTCreateKeyedMutex2 +@ stub D3DKMTCreateOutputDupl +@ stub D3DKMTCreateOverlay +@ stub D3DKMTCreateSynchronizationObject +@ stub D3DKMTCreateSynchronizationObject2 +@ stub D3DKMTDestroyAllocation +@ stub D3DKMTDestroyContext +@ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory +@ stub D3DKMTDestroyDevice +@ stub D3DKMTDestroyKeyedMutex +@ stub D3DKMTDestroyOutputDupl +@ stub D3DKMTDestroyOverlay +@ stub D3DKMTDestroySynchronizationObject +@ stdcall D3DKMTEscape(ptr) gdi32.D3DKMTEscape +@ stub D3DKMTFlipOverlay +@ stub D3DKMTGetCachedHybridQueryValue +@ stub D3DKMTGetContextSchedulingPriority +@ stub D3DKMTGetDeviceState +@ stub D3DKMTGetDisplayModeList +@ stub D3DKMTGetMultisampleMethodList +@ stub D3DKMTGetOverlayState +@ stub D3DKMTGetPresentHistory +@ stub D3DKMTGetPresentQueueEvent +@ stub D3DKMTGetProcessSchedulingPriorityClass +@ stub D3DKMTGetRuntimeData +@ stub D3DKMTGetScanLine +@ stub D3DKMTGetSharedPrimaryHandle +@ stub D3DKMTGetSharedResourceAdapterLuid +@ stub D3DKMTInvalidateActiveVidPn +@ stub D3DKMTLock +@ stub D3DKMTOfferAllocations +@ stub D3DKMTOpenAdapterFromDeviceName +@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc +@ stub D3DKMTOpenKeyedMutex +@ stub D3DKMTOpenKeyedMutex2 +@ stub D3DKMTOpenNtHandleFromName +@ stub D3DKMTOpenResource +@ stub D3DKMTOpenResource2 +@ stub D3DKMTOpenResourceFromNtHandle +@ stub D3DKMTOpenSynchronizationObject +@ stub D3DKMTOpenSyncObjectFromNtHandle +@ stub D3DKMTOutputDuplGetFrameInfo +@ stub D3DKMTOutputDuplGetMetaData +@ stub D3DKMTOutputDuplGetPointerShapeData +@ stub D3DKMTOutputDuplPresent +@ stub D3DKMTOutputDuplReleaseFrame +@ stub D3DKMTPollDisplayChildren +@ stub D3DKMTPresent +@ stub D3DKMTQueryAdapterInfo +@ stub D3DKMTQueryAllocationResidency +@ stub D3DKMTQueryRemoteVidPnSourceFromGdiDisplayName +@ stub D3DKMTQueryResourceInfo +@ stub D3DKMTQueryResourceInfoFromNtHandle +@ stub D3DKMTQueryStatistics +@ stub D3DKMTReclaimAllocations +@ stub D3DKMTReleaseKeyedMutex +@ stub D3DKMTReleaseKeyedMutex2 +@ stub D3DKMTReleaseProcessVidPnSourceOwners +@ stub D3DKMTRender +@ stub D3DKMTSetAllocationPriority +@ stub D3DKMTSetContextSchedulingPriority +@ stub D3DKMTSetDisplayMode +@ stub D3DKMTSetDisplayPrivateDriverFormat +@ stub D3DKMTSetGammaRamp +@ stub D3DKMTSetProcessSchedulingPriorityClass +@ stub D3DKMTSetQueuedLimit +@ stub D3DKMTSetStereoEnabled +@ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTSharedPrimaryLockNotification +@ stub D3DKMTSharedPrimaryUnLockNotification +@ stub D3DKMTShareObjects +@ stub D3DKMTSignalSynchronizationObject +@ stub D3DKMTSignalSynchronizationObject2 +@ stub D3DKMTUnlock +@ stub D3DKMTUpdateOverlay +@ stub D3DKMTWaitForIdle +@ stub D3DKMTWaitForSynchronizationObject +@ stub D3DKMTWaitForSynchronizationObject2 +@ stub D3DKMTWaitForVerticalBlankEvent +@ stdcall GdiEntry13() gdi32.GdiEntry13 diff --git a/tools/make_specfiles b/tools/make_specfiles index 13e7bba..fc3bb5e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -293,6 +293,7 @@ my @dll_groups = ], [ "gdi32", + "api-ms-win-dx-d3dkmt-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0",

1 0

Józef Kucia : d3d8/tests: Accept broken behavior for lost device tests.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: a291270d5c44897e033e7dc52ac2a8525d305224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a291270d5c44897e033e7dc52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:51 2016 +0100 d3d8/tests: Accept broken behavior for lost device tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a912592..2b38f17 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7593,18 +7593,19 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + /* The device is not lost on Windows 10. */ + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_TestCooperativeLevel(device); - ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICENOTRESET || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = reset_device(device, &device_desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -7639,14 +7640,15 @@ static void test_lost_device(void) hr = reset_device(device, &device_desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + /* The device is not lost on Windows 10. */ + todo_wine ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = reset_device(device, &device_desc); - ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST || broken(hr == D3D_OK), "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); ret = SetForegroundWindow(window);

1 0

Józef Kucia : d3d11/tests: Fix test failures in test_render_target_views().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: b4e334db5182cc68042c1c5e983034385dd0a329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e334db5182cc68042c1c5e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:50 2016 +0100 d3d11/tests: Fix test failures in test_render_target_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7ae4bd1..54df386 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6312,7 +6312,8 @@ static void test_render_target_views(void) ID3D11RenderTargetView *rtv; ID3D11Texture2D *texture; ID3D11Device *device; - unsigned int i, j; + unsigned int i, j, k; + void *data; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -6331,6 +6332,9 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + ok(!!data, "Failed to allocate memory.\n"); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { const struct test *test = &tests[i]; @@ -6346,6 +6350,17 @@ static void test_render_target_views(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + for (j = 0; j < texture_desc.ArraySize; ++j) + { + for (k = 0; k < texture_desc.MipLevels; ++k) + { + unsigned int sub_resource_idx = j * texture_desc.MipLevels + k; + ID3D11DeviceContext_UpdateSubresource(context, + (ID3D11Resource *)texture, sub_resource_idx, NULL, data, texture_desc.Width * 4, 0); + } + } + check_texture_color(texture, 0, 0); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); draw_color_quad(&test_context, &red); @@ -6358,6 +6373,7 @@ static void test_render_target_views(void) ID3D11Texture2D_Release(texture); } + HeapFree(GetProcessHeap(), 0, data); release_test_context(&test_context); }

1 0

Józef Kucia : d3d10core/tests: Fix test failures in test_render_target_views().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 9bb2c987fb8e78afd3d579220dc2ee65e69283d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb2c987fb8e78afd3d579220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:49 2016 +0100 d3d10core/tests: Fix test failures in test_render_target_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9f98850..e617319 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2407,7 +2407,8 @@ static void test_render_target_views(void) ID3D10RenderTargetView *rtv; ID3D10Texture2D *texture; ID3D10Device *device; - unsigned int i, j; + unsigned int i, j, k; + void *data; HRESULT hr; if (!init_test_context(&test_context)) @@ -2425,6 +2426,9 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + ok(!!data, "Failed to allocate memory.\n"); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { const struct test *test = &tests[i]; @@ -2440,6 +2444,17 @@ static void test_render_target_views(void) hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + for (j = 0; j < texture_desc.ArraySize; ++j) + { + for (k = 0; k < texture_desc.MipLevels; ++k) + { + unsigned int sub_resource_idx = j * texture_desc.MipLevels + k; + ID3D10Device_UpdateSubresource(device, + (ID3D10Resource *)texture, sub_resource_idx, NULL, data, texture_desc.Width * 4, 0); + } + } + check_texture_color(texture, 0, 0); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_color_quad(&test_context, &red); @@ -2452,6 +2467,7 @@ static void test_render_target_views(void) ID3D10Texture2D_Release(texture); } + HeapFree(GetProcessHeap(), 0, data); release_test_context(&test_context); }

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
47
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 November 2016