- wine-devel - winehq.org

[PATCH] gdi32: add D3DKMTCloseAdapter stub
by Louis Lenders 08 Mar '19

08 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) 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 index 405afb986f..e8aa38edf4 100644 --- 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 @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73f59..063e7554a2 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1253,3 +1253,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const void *pData ) +{ + FIXME("(%p): stub\n", pData); + return STATUS_NO_MEMORY; +} \ No newline at end of file diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e887..6e8f0285f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) -- 2.20.1

2 1

[PATCH] Add support for ast locale
by Enol Puente 08 Mar '19

08 Mar '19

2 1

[PATCH] wtsapi32: Partial implementation of WTSEnumerateProcessesW.
by Vijay Kiran Kamuju 08 Mar '19

08 Mar '19

Added fixme for partial implementation From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29903 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wtsapi32/tests/wtsapi.c | 1 - dlls/wtsapi32/wtsapi32.c | 79 ++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..5b4e28a1a3 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -85,7 +85,6 @@ static void test_WTSEnumerateProcessesW(void) { found = found || !lstrcmpW(pname, info[i].pProcessName); } - todo_wine ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname)); WTSFreeMemory(info); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf9215fd..92effe7528 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -18,8 +18,11 @@ #include "config.h" #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -94,7 +97,15 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + WTS_PROCESS_INFOW *processInfo; + SYSTEM_PROCESS_INFORMATION *spi; + ULONG size = 0x4000; + void *buf = NULL; + NTSTATUS status; + DWORD count; + WCHAR *name; + + FIXME("(%p 0x%08x 0x%08x %p %p) Partial stub.\n", hServer, Reserved, Version, ppProcessInfo, pCount); if (!ppProcessInfo || !pCount || Reserved != 0 || Version != 1) @@ -103,9 +114,71 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version return FALSE; } - *pCount = 0; - *ppProcessInfo = NULL; + if (hServer != WTS_CURRENT_SERVER_HANDLE) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + do + { + size *= 2; + HeapFree(GetProcessHeap(), 0, buf); + buf = HeapAlloc(GetProcessHeap(), 0, size); + if (!buf) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL); + } + while (status == STATUS_INFO_LENGTH_MISMATCH); + + if (status != STATUS_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, buf); + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + spi = buf; + count = size = 0; + for (;;) + { + size += sizeof(WTS_PROCESS_INFOW) + spi->ProcessName.Length + sizeof(WCHAR); + count++; + if (spi->NextEntryOffset == 0) break; + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); + } + + processInfo = HeapAlloc(GetProcessHeap(), 0, size); + if (!processInfo) + { + HeapFree(GetProcessHeap(), 0, buf); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + name = (WCHAR *)&processInfo[count]; + + *ppProcessInfo = processInfo; + *pCount = count; + + spi = buf; + while (count--) + { + processInfo->SessionId = 0; + processInfo->ProcessId = HandleToUlong(spi->UniqueProcessId); + processInfo->pProcessName = name; + processInfo->pUserSid = NULL; + memcpy( name, spi->ProcessName.Buffer, spi->ProcessName.Length ); + name[ spi->ProcessName.Length/sizeof(WCHAR) ] = 0; + + processInfo++; + name += (spi->ProcessName.Length + sizeof(WCHAR))/sizeof(WCHAR); + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); + } + HeapFree(GetProcessHeap(), 0, buf); return TRUE; } -- 2.21.0

1 0

[PATCH 1/6] include: Add major media types GUIDs for Media Foundation.
by Nikolay Sivov 08 Mar '19

08 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfapi.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 0c5162755d..f8414b73ff 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -88,8 +88,6 @@ DEFINE_GUID(MF_MT_MAJOR_TYPE, 0x48eba18e, 0xf8c9, 0x4687, 0xbf, 0x11, 0 DEFINE_GUID(MF_MT_PIXEL_ASPECT_RATIO, 0xc6376a1e, 0x8d0a, 0x4027, 0xbe, 0x45, 0x6d, 0x9a, 0x0a, 0xd3, 0x9b, 0xb6); DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0xcb, 0x29, 0xd7, 0x2c, 0x35, 0xe5); -DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); - DEFINE_GUID(MFT_CATEGORY_VIDEO_DECODER, 0xd6c02d4b, 0x6833, 0x45b4, 0x97, 0x1a, 0x05, 0xa4, 0xb0, 0x4b, 0xab, 0x91); DEFINE_GUID(MFT_CATEGORY_VIDEO_ENCODER, 0xf79eac7d, 0xe545, 0x4387, 0xbd, 0xee, 0xd6, 0x47, 0xd7, 0xbd, 0xe4, 0x2a); DEFINE_GUID(MFT_CATEGORY_VIDEO_EFFECT, 0x12e17c21, 0x532c, 0x4a6e, 0x8a, 0x1c, 0x40, 0x82, 0x5a, 0x73, 0x63, 0x97); @@ -101,6 +99,21 @@ DEFINE_GUID(MFT_CATEGORY_AUDIO_EFFECT, 0x11064c48, 0x3648, 0x4ed0, 0x93, 0x2e DEFINE_GUID(MFT_CATEGORY_VIDEO_PROCESSOR, 0x302ea3fc, 0xaa5f, 0x47f9, 0x9f, 0x7a, 0xc2, 0x18, 0x8b, 0xb1, 0x63, 0x02); DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57, 0xb7ea, 0x4901, 0xae, 0xb3, 0x93, 0x3a, 0x87, 0x47, 0x75, 0x6f); +DEFINE_GUID(MFMediaType_Audio, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(MFMediaType_Binary, 0x72178c25, 0xe45b, 0x11d5, 0xbc, 0x2a, 0x00, 0xb0, 0xd0, 0xf3, 0xf4, 0xab); +DEFINE_GUID(MFMediaType_Default, 0x81a412e6, 0x8103, 0x4b06, 0x85, 0x7f, 0x18, 0x62, 0x78, 0x10, 0x24, 0xac); +DEFINE_GUID(MFMediaType_FileTransfer, 0x72178c26, 0xe45b, 0x11d5, 0xbc, 0x2a, 0x00, 0xb0, 0xd0, 0xf3, 0xf4, 0xab); +DEFINE_GUID(MFMediaType_HTML, 0x72178c24, 0xe45b, 0x11d5, 0xbc, 0x2a, 0x00, 0xb0, 0xd0, 0xf3, 0xf4, 0xab); +DEFINE_GUID(MFMediaType_Image, 0x72178c23, 0xe45b, 0x11d5, 0xbc, 0x2a, 0x00, 0xb0, 0xd0, 0xf3, 0xf4, 0xab); +DEFINE_GUID(MFMediaType_MultiplexedFrames, 0x6ea542b0, 0x281f, 0x4231, 0xa4, 0x64, 0xfe, 0x2f, 0x50, 0x22, 0x50, 0x1c); +DEFINE_GUID(MFMediaType_Perception, 0x597ff6f9, 0x6ea2, 0x4670, 0x85, 0xb4, 0xea, 0x84, 0x07, 0x3f, 0xe9, 0x40); +DEFINE_GUID(MFMediaType_Protected, 0x7b4b6fe6, 0x9d04, 0x4494, 0xbe, 0x14, 0x7e, 0x0b, 0xd0, 0x76, 0xc8, 0xe4); +DEFINE_GUID(MFMediaType_SAMI, 0xe69669a0, 0x3dcd, 0x40cb, 0x9e, 0x2e, 0x37, 0x08, 0x38, 0x7c, 0x06, 0x16); +DEFINE_GUID(MFMediaType_Script, 0x72178c22, 0xe45b, 0x11d5, 0xbc, 0x2a, 0x00, 0xb0, 0xd0, 0xf3, 0xf4, 0xab); +DEFINE_GUID(MFMediaType_Stream, 0xe436eb83, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70); +DEFINE_GUID(MFMediaType_Subtitle, 0xa6d13581, 0xed50, 0x4e65, 0xae, 0x08, 0x26, 0x06, 0x55, 0x76, 0xaa, 0xcc); +DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum -- 2.20.1

2 6

[PATCH v2 1/7] explorer: Create primary adapter key if user driver didn't create it.
by Zhiyi Zhang 08 Mar '19

08 Mar '19

This primary adapter key aims to replace the Atom mechanism currently used to store what registry key the primary adapter is using. This way we can let user drivers create the GUIDs for adapters if it's supported without treating primary adapter differently. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix tests. Supersede 160033~160039. dlls/user32/tests/monitor.c | 4 +-- programs/explorer/desktop.c | 64 ++++++++++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8bf284a5e1..4f7e4c2287 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -107,7 +107,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de { sprintf(video_name, "\\Device\\Video%d", index); ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); if (!ls) { memset(video_value, 0, sizeof(video_value)); @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24901..97fc7a219d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -775,6 +775,13 @@ static BOOL get_default_enable_shell( const WCHAR *name ) static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR device_video_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -793,6 +800,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; + DWORD disposition = 0; char error[80]; if (!driver) @@ -832,25 +840,51 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) + /* Create HKLM\HARDWARE\DEVICEMAP\VIDEO key if user drivers didn't do it */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, + &disposition )) { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + /* User driver did create it. Nothing to do */ + if (disposition != REG_CREATED_NEW_KEY) + { + RegCloseKey( hkey ); + return module; + } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + + strcpyW( buffer, device_video_prefixW ); + strcatW( buffer, key); + + TRACE( "primary adapter key %s\n", wine_dbgstr_w(buffer) ); + /* Set \Device\Video0 value data in HKLM\HARDWARE\DEVICEMAP\VIDEO key */ + if (RegSetValueExW( hkey, device_video0W, 0, REG_SZ, + (const BYTE *)(buffer), (strlenW( buffer ) + 1) * sizeof(WCHAR)) ) + { + ERR("Failed to set primary video value, display related functions may not function properly\n"); + RegCloseKey( hkey ); + return module; + } - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, - REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) - { - if (module) - RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); - else - RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); + + /* Create primary adapter key SYSTEM\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, + REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) + { + if (module) + { + GetModuleFileNameW( module, buffer, MAX_PATH ); + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, + (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); + } + else + RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen( error ) + 1 ); + RegCloseKey( hkey ); + } } return module; -- 2.20.1

2 4

[PATCH] mfplat: Unlock section after finishing.
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index afdb525dea..455294787e 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -521,7 +521,7 @@ static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) EnterCriticalSection(&sample->cs); *count = sample->buffer_count; - EnterCriticalSection(&sample->cs); + LeaveCriticalSection(&sample->cs); return S_OK; } -- 2.20.1

1 0

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 08 Mar '19

08 Mar '19

1 0

[PATCH v3 1/6] quartz/tests: Add some tests for AVI decompressor pin interfaces.
by Zebediah Figura 08 Mar '19

08 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avidec.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 05065446f1..330d292f0f 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -61,6 +61,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_avi_dec(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -80,6 +81,30 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } -- 2.20.1

1 5

[PATCH v2 4/4] opencl: Add OpenCL 1.1 implementation.
by Nakarin Khankham 08 Mar '19

08 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- dlls/opencl/opencl.c | 192 ++++++++++++++++++++++++++++++++++++++++ dlls/opencl/opencl.spec | 10 +++ 2 files changed, 202 insertions(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 9ea96a5e3a..fb997df439 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -196,6 +196,28 @@ static cl_int (*pclEnqueueBarrier)(cl_command_queue command_queue); /* Extension function access */ static void * (*pclGetExtensionFunctionAddress)(const char * func_name); +/* OpenCL 1.1 functions */ +static cl_mem (*pclCreateSubBuffer)(cl_mem buffer, cl_mem_flags flags, + cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret); +static cl_event (*pclCreateUserEvent)(cl_context context, cl_int * errcode_ret); +static cl_int (*pclEnqueueCopyBufferRect)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t * src_origin, const size_t * dst_origin, const size_t * region, + size_t src_row_pitch, size_t src_slice_pitch, + size_t dst_row_pitch, size_t dst_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueReadBufferRect)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteBufferRect)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclSetEventCallback)(cl_event event, cl_int command_exec_callback_type, + void WINAPI (*pfn_notify)(cl_event, cl_int, void *), void *user_data); +static cl_int (*pclSetMemObjectDestructorCallback)(cl_mem memobj, void WINAPI(*pfn_notify)(cl_mem, void*), void *user_data); +static cl_int (*pclSetUserEventStatus)(cl_event event, cl_int execution_status); + static BOOL init_opencl(void); static BOOL load_opencl_func(void); @@ -358,6 +380,18 @@ static BOOL load_opencl_func(void) /* Extension function access */ LOAD_FUNCPTR(clGetExtensionFunctionAddress); + /* OpenCL 1.1 functions */ +#ifdef CL_VERSION_1_1 + LOAD_FUNCPTR(clCreateSubBuffer); + LOAD_FUNCPTR(clCreateUserEvent); + LOAD_FUNCPTR(clEnqueueCopyBufferRect); + LOAD_FUNCPTR(clEnqueueReadBufferRect); + LOAD_FUNCPTR(clEnqueueWriteBufferRect); + LOAD_FUNCPTR(clSetEventCallback); + LOAD_FUNCPTR(clSetMemObjectDestructorCallback); + LOAD_FUNCPTR(clSetUserEventStatus); +#endif + #undef LOAD_FUNCPTR return TRUE; @@ -648,6 +682,20 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t return ret; } +cl_mem WINAPI wine_clCreateSubBuffer(cl_mem buffer, cl_mem_flags flags, + cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret) +{ + cl_mem ret; + TRACE("\n"); + if (!pclCreateSubBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateSubBuffer(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret); + return ret; +} + cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_image_format * image_format, size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret) { @@ -725,6 +773,45 @@ cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t return ret; } +typedef struct +{ + void WINAPI (*pfn_notify)(cl_mem memobj, void* user_data); + void *user_data; +} MEM_CALLBACK; + +static void WINAPI mem_fn_notify(cl_mem memobj, void* user_data) +{ + MEM_CALLBACK *pcb; + FIXME("(%p, %p)\n", memobj, user_data); + pcb = (MEM_CALLBACK *) user_data; + if(pcb->pfn_notify) pcb->pfn_notify(memobj, pcb->user_data); + FIXME("Callback COMPLETED\n"); +} + +cl_int WINAPI wine_clSetMemObjectDestructorCallback(cl_mem memobj, void WINAPI (*pfn_notify)(cl_mem, void*), void *user_data) +{ + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %p, %p)\n", memobj, pfn_notify, user_data); + if (!pclSetMemObjectDestructorCallback) return CL_INVALID_VALUE; + if(pfn_notify) + { + /* When pfn_notify is provided, clSetMemObjectDestructorCallback is asynchronous */ + MEM_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(MEM_CALLBACK)); + pcb->pfn_notify = pfn_notify; + pcb->user_data = user_data; + ret = pclSetMemObjectDestructorCallback(memobj, mem_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetMemObjectDestructorCallback is synchronous */ + ret = pclSetMemObjectDestructorCallback(memobj, NULL, user_data); + } + FIXME("(%p, %p, %p)=%d\n", memobj, pfn_notify, user_data, ret); + return ret; +} + /*---------------------------------------------------------------*/ /* Sampler APIs */ @@ -1009,6 +1096,68 @@ cl_int WINAPI wine_clReleaseEvent(cl_event event) return ret; } +cl_event WINAPI wine_clCreateUserEvent(cl_context context, cl_int * errcode_ret) +{ + cl_event ret; + TRACE("\n"); + if (!pclCreateUserEvent) + { + *errcode_ret = CL_INVALID_CONTEXT; + return NULL; + } + ret = pclCreateUserEvent(context, errcode_ret); + return ret; +} + +typedef struct +{ + void WINAPI (*pfn_notify)(cl_event event, cl_int num, void* user_data); + void *user_data; +} EVENT_CALLBACK; + +static void WINAPI event_fn_notify(cl_event event, cl_int num, void* user_data) +{ + EVENT_CALLBACK *ecb; + FIXME("(%p, %d, %p)\n", event, num, user_data); + ecb = (EVENT_CALLBACK *) user_data; + if(ecb->pfn_notify) ecb->pfn_notify(event, num, ecb->user_data); + FIXME("Callback COMPLETED\n"); +} + +cl_int WINAPI wine_clSetEventCallback(cl_event event, cl_int command_exec_callback_type, + void WINAPI (*pfn_notify)(cl_event, cl_int, void *), void *user_data) +{ + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %d, %p, %p)\n", event, command_exec_callback_type, pfn_notify, user_data); + if (!pclSetEventCallback) return CL_INVALID_EVENT; + if(pfn_notify) + { + /* When pfn_notify is provided, clSetEventCallback is asynchronous */ + EVENT_CALLBACK *ecb; + ecb = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENT_CALLBACK)); + ecb->pfn_notify = pfn_notify; + ecb->user_data = user_data; + ret = pclSetEventCallback(event, command_exec_callback_type, event_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetEventCallback is synchronous */ + ret = pclSetEventCallback(event, command_exec_callback_type, NULL, user_data); + } + FIXME("(%p, %d, %p, %p)=%d\n", event, command_exec_callback_type, pfn_notify, user_data, ret); + return ret; +} + +cl_int WINAPI wine_clSetUserEventStatus(cl_event event, cl_int execution_status) +{ + cl_int ret; + TRACE("\n"); + if (!pclSetUserEventStatus) return CL_INVALID_EVENT; + ret = pclSetUserEventStatus(event, execution_status); + return ret; +} + /*---------------------------------------------------------------*/ /* Profiling APIs */ @@ -1062,6 +1211,21 @@ cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem bu return ret; } +cl_int WINAPI wine_clEnqueueReadBufferRect(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueReadBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueReadBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t cb, const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -1073,6 +1237,21 @@ cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem b return ret; } +cl_int WINAPI wine_clEnqueueWriteBufferRect( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueWriteBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueWriteBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -1084,6 +1263,19 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr return ret; } +cl_int WINAPI wine_clEnqueueCopyBufferRect(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t * src_origin, const size_t * dst_origin, const size_t * region, + size_t src_row_pitch, size_t src_slice_pitch, + size_t dst_row_pitch, size_t dst_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ + cl_int ret; + TRACE("\n"); + if (!pclEnqueueCopyBufferRect) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBufferRect(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event); + return ret; +} + cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t * origin, const size_t * region, SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index ba8ce6e7cd..4782653f3d 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -94,3 +94,13 @@ # @ stdcall clGetGLTextureInfo( long long long ptr ptr ) wine_clGetGLTextureInfo # @ stdcall clEnqueueAcquireGLObjects( long long ptr long ptr ptr ) wine_clEnqueueAcquireGLObjects # @ stdcall clEnqueueReleaseGLObjects( long long ptr long ptr ptr ) wine_clEnqueueReleaseGLObjects + +# OpenCL 1.1 +@ stdcall clCreateSubBuffer( long long long ptr ptr ) wine_clCreateSubBuffer +@ stdcall clCreateUserEvent( long ptr ) wine_clCreateUserEvent +@ stdcall clEnqueueCopyBufferRect( long long long ptr ptr ptr long long long long long ptr ptr ) wine_clEnqueueCopyBufferRect +@ stdcall clEnqueueReadBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueReadBufferRect +@ stdcall clEnqueueWriteBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueWriteBufferRect +@ stdcall clSetEventCallback( long long ptr ptr ) wine_clSetEventCallback +@ stdcall clSetMemObjectDestructorCallback( long ptr ptr ) wine_clSetMemObjectDestructorCallback +@ stdcall clSetUserEventStatus( long long ) wine_clSetUserEventStatus -- 2.17.1

1 0

[PATCH v2 2/4] opencl: Use function pointer instead of call the function directly.
by Nakarin Khankham 08 Mar '19

08 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- dlls/opencl/opencl.c | 241 +++++++++++++++++++++++++++++++------------ 1 file changed, 177 insertions(+), 64 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index ad781b92b5..0dbc780279 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -371,7 +371,8 @@ cl_int WINAPI wine_clGetPlatformIDs(cl_uint num_entries, cl_platform_id *platfor { cl_int ret; TRACE("(%d, %p, %p)\n", num_entries, platforms, num_platforms); - ret = clGetPlatformIDs(num_entries, platforms, num_platforms); + if (!pclGetPlatformIDs) return CL_INVALID_VALUE; + ret = pclGetPlatformIDs(num_entries, platforms, num_platforms); TRACE("(%d, %p, %p)=%d\n", num_entries, platforms, num_platforms, ret); return ret; } @@ -382,6 +383,8 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n", platform, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetPlatformInfo) return CL_INVALID_VALUE; + /* Hide all extensions. * TODO: Add individual extension support as needed. */ @@ -404,7 +407,7 @@ cl_int WINAPI wine_clGetPlatformInfo(cl_platform_id platform, cl_platform_info p } else { - ret = clGetPlatformInfo(platform, param_name, param_value_size, param_value, param_value_size_ret); + ret = pclGetPlatformInfo(platform, param_name, param_value_size, param_value, param_value_size_ret); } TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", platform, param_name, param_value_size, param_value, param_value_size_ret, ret); @@ -420,7 +423,8 @@ cl_int WINAPI wine_clGetDeviceIDs(cl_platform_id platform, cl_device_type device { cl_int ret; TRACE("(%p, 0x%lx, %d, %p, %p)\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices); - ret = clGetDeviceIDs(platform, device_type, num_entries, devices, num_devices); + if (!pclGetDeviceIDs) return CL_INVALID_VALUE; + ret = pclGetDeviceIDs(platform, device_type, num_entries, devices, num_devices); TRACE("(%p, 0x%lx, %d, %p, %p)=%d\n", platform, (long unsigned int)device_type, num_entries, devices, num_devices, ret); return ret; } @@ -431,6 +435,8 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n",device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetDeviceInfo) return CL_INVALID_VALUE; + /* Hide all extensions. * TODO: Add individual extension support as needed. */ @@ -453,7 +459,7 @@ cl_int WINAPI wine_clGetDeviceInfo(cl_device_id device, cl_device_info param_nam } else { - ret = clGetDeviceInfo(device, param_name, param_value_size, param_value, param_value_size_ret); + ret = pclGetDeviceInfo(device, param_name, param_value_size, param_value, param_value_size_ret); } /* Filter out the CL_EXEC_NATIVE_KERNEL flag */ @@ -493,6 +499,11 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties, cl_context ret; CONTEXT_CALLBACK *ccb; TRACE("(%p, %d, %p, %p, %p, %p)\n", properties, num_devices, devices, pfn_notify, user_data, errcode_ret); + if (!pclCreateContext) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } /* FIXME: The CONTEXT_CALLBACK structure is currently leaked. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * The problem is determining when a context is being destroyed. clReleaseContext only decrements @@ -502,7 +513,7 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties, ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb->pfn_notify = pfn_notify; ccb->user_data = user_data; - ret = clCreateContext(properties, num_devices, devices, context_fn_notify, ccb, errcode_ret); + ret = pclCreateContext(properties, num_devices, devices, context_fn_notify, ccb, errcode_ret); TRACE("(%p, %d, %p, %p, %p, %p (%d)))=%p\n", properties, num_devices, devices, &pfn_notify, user_data, errcode_ret, errcode_ret ? *errcode_ret : 0, ret); return ret; } @@ -514,6 +525,11 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro cl_context ret; CONTEXT_CALLBACK *ccb; TRACE("(%p, 0x%lx, %p, %p, %p)\n", properties, (long unsigned int)device_type, pfn_notify, user_data, errcode_ret); + if (!pclCreateContextFromType) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } /* FIXME: The CONTEXT_CALLBACK structure is currently leaked. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * The problem is determining when a context is being destroyed. clReleaseContext only decrements @@ -523,7 +539,7 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb->pfn_notify = pfn_notify; ccb->user_data = user_data; - ret = clCreateContextFromType(properties, device_type, context_fn_notify, ccb, errcode_ret); + ret = pclCreateContextFromType(properties, device_type, context_fn_notify, ccb, errcode_ret); TRACE("(%p, 0x%lx, %p, %p, %p (%d)))=%p\n", properties, (long unsigned int)device_type, pfn_notify, user_data, errcode_ret, errcode_ret ? *errcode_ret : 0, ret); return ret; } @@ -532,7 +548,8 @@ cl_int WINAPI wine_clRetainContext(cl_context context) { cl_int ret; TRACE("(%p)\n", context); - ret = clRetainContext(context); + if (!pclRetainContext) return CL_INVALID_VALUE; + ret = pclRetainContext(context); TRACE("(%p)=%d\n", context, ret); return ret; } @@ -541,7 +558,8 @@ cl_int WINAPI wine_clReleaseContext(cl_context context) { cl_int ret; TRACE("(%p)\n", context); - ret = clReleaseContext(context); + if (!pclReleaseContext) return CL_INVALID_VALUE; + ret = pclReleaseContext(context); TRACE("(%p)=%d\n", context, ret); return ret; } @@ -551,7 +569,8 @@ cl_int WINAPI wine_clGetContextInfo(cl_context context, cl_context_info param_na { cl_int ret; TRACE("(%p, 0x%x, %ld, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetContextInfo) return CL_INVALID_VALUE; + ret = pclGetContextInfo(context, param_name, param_value_size, param_value, param_value_size_ret); TRACE("(%p, 0x%x, %ld, %p, %p)=%d\n", context, param_name, param_value_size, param_value, param_value_size_ret, ret); return ret; } @@ -565,7 +584,12 @@ cl_command_queue WINAPI wine_clCreateCommandQueue(cl_context context, cl_device_ { cl_command_queue ret; TRACE("(%p, %p, 0x%lx, %p)\n", context, device, (long unsigned int)properties, errcode_ret); - ret = clCreateCommandQueue(context, device, properties, errcode_ret); + if (!pclCreateCommandQueue) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateCommandQueue(context, device, properties, errcode_ret); TRACE("(%p, %p, 0x%lx, %p)=%p\n", context, device, (long unsigned int)properties, errcode_ret, ret); return ret; } @@ -574,7 +598,8 @@ cl_int WINAPI wine_clRetainCommandQueue(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clRetainCommandQueue(command_queue); + if (!pclRetainCommandQueue) return CL_INVALID_VALUE; + ret = pclRetainCommandQueue(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -583,7 +608,8 @@ cl_int WINAPI wine_clReleaseCommandQueue(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clReleaseCommandQueue(command_queue); + if (!pclReleaseCommandQueue) return CL_INVALID_VALUE; + ret = pclReleaseCommandQueue(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -593,7 +619,8 @@ cl_int WINAPI wine_clGetCommandQueueInfo(cl_command_queue command_queue, cl_comm { cl_int ret; TRACE("%p, %d, %ld, %p, %p\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret); - ret = clGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetCommandQueueInfo) return CL_INVALID_VALUE; + ret = pclGetCommandQueueInfo(command_queue, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -612,7 +639,12 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t { cl_mem ret; TRACE("\n"); - ret = clCreateBuffer(context, flags, size, host_ptr, errcode_ret); + if (!pclCreateBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateBuffer(context, flags, size, host_ptr, errcode_ret); return ret; } @@ -621,7 +653,12 @@ cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_im { cl_mem ret; TRACE("\n"); - ret = clCreateImage2D(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); + if (!pclCreateImage2D) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateImage2D(context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret); return ret; } @@ -631,7 +668,12 @@ cl_mem WINAPI wine_clCreateImage3D(cl_context context, cl_mem_flags flags, cl_im { cl_mem ret; TRACE("\n"); - ret = clCreateImage3D(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); + if (!pclCreateImage3D) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateImage3D(context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret); return ret; } @@ -639,7 +681,8 @@ cl_int WINAPI wine_clRetainMemObject(cl_mem memobj) { cl_int ret; TRACE("(%p)\n", memobj); - ret = clRetainMemObject(memobj); + if (!pclRetainMemObject) return CL_INVALID_VALUE; + ret = pclRetainMemObject(memobj); TRACE("(%p)=%d\n", memobj, ret); return ret; } @@ -648,7 +691,8 @@ cl_int WINAPI wine_clReleaseMemObject(cl_mem memobj) { cl_int ret; TRACE("(%p)\n", memobj); - ret = clReleaseMemObject(memobj); + if (!pclReleaseMemObject) return CL_INVALID_VALUE; + ret = pclReleaseMemObject(memobj); TRACE("(%p)=%d\n", memobj, ret); return ret; } @@ -658,7 +702,8 @@ cl_int WINAPI wine_clGetSupportedImageFormats(cl_context context, cl_mem_flags f { cl_int ret; TRACE("\n"); - ret = clGetSupportedImageFormats(context, flags, image_type, num_entries, image_formats, num_image_formats); + if (!pclGetSupportedImageFormats) return CL_INVALID_VALUE; + ret = pclGetSupportedImageFormats(context, flags, image_type, num_entries, image_formats, num_image_formats); return ret; } @@ -666,7 +711,8 @@ cl_int WINAPI wine_clGetMemObjectInfo(cl_mem memobj, cl_mem_info param_name, siz { cl_int ret; TRACE("\n"); - ret = clGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetMemObjectInfo) return CL_INVALID_VALUE; + ret = pclGetMemObjectInfo(memobj, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -674,7 +720,8 @@ cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t { cl_int ret; TRACE("\n"); - ret = clGetImageInfo(image, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetImageInfo) return CL_INVALID_VALUE; + ret = pclGetImageInfo(image, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -687,7 +734,12 @@ cl_sampler WINAPI wine_clCreateSampler(cl_context context, cl_bool normalized_co { cl_sampler ret; TRACE("\n"); - ret = clCreateSampler(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); + if (!pclCreateSampler) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateSampler(context, normalized_coords, addressing_mode, filter_mode, errcode_ret); return ret; } @@ -695,7 +747,8 @@ cl_int WINAPI wine_clRetainSampler(cl_sampler sampler) { cl_int ret; TRACE("\n"); - ret = clRetainSampler(sampler); + if (!pclRetainSampler) return CL_INVALID_VALUE; + ret = pclRetainSampler(sampler); return ret; } @@ -703,7 +756,8 @@ cl_int WINAPI wine_clReleaseSampler(cl_sampler sampler) { cl_int ret; TRACE("\n"); - ret = clReleaseSampler(sampler); + if (!pclReleaseSampler) return CL_INVALID_VALUE; + ret = pclReleaseSampler(sampler); return ret; } @@ -712,7 +766,8 @@ cl_int WINAPI wine_clGetSamplerInfo(cl_sampler sampler, cl_sampler_info param_na { cl_int ret; TRACE("\n"); - ret = clGetSamplerInfo(sampler, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetSamplerInfo) return CL_INVALID_VALUE; + ret = pclGetSamplerInfo(sampler, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -725,7 +780,12 @@ cl_program WINAPI wine_clCreateProgramWithSource(cl_context context, cl_uint cou { cl_program ret; TRACE("\n"); - ret = clCreateProgramWithSource(context, count, strings, lengths, errcode_ret); + if (!pclCreateProgramWithSource) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateProgramWithSource(context, count, strings, lengths, errcode_ret); return ret; } @@ -735,7 +795,12 @@ cl_program WINAPI wine_clCreateProgramWithBinary(cl_context context, cl_uint num { cl_program ret; TRACE("\n"); - ret = clCreateProgramWithBinary(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); + if (!pclCreateProgramWithBinary) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateProgramWithBinary(context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret); return ret; } @@ -743,7 +808,8 @@ cl_int WINAPI wine_clRetainProgram(cl_program program) { cl_int ret; TRACE("\n"); - ret = clRetainProgram(program); + if (!pclRetainProgram) return CL_INVALID_PROGRAM; + ret = pclRetainProgram(program); return ret; } @@ -751,7 +817,8 @@ cl_int WINAPI wine_clReleaseProgram(cl_program program) { cl_int ret; TRACE("\n"); - ret = clReleaseProgram(program); + if (!pclReleaseProgram) return CL_INVALID_PROGRAM; + ret = pclReleaseProgram(program); return ret; } @@ -777,6 +844,7 @@ cl_int WINAPI wine_clBuildProgram(cl_program program, cl_uint num_devices, const { cl_int ret; TRACE("\n"); + if (!pclBuildProgram) return CL_INVALID_VALUE; if(pfn_notify) { /* When pfn_notify is provided, clBuildProgram is asynchronous */ @@ -784,12 +852,12 @@ cl_int WINAPI wine_clBuildProgram(cl_program program, cl_uint num_devices, const pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PROGRAM_CALLBACK)); pcb->pfn_notify = pfn_notify; pcb->user_data = user_data; - ret = clBuildProgram(program, num_devices, device_list, options, program_fn_notify, pcb); + ret = pclBuildProgram(program, num_devices, device_list, options, program_fn_notify, pcb); } else { /* When pfn_notify is NULL, clBuildProgram is synchronous */ - ret = clBuildProgram(program, num_devices, device_list, options, NULL, user_data); + ret = pclBuildProgram(program, num_devices, device_list, options, NULL, user_data); } return ret; } @@ -798,7 +866,8 @@ cl_int WINAPI wine_clUnloadCompiler(void) { cl_int ret; TRACE("()\n"); - ret = clUnloadCompiler(); + if (!pclUnloadCompiler) return CL_SUCCESS; + ret = pclUnloadCompiler(); TRACE("()=%d\n", ret); return ret; } @@ -808,7 +877,8 @@ cl_int WINAPI wine_clGetProgramInfo(cl_program program, cl_program_info param_na { cl_int ret; TRACE("\n"); - ret = clGetProgramInfo(program, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetProgramInfo) return CL_INVALID_VALUE; + ret = pclGetProgramInfo(program, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -818,7 +888,8 @@ cl_int WINAPI wine_clGetProgramBuildInfo(cl_program program, cl_device_id device { cl_int ret; TRACE("\n"); - ret = clGetProgramBuildInfo(program, device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetProgramBuildInfo) return CL_INVALID_VALUE; + ret = pclGetProgramBuildInfo(program, device, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -830,7 +901,12 @@ cl_kernel WINAPI wine_clCreateKernel(cl_program program, char * kernel_name, cl_ { cl_kernel ret; TRACE("\n"); - ret = clCreateKernel(program, kernel_name, errcode_ret); + if (!pclCreateKernel) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclCreateKernel(program, kernel_name, errcode_ret); return ret; } @@ -839,7 +915,8 @@ cl_int WINAPI wine_clCreateKernelsInProgram(cl_program program, cl_uint num_kern { cl_int ret; TRACE("\n"); - ret = clCreateKernelsInProgram(program, num_kernels, kernels, num_kernels_ret); + if (!pclCreateKernelsInProgram) return CL_INVALID_VALUE; + ret = pclCreateKernelsInProgram(program, num_kernels, kernels, num_kernels_ret); return ret; } @@ -847,7 +924,8 @@ cl_int WINAPI wine_clRetainKernel(cl_kernel kernel) { cl_int ret; TRACE("\n"); - ret = clRetainKernel(kernel); + if (!pclRetainKernel) return CL_INVALID_KERNEL; + ret = pclRetainKernel(kernel); return ret; } @@ -855,7 +933,8 @@ cl_int WINAPI wine_clReleaseKernel(cl_kernel kernel) { cl_int ret; TRACE("\n"); - ret = clReleaseKernel(kernel); + if (!pclReleaseKernel) return CL_INVALID_KERNEL; + ret = pclReleaseKernel(kernel); return ret; } @@ -863,7 +942,8 @@ cl_int WINAPI wine_clSetKernelArg(cl_kernel kernel, cl_uint arg_index, size_t ar { cl_int ret; TRACE("\n"); - ret = clSetKernelArg(kernel, arg_index, arg_size, arg_value); + if (!pclSetKernelArg) return CL_INVALID_KERNEL; + ret = pclSetKernelArg(kernel, arg_index, arg_size, arg_value); return ret; } @@ -872,7 +952,8 @@ cl_int WINAPI wine_clGetKernelInfo(cl_kernel kernel, cl_kernel_info param_name, { cl_int ret; TRACE("\n"); - ret = clGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetKernelInfo) return CL_INVALID_VALUE; + ret = pclGetKernelInfo(kernel, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -882,7 +963,8 @@ cl_int WINAPI wine_clGetKernelWorkGroupInfo(cl_kernel kernel, cl_device_id devic { cl_int ret; TRACE("\n"); - ret = clGetKernelWorkGroupInfo(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetKernelWorkGroupInfo) return CL_INVALID_VALUE; + ret = pclGetKernelWorkGroupInfo(kernel, device, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -894,7 +976,8 @@ cl_int WINAPI wine_clWaitForEvents(cl_uint num_events, cl_event * event_list) { cl_int ret; TRACE("\n"); - ret = clWaitForEvents(num_events, event_list); + if (!pclWaitForEvents) return CL_INVALID_EVENT; + ret = pclWaitForEvents(num_events, event_list); return ret; } @@ -903,7 +986,8 @@ cl_int WINAPI wine_clGetEventInfo(cl_event event, cl_event_info param_name, size { cl_int ret; TRACE("\n"); - ret = clGetEventInfo(event, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetEventInfo) return CL_INVALID_EVENT; + ret = pclGetEventInfo(event, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -911,7 +995,8 @@ cl_int WINAPI wine_clRetainEvent(cl_event event) { cl_int ret; TRACE("\n"); - ret = clRetainEvent(event); + if (!pclRetainEvent) return CL_INVALID_EVENT; + ret = pclRetainEvent(event); return ret; } @@ -919,7 +1004,8 @@ cl_int WINAPI wine_clReleaseEvent(cl_event event) { cl_int ret; TRACE("\n"); - ret = clReleaseEvent(event); + if (!pclReleaseEvent) return CL_INVALID_EVENT; + ret = pclReleaseEvent(event); return ret; } @@ -932,7 +1018,8 @@ cl_int WINAPI wine_clGetEventProfilingInfo(cl_event event, cl_profiling_info par { cl_int ret; TRACE("\n"); - ret = clGetEventProfilingInfo(event, param_name, param_value_size, param_value, param_value_size_ret); + if (!pclGetEventProfilingInfo) return CL_INVALID_EVENT; + ret = pclGetEventProfilingInfo(event, param_name, param_value_size, param_value, param_value_size_ret); return ret; } @@ -944,7 +1031,8 @@ cl_int WINAPI wine_clFlush(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clFlush(command_queue); + if (!pclFlush) return CL_INVALID_COMMAND_QUEUE; + ret = pclFlush(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -953,7 +1041,8 @@ cl_int WINAPI wine_clFinish(cl_command_queue command_queue) { cl_int ret; TRACE("(%p)\n", command_queue); - ret = clFinish(command_queue); + if (!pclFinish) return CL_INVALID_COMMAND_QUEUE; + ret = pclFinish(command_queue); TRACE("(%p)=%d\n", command_queue, ret); return ret; } @@ -968,7 +1057,8 @@ cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem bu { cl_int ret; TRACE("\n"); - ret = clEnqueueReadBuffer(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueReadBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueReadBuffer(command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -978,7 +1068,8 @@ cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem b { cl_int ret; TRACE("\n"); - ret = clEnqueueWriteBuffer(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueWriteBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueWriteBuffer(command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -988,7 +1079,8 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1000,7 +1092,8 @@ cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem ima cl_int ret; TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); - ret = clEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueReadImage) return CL_INVALID_VALUE; + ret = pclEnqueueReadImage(command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); TRACE("(%p, %p, %d, %p, %p, %ld, %ld, %p, %d, %p, %p)=%d\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event, ret); return ret; @@ -1013,7 +1106,8 @@ cl_int WINAPI wine_clEnqueueWriteImage(cl_command_queue command_queue, cl_mem im { cl_int ret; TRACE("\n"); - ret = clEnqueueWriteImage(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueWriteImage) return CL_INVALID_VALUE; + ret = pclEnqueueWriteImage(command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1023,7 +1117,8 @@ cl_int WINAPI wine_clEnqueueCopyImage(cl_command_queue command_queue, cl_mem src { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyImage(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyImage) return CL_INVALID_VALUE; + ret = pclEnqueueCopyImage(command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1033,7 +1128,8 @@ cl_int WINAPI wine_clEnqueueCopyImageToBuffer(cl_command_queue command_queue, cl { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyImageToBuffer(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyImageToBuffer) return CL_INVALID_VALUE; + ret = pclEnqueueCopyImageToBuffer(command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1043,7 +1139,8 @@ cl_int WINAPI wine_clEnqueueCopyBufferToImage(cl_command_queue command_queue, cl { cl_int ret; TRACE("\n"); - ret = clEnqueueCopyBufferToImage(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueCopyBufferToImage) return CL_INVALID_VALUE; + ret = pclEnqueueCopyBufferToImage(command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1053,7 +1150,12 @@ void * WINAPI wine_clEnqueueMapBuffer(cl_command_queue command_queue, cl_mem buf { void * ret; TRACE("\n"); - ret = clEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); + if (!pclEnqueueMapBuffer) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclEnqueueMapBuffer(command_queue, buffer, blocking_map, map_flags, offset, cb, num_events_in_wait_list, event_wait_list, event, errcode_ret); return ret; } @@ -1064,7 +1166,12 @@ void * WINAPI wine_clEnqueueMapImage(cl_command_queue command_queue, cl_mem imag { void * ret; TRACE("\n"); - ret = clEnqueueMapImage(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); + if (!pclEnqueueMapImage) + { + *errcode_ret = CL_INVALID_VALUE; + return NULL; + } + ret = pclEnqueueMapImage(command_queue, image, blocking_map, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events_in_wait_list, event_wait_list, event, errcode_ret); return ret; } @@ -1073,7 +1180,8 @@ cl_int WINAPI wine_clEnqueueUnmapMemObject(cl_command_queue command_queue, cl_me { cl_int ret; TRACE("\n"); - ret = clEnqueueUnmapMemObject(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueUnmapMemObject) return CL_INVALID_VALUE; + ret = pclEnqueueUnmapMemObject(command_queue, memobj, mapped_ptr, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1083,7 +1191,8 @@ cl_int WINAPI wine_clEnqueueNDRangeKernel(cl_command_queue command_queue, cl_ker { cl_int ret; TRACE("\n"); - ret = clEnqueueNDRangeKernel(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueNDRangeKernel) return CL_INVALID_VALUE; + ret = pclEnqueueNDRangeKernel(command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1092,7 +1201,8 @@ cl_int WINAPI wine_clEnqueueTask(cl_command_queue command_queue, cl_kernel kerne { cl_int ret; TRACE("\n"); - ret = clEnqueueTask(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); + if (!pclEnqueueTask) return CL_INVALID_VALUE; + ret = pclEnqueueTask(command_queue, kernel, num_events_in_wait_list, event_wait_list, event); return ret; } @@ -1121,7 +1231,8 @@ cl_int WINAPI wine_clEnqueueMarker(cl_command_queue command_queue, cl_event * ev { cl_int ret; TRACE("\n"); - ret = clEnqueueMarker(command_queue, event); + if (!pclEnqueueMarker) return CL_INVALID_VALUE; + ret = pclEnqueueMarker(command_queue, event); return ret; } @@ -1129,7 +1240,8 @@ cl_int WINAPI wine_clEnqueueWaitForEvents(cl_command_queue command_queue, cl_uin { cl_int ret; TRACE("\n"); - ret = clEnqueueWaitForEvents(command_queue, num_events, event_list); + if (!pclEnqueueWaitForEvents) return CL_INVALID_VALUE; + ret = pclEnqueueWaitForEvents(command_queue, num_events, event_list); return ret; } @@ -1137,7 +1249,8 @@ cl_int WINAPI wine_clEnqueueBarrier(cl_command_queue command_queue) { cl_int ret; TRACE("\n"); - ret = clEnqueueBarrier(command_queue); + if (!pclEnqueueBarrier) return CL_INVALID_VALUE; + ret = pclEnqueueBarrier(command_queue); return ret; } -- 2.17.1

1 0

[PATCH v2 1/4] opencl: Add OpenCL 1.0 function pointer loader.
by Nakarin Khankham 08 Mar '19

08 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- configure | 56 ++++++++ configure.ac | 1 + dlls/opencl/opencl.c | 321 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 4 files changed, 381 insertions(+) diff --git a/configure b/configure index 5f9aca9bd4..8e4ccc8209 100755 --- a/configure +++ b/configure @@ -11809,6 +11809,62 @@ if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" = xyes; then : fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOpenCL" >&5 +$as_echo_n "checking for -lOpenCL... " >&6; } +if ${ac_cv_lib_soname_OpenCL+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lOpenCL $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clGetPlatformInfo (); +int +main () +{ +return clGetPlatformInfo (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_OpenCL=`$ac_cv_path_LDD conftest.exe | grep "OpenCL" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_OpenCL=`$OTOOL -L conftest$ac_exeext | grep "libOpenCL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libOpenCL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_OpenCL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libOpenCL\\.$LIBEXT" | sed -e "s/^.*\\[\$libOpenCL\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_OpenCL:+false} :; then : + ac_cv_lib_soname_OpenCL=`$LDD conftest$ac_exeext | grep "libOpenCL\\.$LIBEXT" | sed -e "s/^.*$libOpenCL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_OpenCL:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + cat >>confdefs.h <<_ACEOF +#define SONAME_LIBOPENCL "libOpenCL.$LIBEXT" +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_OpenCL" >&5 +$as_echo "$ac_cv_lib_soname_OpenCL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBOPENCL "$ac_cv_lib_soname_OpenCL" +_ACEOF + + +fi fi if test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes; then : case "x$with_opencl" in diff --git a/configure.ac b/configure.ac index a55d2f825a..8c8bbc1704 100644 --- a/configure.ac +++ b/configure.ac @@ -1264,6 +1264,7 @@ dnl **** Check for OpenCL **** if test "$ac_cv_header_CL_cl_h" = "yes" then AC_CHECK_LIB(OpenCL,clGetPlatformInfo,[AC_SUBST(OPENCL_LIBS,["-lOpenCL"])]) + WINE_CHECK_SONAME(OpenCL,clGetPlatformInfo,,[AC_DEFINE_UNQUOTED(SONAME_LIBOPENCL,["libOpenCL.$LIBEXT"])]) fi WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes], [OpenCL ${notice_platform}development files not found, OpenCL won't be supported.], diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..ad781b92b5 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -43,6 +43,327 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define OPENCL_WITH_GL 0 +/* Platform API */ +static cl_int (*pclGetPlatformIDs)(cl_uint num_entries, cl_platform_id *platforms, cl_uint *num_platforms); +static cl_int (*pclGetPlatformInfo)(cl_platform_id platform, cl_platform_info param_name, + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Device APIs */ +static cl_int (*pclGetDeviceIDs)(cl_platform_id platform, cl_device_type device_type, + cl_uint num_entries, cl_device_id * devices, cl_uint * num_devices); +static cl_int (*pclGetDeviceInfo)(cl_device_id device, cl_device_info param_name, + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Context APIs */ +static cl_context (*pclCreateContext)(const cl_context_properties * properties, cl_uint num_devices, const cl_device_id * devices, + void WINAPI (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), + void * user_data, cl_int * errcode_ret); +static cl_context (*pclCreateContextFromType)(const cl_context_properties * properties, cl_device_type device_type, + void WINAPI (*pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), + void * user_data, cl_int * errcode_ret); +static cl_int (*pclRetainContext)(cl_context context); +static cl_int (*pclReleaseContext)(cl_context context); +static cl_int (*pclGetContextInfo)(cl_context context, cl_context_info param_name, + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Command Queue APIs */ +static cl_command_queue (*pclCreateCommandQueue)(cl_context context, cl_device_id device, + cl_command_queue_properties properties, cl_int * errcode_ret); +static cl_int (*pclRetainCommandQueue)(cl_command_queue command_queue); +static cl_int (*pclReleaseCommandQueue)(cl_command_queue command_queue); +static cl_int (*pclGetCommandQueueInfo)(cl_command_queue command_queue, cl_command_queue_info param_name, + SIZE_T param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclSetCommandQueueProperty)(cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, + cl_command_queue_properties * old_properties); + +/* Memory Object APIs */ +static cl_mem (*pclCreateBuffer)(cl_context context, cl_mem_flags flags, size_t size, void * host_ptr, cl_int * errcode_ret); +static cl_mem (*pclCreateImage2D)(cl_context context, cl_mem_flags flags, cl_image_format * image_format, + size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret); +static cl_mem (*pclCreateImage3D)(cl_context context, cl_mem_flags flags, cl_image_format * image_format, + size_t image_width, size_t image_height, size_t image_depth, size_t image_row_pitch, size_t image_slice_pitch, + void * host_ptr, cl_int * errcode_ret); +static cl_int (*pclRetainMemObject)(cl_mem memobj); +static cl_int (*pclReleaseMemObject)(cl_mem memobj); +static cl_int (*pclGetSupportedImageFormats)(cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, cl_uint num_entries, + cl_image_format * image_formats, cl_uint * num_image_formats); +static cl_int (*pclGetMemObjectInfo)(cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetImageInfo)(cl_mem image, cl_image_info param_name, size_t param_value_size, void * param_value, size_t * param_value_size_ret); + +/* Sampler APIs */ +static cl_sampler (*pclCreateSampler)(cl_context context, cl_bool normalized_coords, cl_addressing_mode addressing_mode, + cl_filter_mode filter_mode, cl_int * errcode_ret); +static cl_int (*pclRetainSampler)(cl_sampler sampler); +static cl_int (*pclReleaseSampler)(cl_sampler sampler); +static cl_int (*pclGetSamplerInfo)(cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); + +/* Program Object APIs */ +static cl_program (*pclCreateProgramWithSource)(cl_context context, cl_uint count, const char ** strings, + const size_t * lengths, cl_int * errcode_ret); +static cl_program (*pclCreateProgramWithBinary)(cl_context context, cl_uint num_devices, const cl_device_id * device_list, + const size_t * lengths, const unsigned char ** binaries, cl_int * binary_status, + cl_int * errcode_ret); +static cl_int (*pclRetainProgram)(cl_program program); +static cl_int (*pclReleaseProgram)(cl_program program); +static cl_int (*pclBuildProgram)(cl_program program, cl_uint num_devices, const cl_device_id * device_list, const char * options, + void WINAPI (*pfn_notify)(cl_program program, void * user_data), + void * user_data); +static cl_int (*pclUnloadCompiler)(void); +static cl_int (*pclGetProgramInfo)(cl_program program, cl_program_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetProgramBuildInfo)(cl_program program, cl_device_id device, + cl_program_build_info param_name, size_t param_value_size, void * param_value, + size_t * param_value_size_ret); + +/* Kernel Object APIs */ +static cl_kernel (*pclCreateKernel)(cl_program program, char * kernel_name, cl_int * errcode_ret); +static cl_int (*pclCreateKernelsInProgram)(cl_program program, cl_uint num_kernels, + cl_kernel * kernels, cl_uint * num_kernels_ret); +static cl_int (*pclRetainKernel)(cl_kernel kernel); +static cl_int (*pclReleaseKernel)(cl_kernel kernel); +static cl_int (*pclSetKernelArg)(cl_kernel kernel, cl_uint arg_index, size_t arg_size, void * arg_value); +static cl_int (*pclGetKernelInfo)(cl_kernel kernel, cl_kernel_info param_name, + size_t param_value_size, void * param_value, size_t * param_value_size_ret); +static cl_int (*pclGetKernelWorkGroupInfo)(cl_kernel kernel, cl_device_id device, + cl_kernel_work_group_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); +/* Event Object APIs */ +static cl_int (*pclWaitForEvents)(cl_uint num_events, cl_event * event_list); +static cl_int (*pclGetEventInfo)(cl_event event, cl_event_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); +static cl_int (*pclRetainEvent)(cl_event event); +static cl_int (*pclReleaseEvent)(cl_event event); + +/* Profiling APIs */ +static cl_int (*pclGetEventProfilingInfo)(cl_event event, cl_profiling_info param_name, size_t param_value_size, + void * param_value, size_t * param_value_size_ret); + +/* Flush and Finish APIs */ +static cl_int (*pclFlush)(cl_command_queue command_queue); +static cl_int (*pclFinish)(cl_command_queue command_queue); + +/* Enqueued Commands APIs */ +static cl_int (*pclEnqueueReadBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + size_t offset, size_t cb, void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, + size_t offset, size_t cb, const void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyBuffer)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + size_t src_offset, size_t dst_offset, size_t cb, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueReadImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, + const size_t * origin, const size_t * region, + SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueWriteImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, + const size_t * origin, const size_t * region, + size_t input_row_pitch, size_t input_slice_pitch, const void * ptr, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyImage)(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_image, + size_t * src_origin, size_t * dst_origin, size_t * region, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyImageToBuffer)(cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, + size_t * src_origin, size_t * region, size_t dst_offset, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueCopyBufferToImage)(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, + size_t src_offset, size_t * dst_origin, size_t * region, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static void * (*pclEnqueueMapBuffer)(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, + cl_map_flags map_flags, size_t offset, size_t cb, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret); +static void * (*pclEnqueueMapImage)(cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, + cl_map_flags map_flags, size_t * origin, size_t * region, + size_t * image_row_pitch, size_t * image_slice_pitch, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event, cl_int * errcode_ret); +static cl_int (*pclEnqueueUnmapMemObject)(cl_command_queue command_queue, cl_mem memobj, void * mapped_ptr, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueNDRangeKernel)(cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, + size_t * global_work_offset, size_t * global_work_size, size_t * local_work_size, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueTask)(cl_command_queue command_queue, cl_kernel kernel, + cl_uint num_events_in_wait_list, cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueNativeKernel)(cl_command_queue command_queue, + void WINAPI (*user_func)(void *args), + void * args, size_t cb_args, + cl_uint num_mem_objects, const cl_mem * mem_list, const void ** args_mem_loc, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event); +static cl_int (*pclEnqueueMarker)(cl_command_queue command_queue, cl_event * event); +static cl_int (*pclEnqueueWaitForEvents)(cl_command_queue command_queue, cl_uint num_events, cl_event * event_list); +static cl_int (*pclEnqueueBarrier)(cl_command_queue command_queue); + +/* Extension function access */ +static void * (*pclGetExtensionFunctionAddress)(const char * func_name); + + +static BOOL init_opencl(void); +static BOOL load_opencl_func(void); + +static void * opencl_handle = NULL; + + +/*********************************************************************** + * DllMain [Internal] + * + * Initializes the internal 'opencl.dll'. + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) +{ + TRACE("opencl.dll: %p,%x,%p\n", hinstDLL, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + if (init_opencl()) + load_opencl_func(); + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (opencl_handle) wine_dlclose(opencl_handle, NULL, 0); + } + + return TRUE; +} + + +/*********************************************************************** + * init_opencl [Internal] + * + * Initializes OpenCL library. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL init_opencl(void) +{ +#ifdef SONAME_LIBOPENCL + char error[256]; + + opencl_handle = wine_dlopen(SONAME_LIBOPENCL, RTLD_NOW, error, sizeof(error)); + if (opencl_handle != NULL) + { + TRACE("Opened library %s\n", SONAME_LIBOPENCL); + return TRUE; + } + else + ERR("Failed to open library %s: %s\n", SONAME_LIBOPENCL, error); +#else + ERR("OpenCL is needed but support was not included at build time\n"); +#endif + return FALSE; +} + + +/*********************************************************************** + * load_opencl_func [Internal] + * + * Populate function table. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL load_opencl_func(void) +{ + char error[256]; + + if (opencl_handle == NULL) + return FALSE; + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym(opencl_handle, #f, error, sizeof(error)))) \ + WARN("%s not found in %s (%s)\n", #f, SONAME_LIBOPENCL, error); + + /* Platform API */ + LOAD_FUNCPTR(clGetPlatformIDs); + LOAD_FUNCPTR(clGetPlatformInfo); + /* Device APIs */ + LOAD_FUNCPTR(clGetDeviceIDs); + LOAD_FUNCPTR(clGetDeviceInfo); + /* Context APIs */ + LOAD_FUNCPTR(clCreateContext); + LOAD_FUNCPTR(clCreateContextFromType); + LOAD_FUNCPTR(clRetainContext); + LOAD_FUNCPTR(clReleaseContext); + LOAD_FUNCPTR(clGetContextInfo); + /* Command Queue APIs */ + LOAD_FUNCPTR(clCreateCommandQueue); + LOAD_FUNCPTR(clRetainCommandQueue); + LOAD_FUNCPTR(clReleaseCommandQueue); + LOAD_FUNCPTR(clGetCommandQueueInfo); + LOAD_FUNCPTR(clSetCommandQueueProperty); + /* Memory Object APIs */ + LOAD_FUNCPTR(clCreateBuffer); + LOAD_FUNCPTR(clCreateImage2D); + LOAD_FUNCPTR(clCreateImage3D); + LOAD_FUNCPTR(clRetainMemObject); + LOAD_FUNCPTR(clReleaseMemObject); + LOAD_FUNCPTR(clGetSupportedImageFormats); + LOAD_FUNCPTR(clGetMemObjectInfo); + LOAD_FUNCPTR(clGetImageInfo); + /* Sampler APIs */ + LOAD_FUNCPTR(clCreateSampler); + LOAD_FUNCPTR(clRetainSampler); + LOAD_FUNCPTR(clReleaseSampler); + LOAD_FUNCPTR(clGetSamplerInfo); + /* Program Object APIs */ + LOAD_FUNCPTR(clCreateProgramWithSource); + LOAD_FUNCPTR(clCreateProgramWithBinary); + LOAD_FUNCPTR(clRetainProgram); + LOAD_FUNCPTR(clReleaseProgram); + LOAD_FUNCPTR(clBuildProgram); + LOAD_FUNCPTR(clUnloadCompiler); + LOAD_FUNCPTR(clGetProgramInfo); + LOAD_FUNCPTR(clGetProgramBuildInfo); + /* Kernel Object APIs */ + LOAD_FUNCPTR(clCreateKernel); + LOAD_FUNCPTR(clCreateKernelsInProgram); + LOAD_FUNCPTR(clRetainKernel); + LOAD_FUNCPTR(clReleaseKernel); + LOAD_FUNCPTR(clSetKernelArg); + LOAD_FUNCPTR(clGetKernelInfo); + LOAD_FUNCPTR(clGetKernelWorkGroupInfo); + /* Event Object APIs */ + LOAD_FUNCPTR(clWaitForEvents); + LOAD_FUNCPTR(clGetEventInfo); + LOAD_FUNCPTR(clRetainEvent); + LOAD_FUNCPTR(clReleaseEvent); + /* Profiling APIs */ + LOAD_FUNCPTR(clGetEventProfilingInfo); + /* Flush and Finish APIs */ + LOAD_FUNCPTR(clFlush); + LOAD_FUNCPTR(clFinish); + /* Enqueued Commands APIs */ + LOAD_FUNCPTR(clEnqueueReadBuffer); + LOAD_FUNCPTR(clEnqueueWriteBuffer); + LOAD_FUNCPTR(clEnqueueCopyBuffer); + LOAD_FUNCPTR(clEnqueueReadImage); + LOAD_FUNCPTR(clEnqueueWriteImage); + LOAD_FUNCPTR(clEnqueueCopyImage); + LOAD_FUNCPTR(clEnqueueCopyImageToBuffer); + LOAD_FUNCPTR(clEnqueueCopyBufferToImage); + LOAD_FUNCPTR(clEnqueueMapBuffer); + LOAD_FUNCPTR(clEnqueueMapImage); + LOAD_FUNCPTR(clEnqueueUnmapMemObject); + LOAD_FUNCPTR(clEnqueueNDRangeKernel); + LOAD_FUNCPTR(clEnqueueTask); + LOAD_FUNCPTR(clEnqueueNativeKernel); + LOAD_FUNCPTR(clEnqueueMarker); + LOAD_FUNCPTR(clEnqueueWaitForEvents); + LOAD_FUNCPTR(clEnqueueBarrier); + /* Extension function access */ + LOAD_FUNCPTR(clGetExtensionFunctionAddress); + +#undef LOAD_FUNCPTR + + return TRUE; +} + + /*---------------------------------------------------------------*/ /* Platform API */ diff --git a/include/config.h.in b/include/config.h.in index 999f4a6130..a08e81c86e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1548,6 +1548,9 @@ /* Define to the soname of the libopenal library. */ #undef SONAME_LIBOPENAL +/* Define to the soname of the libOpenCL library. */ +#undef SONAME_LIBOPENCL + /* Define to the soname of the libOSMesa library. */ #undef SONAME_LIBOSMESA -- 2.17.1

1 0

[PATCH v2 1/6] quartz/tests: Add some tests for AVI decompressor pin interfaces.
by Zebediah Figura 08 Mar '19

08 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avidec.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 05065446f1..330d292f0f 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -61,6 +61,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_avi_dec(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -80,6 +81,30 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } -- 2.20.1

2 6

[PATCH 1/6] quartz/tests: Add some tests for AVI decompressor pin interfaces.
by Zebediah Figura 08 Mar '19

08 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avidec.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 05065446f1..330d292f0f 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -61,6 +61,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_avi_dec(); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -80,6 +81,30 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); } -- 2.20.1

2 10

[PATCH v4 4/5] mfplat: Implement IMFattributes::{SetUINT32,SetUINT64,GetUINT32,GetUINT64}.
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 60 +++++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++-- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index a117ede271..4ec51e300e 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5ae3b4ff07..1749bd6929 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -33,6 +33,7 @@ #include "wine/list.h" #include "mfplat_private.h" +#include "propvarutil.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -649,22 +650,59 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * return E_NOTIMPL; } +static HRESULT mfattributes_get_item(mfattributes *object, REFGUID key, PROPVARIANT *value) +{ + HRESULT hr; + struct mfattribute *attribute = NULL; + + EnterCriticalSection(&object->lock); + + attribute = mfattributes_find_item(object, key, NULL); + if (!attribute) + hr = MF_E_ATTRIBUTENOTFOUND; + else + { + if (attribute->value.vt != value->vt) + hr = MF_E_INVALIDTYPE; + else + hr = PropVariantCopy(value, &attribute->value); + } + + LeaveCriticalSection(&object->lock); + + return hr; +} + static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + hr = mfattributes_get_item(This, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToUInt32(&attrval, value); + return hr; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + hr = mfattributes_get_item(This, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToUInt64(&attrval, value); + return hr; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -855,19 +893,25 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattributes_set_item(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + TRACE("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + attrval.vt = VT_UI8; + attrval.uhVal.QuadPart = value; + return mfattributes_set_item(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ea70b4bf5f..55c9f516c3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -423,6 +423,8 @@ static void test_MFCreateAttributes(void) UINT32 count; PROPVARIANT propvar, ret_propvar; GUID key; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -432,13 +434,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); hr = MFCreateAttributes(&attributes, 0); -- 2.20.1

2 1

[PATCH v4 1/5] mfplat: Implement IMFAttributes::{SetItem,GetItem}.
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/buffer.c | 7 +- dlls/mfplat/main.c | 161 +++++++++++++++++++++++++++++++--- dlls/mfplat/mediatype.c | 17 +++- dlls/mfplat/mfplat_private.h | 13 ++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 89 +++++++++++++++++++ 6 files changed, 272 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 833ec041a9..afdb525dea 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -273,6 +273,7 @@ static ULONG WINAPI sample_Release(IMFSample *iface) IMFMediaBuffer_Release(sample->buffers[i]); DeleteCriticalSection(&sample->cs); heap_free(sample->buffers); + clear_attributes_object(&sample->attributes); heap_free(sample); } @@ -706,7 +707,11 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) if (!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFSample_iface.lpVtbl = &samplevtbl; InitializeCriticalSection(&object->cs); diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6bec41884e..22803dc1b4 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -577,19 +577,48 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!ref) { + clear_attributes_object(This); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static struct mfattribute *mfattributes_find_item(mfattributes *object, REFGUID key, size_t *item_index) +{ + size_t index; + + for (index = 0; index < object->count; index++) + { + if (IsEqualGUID(key, &object->attributes[index].key)) + { + if (item_index) + *item_index = index; + return &object->attributes[index]; + } + } + return NULL; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { mfattributes *This = impl_from_IMFAttributes(iface); + HRESULT hr; + struct mfattribute *attribute = NULL; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + attribute = mfattributes_find_item(This, key, NULL); + if (!attribute) + hr = MF_E_ATTRIBUTENOTFOUND; + else + hr = PropVariantCopy(value, &attribute->value); + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -722,13 +751,68 @@ static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, return E_NOTIMPL; } -static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT mfattributes_set_item(mfattributes *object, REFGUID key, REFPROPVARIANT value) +{ + struct mfattribute *attribute = NULL; + + EnterCriticalSection(&object->lock); + + attribute = mfattributes_find_item(object, key, NULL); + if (!attribute) + { + if (!mf_array_reserve((void **)&object->attributes, &object->capacity, object->count + 1, + sizeof(*object->attributes))) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + object->attributes[object->count].key = *key; + attribute = &object->attributes[object->count]; + object->count++; + } + else + PropVariantClear(&attribute->value); + + PropVariantCopy(&attribute->value, value); + + LeaveCriticalSection(&object->lock); + + return S_OK; +} + +static BOOL is_type_valid(DWORD type) +{ + switch (type) + { + case MF_ATTRIBUTE_UINT32: + case MF_ATTRIBUTE_UINT64: + case MF_ATTRIBUTE_DOUBLE: + case MF_ATTRIBUTE_GUID: + case MF_ATTRIBUTE_STRING: + case MF_ATTRIBUTE_BLOB: + case MF_ATTRIBUTE_IUNKNOWN: + return TRUE; + default: + return FALSE; + } +} + +static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + if (!is_type_valid(value->vt)) + { + PROPVARIANT empty_value; + + PropVariantClear(&empty_value); + mfattributes_set_item(This, key, &empty_value); + return MF_E_INVALIDTYPE; + } + else + return mfattributes_set_item(This, key, value); } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) @@ -897,10 +981,42 @@ static const IMFAttributesVtbl mfattributes_vtbl = mfattributes_CopyAllItems }; -void init_attribute_object(mfattributes *object, UINT32 size) +HRESULT init_attributes_object(mfattributes *object, UINT32 size) { object->ref = 1; object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; + InitializeCriticalSection(&object->lock); + object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IMFAttributes.lock"); + + object->attributes = NULL; + object->count = 0; + object->capacity = 0; + if (!mf_array_reserve((void **)&object->attributes, &object->capacity, size, + sizeof(*object->attributes))) + { + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + + return S_OK; +} + +void clear_attributes_object(mfattributes *object) +{ + size_t i; + + EnterCriticalSection(&object->lock); + + for (i = 0; i < object->count; i++) + PropVariantClear(&object->attributes[i].value); + + heap_free(object->attributes); + + LeaveCriticalSection(&object->lock); + + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); } /*********************************************************************** @@ -916,7 +1032,11 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) if(!object) return E_OUTOFMEMORY; - init_attribute_object(object, size); + if (FAILED(init_attributes_object(object, size))) + { + heap_free(object); + return E_OUTOFMEMORY; + } *attributes = &object->IMFAttributes_iface; return S_OK; @@ -978,6 +1098,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + clear_attributes_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1218,7 +1339,11 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt if(!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; @@ -1289,7 +1414,11 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open if(!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; @@ -1445,6 +1574,7 @@ static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor * if (!ref) { + clear_attributes_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1843,7 +1973,11 @@ static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *ifac if (!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFPresentationDescriptor_iface.lpVtbl = &mfpresentationdescriptor_vtbl; *descriptor = &object->IMFPresentationDescriptor_iface; @@ -2146,6 +2280,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) if (!ref) { + clear_attributes_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2436,7 +2571,11 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR if(!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFMediaEvent_iface.lpVtbl = &mfmediaevent_vtbl; object->type = type; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 7abbf31796..88e34e23e2 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -116,6 +116,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!refcount) { + clear_attributes_object(&media_type->attributes); heap_free(media_type); } @@ -400,7 +401,11 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **media_type) if (!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; *media_type = &object->IMFMediaType_iface; @@ -456,6 +461,7 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); DeleteCriticalSection(&stream_desc->cs); + clear_attributes_object(&stream_desc->attributes); heap_free(stream_desc); } @@ -855,7 +861,11 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, if (!object) return E_OUTOFMEMORY; - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return E_OUTOFMEMORY; + } object->IMFStreamDescriptor_iface.lpVtbl = &streamdescriptorvtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; object->identifier = identifier; @@ -1264,7 +1274,8 @@ static const IMFPresentationDescriptorVtbl presentationdescriptorvtbl = static HRESULT presentation_descriptor_init(struct presentation_desc *object, DWORD count) { - init_attribute_object(&object->attributes, 0); + if (FAILED(init_attributes_object(&object->attributes, 0))) + return E_OUTOFMEMORY; object->IMFPresentationDescriptor_iface.lpVtbl = &presentationdescriptorvtbl; object->descriptors = heap_alloc_zero(count * sizeof(*object->descriptors)); if (!object->descriptors) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 72f8f684f6..4ad71e225d 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -22,13 +22,24 @@ #include "wine/heap.h" +struct mfattribute +{ + GUID key; + PROPVARIANT value; +}; + typedef struct attributes { IMFAttributes IMFAttributes_iface; LONG ref; + CRITICAL_SECTION lock; + struct mfattribute *attributes; + size_t capacity; + size_t count; } mfattributes; -extern void init_attribute_object(mfattributes *object, UINT32 size) DECLSPEC_HIDDEN; +extern HRESULT init_attributes_object(mfattributes *object, UINT32 size) DECLSPEC_HIDDEN; +extern void clear_attributes_object(mfattributes *object) DECLSPEC_HIDDEN; extern void init_system_queues(void) DECLSPEC_HIDDEN; extern void shutdown_system_queues(void) DECLSPEC_HIDDEN; diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..e80a3b7cfc 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat propsys C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2f4db9b219..95f13725bf 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "propvarutil.h" #include "wine/test.h" @@ -58,6 +59,7 @@ DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -419,6 +421,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + PROPVARIANT propvar, ret_propvar; + GUID key; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -436,6 +440,91 @@ static void test_MFCreateAttributes(void) todo_wine ok(count == 1, "got %d\n", count); IMFAttributes_Release(attributes); + + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "MFCreateAttributes failed: 0x%08x.\n", hr); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_STRING; + U(ret_propvar).pwszVal = NULL; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_SetItem should failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).lVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + key = GUID_NULL; + if (is_win8_plus) + hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); + else + hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + key = GUID_NULL; + if (is_win8_plus) + hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); + else + hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + + IMFAttributes_Release(attributes); } static void test_MFCreateMFByteStreamOnStream(void) -- 2.20.1

2 1

[PATCH v4 5/5] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1749bd6929..3918d25f83 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -981,12 +981,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + + EnterCriticalSection(&This->lock); if(items) - *items = 0; + *items = This->count; - return E_NOTIMPL; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 55c9f516c3..732e098a3a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -416,11 +416,20 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; PROPVARIANT propvar, ret_propvar; GUID key; UINT32 uint32_value; @@ -428,18 +437,11 @@ static void test_MFCreateAttributes(void) hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -453,6 +455,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); @@ -525,9 +528,11 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 3); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); key = GUID_NULL; + CHECK_COUNT(attributes, 2); if (is_win8_plus) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); else @@ -551,8 +556,10 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 999, &key, &ret_propvar); ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex returned: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); IMFAttributes_Release(attributes); } -- 2.20.1

1 0

[PATCH v4 3/5] mfplat: Implement IMFAttributes::GetItemByIndex().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 17 +++++++++++++++-- dlls/mfplat/tests/mfplat.c | 15 +++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 05e56ccb72..5ae3b4ff07 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -949,9 +949,22 @@ static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 i { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %d, %p, %p\n", This, index, key, value); + TRACE("(%p, %d, %p, %p)\n", This, index, key, value); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + if (index >= This->count) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + *key = This->attributes[This->count - index - 1].key; + PropVariantCopy(value, &This->attributes[This->count - index - 1].value); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c355e792a7..ea70b4bf5f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -508,9 +508,9 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); else hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); PropVariantClear(&ret_propvar); PropVariantClear(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; @@ -520,9 +520,12 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); else hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + + hr = IMFAttributes_GetItemByIndex(attributes, 999, &key, &ret_propvar); + ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex returned: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); -- 2.20.1

1 0

[PATCH v4 2/5] mfplat: Implement IMFAttributes::DeleteItem().
by Jactry Zeng 08 Mar '19

08 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 23 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 22803dc1b4..05e56ccb72 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -818,10 +818,29 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { mfattributes *This = impl_from_IMFAttributes(iface); + struct mfattribute *attribute = NULL; + size_t index = 0; - FIXME("%p, %s\n", This, debugstr_guid(key)); + TRACE("(%p, %s)\n", This, debugstr_guid(key)); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + attribute = mfattributes_find_item(This, key, &index); + if (attribute) + { + size_t count; + + PropVariantClear(&attribute->value); + + This->count--; + count = This->count - index; + if (count) + memmove(&This->attributes[index], &This->attributes[index + 1], count * sizeof(*This->attributes)); + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 95f13725bf..c355e792a7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -502,7 +502,7 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); - todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); key = GUID_NULL; if (is_win8_plus) hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); @@ -524,6 +524,9 @@ static void test_MFCreateAttributes(void) todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

1 0

[PATCH 10/10] d3dx9: Merge the d3dx_effect_SetIntArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e5f87a32c0..d25fa29915 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,44 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3391,10 +3353,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) -- 2.20.1

1 0

[PATCH 09/10] d3dx9: Merge the d3dx_effect_SetInt() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 80 +++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1f7f22079b..e5f87a32c0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1345,49 +1345,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - if (param->rows == 1 && param->columns == 1) - { - DWORD value; - - set_number(&value, param->type, &n, D3DXPT_INT); - if (value != *(DWORD *)param->data) - set_dirty(param); - *(DWORD *)param->data = value; - return D3D_OK; - } - - /* - * Split the value, if parameter is a vector with dimension 3 or 4. - */ - if (param->type == D3DXPT_FLOAT && - ((param->class == D3DXPC_VECTOR && param->columns != 2) || - (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) - { - TRACE("Vector fixup\n"); - - *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; - if (param->rows * param->columns > 3) - { - ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - } - set_dirty(param); - return D3D_OK; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const INT *n, UINT count) { @@ -3351,10 +3308,45 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); - return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); + if (param && !param->element_count) + { + if (param->rows == 1 && param->columns == 1) + { + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; + return D3D_OK; + } + + /* + * Split the value, if parameter is a vector with dimension 3 or 4. + */ + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) || + (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + TRACE("Vector fixup.\n"); + + *(FLOAT *)param->data = ((n & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[1] = ((n & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + ((FLOAT *)param->data)[2] = (n & 0xff) * INT_FLOAT_MULTI_INVERSE; + if (param->rows * param->columns > 3) + ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + set_dirty(param); + return D3D_OK; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) -- 2.20.1

1 0

[PATCH 08/10] d3dx9: Merge the d3dx_effect_GetIntArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b08344ca4b..1f7f22079b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1426,30 +1426,6 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, INT *n, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (n && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3432,10 +3408,25 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); - return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); + if (n && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) -- 2.20.1

1 0

[PATCH] uianimation.idl: Add more interfaces
by Vijay Kiran Kamuju 07 Mar '19

07 Mar '19

with minor changes related to coclass definiions From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/uianimation.idl | 267 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) diff --git a/include/uianimation.idl b/include/uianimation.idl index 6c026a6ced..e8b366e8fb 100644 --- a/include/uianimation.idl +++ b/include/uianimation.idl @@ -20,10 +20,19 @@ import "unknwn.idl"; interface IUIAnimationStoryboard; interface IUIAnimationVariable; +interface IUIAnimationManager; +interface IUIAnimationPriorityComparison; +interface IUIAnimationTransitionFactory; +interface IUIAnimationInterpolator; +interface IUIAnimationManagerEventHandler; +interface IUIAnimationTransition; +interface IUIAnimationTransitionLibrary; typedef DOUBLE UI_ANIMATION_SECONDS; typedef struct { int _; } *UI_ANIMATION_KEYFRAME; +const UI_ANIMATION_SECONDS UI_ANIMATION_SECONDS_EVENTUALLY = -1.0; + typedef enum { UI_ANIMATION_MANAGER_IDLE, @@ -76,6 +85,34 @@ typedef enum UI_ANIMATION_IDLE_BEHAVIOR_DISABLE, } UI_ANIMATION_IDLE_BEHAVIOR; +typedef [v1_enum] enum +{ + UI_ANIMATION_MODE_DISABLED, + UI_ANIMATION_MODE_SYSTEM_DEFAULT, + UI_ANIMATION_MODE_ENABLED +} UI_ANIMATION_MODE; + +typedef [v1_enum] enum +{ + UI_ANIMATION_PRIORITY_EFFECT_FAILURE, + UI_ANIMATION_PRIORITY_EFFECT_DELAY +} UI_ANIMATION_PRIORITY_EFFECT; + +typedef [v1_enum] enum +{ + UI_ANIMATION_DEPENDENCY_NONE = 0, + UI_ANIMATION_DEPENDENCY_INTERMEDIATE_VALUES = 0x1, + UI_ANIMATION_DEPENDENCY_FINAL_VALUE = 0x2, + UI_ANIMATION_DEPENDENCY_FINAL_VELOCITY = 0x4, + UI_ANIMATION_DEPENDENCY_DURATION = 0x8 +} UI_ANIMATION_DEPENDENCIES; + +typedef [v1_enum] enum +{ + UI_ANIMATION_SLOPE_INCREASING, + UI_ANIMATION_SLOPE_DECREASING +} UI_ANIMATION_SLOPE; + [ local, object, @@ -334,6 +371,212 @@ interface IUIAnimationTimer : IUnknown [in] UINT32 fps); } +[ + local, + object, + uuid(9169896c-ac8d-4e7d-94e5-67fa4dc2f2e8), + pointer_default(unique) +] +interface IUIAnimationManager : IUnknown +{ + HRESULT CreateAnimationVariable( + [in] UI_ANIMATION_SECONDS initialvalue, + [out, retval] IUIAnimationVariable **variable); + + HRESULT ScheduleTransition( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_SECONDS timenow); + + HRESULT CreateStoryboard( + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT FinishAllStoryboards( + [in] UI_ANIMATION_SECONDS deadline); + + HRESULT AbandonAllStoryboards(); + + HRESULT Update( + [in] UI_ANIMATION_SECONDS timenow, + [out, defaultvalue(0)] UI_ANIMATION_UPDATE_RESULT *updateresult); + + HRESULT GetVariableFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationVariable **variable); + + HRESULT GetStoryboardFromTag( + [in] IUnknown * object, + [in] UINT32 id, + [out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT GetStatus( + [out, retval] UI_ANIMATION_MANAGER_STATUS *status); + + HRESULT SetAnimationMode( + [in] UI_ANIMATION_MODE mode); + + HRESULT Pause(); + + HRESULT Resume(); + + HRESULT SetManagerEventHandler( + [in] IUIAnimationManagerEventHandler *handler); + + HRESULT SetCancelPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetTrimPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetCompressPriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetConcludePriorityComparison( + [in] IUIAnimationPriorityComparison *comparison); + + HRESULT SetDefaultLongestAcceptableDelay( + [in] UI_ANIMATION_SECONDS delay); + + HRESULT Shutdown(); +} + +[ + local, + object, + uuid(83fa9b74-5f86-4618-bc6a-a2fac19b3f44), + pointer_default(unique) +] +interface IUIAnimationPriorityComparison : IUnknown +{ + HRESULT HasPriority( + [in] IUIAnimationStoryboard *scheduledboard, + [in] IUIAnimationStoryboard *newboard, + [in] UI_ANIMATION_PRIORITY_EFFECT effect); +} + +[ + local, + object, + uuid(fcd91e03-3e3b-45ad-bbb1-6dfc8153743d), + pointer_default(unique) +] +interface IUIAnimationTransitionFactory : IUnknown +{ + HRESULT CreateTransition( + [in] IUIAnimationInterpolator *interpolator, + [out, retval] IUIAnimationTransition **transition); +} + +[ + local, + object, + uuid(7815cbba-ddf7-478c-a46c-7b6c738b7978), + pointer_default(unique) +] +interface IUIAnimationInterpolator : IUnknown +{ + HRESULT SetInitialValueAndVelocity( + [in] double initialvalue, + [in] double initialvelocity); + + HRESULT SetDuration( + [in] UI_ANIMATION_SECONDS duration); + + HRESULT GetDuration( + [out, retval] UI_ANIMATION_SECONDS *duration); + + HRESULT GetFinalValue( + [out, retval] double *value); + + HRESULT InterpolateValue( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *value); + + HRESULT InterpolateVelocity( + [in] UI_ANIMATION_SECONDS offset, + [out, retval] double *velocity); + + HRESULT GetDependencies( + [out] UI_ANIMATION_DEPENDENCIES *initialvaluedependencies, + [out] UI_ANIMATION_DEPENDENCIES *initialvelocitydependencies, + [out] UI_ANIMATION_DEPENDENCIES *durationdependencies); +} + +[ + local, + object, + uuid(ca5a14b1-d24f-48b8-8fe4-c78169ba954e), + pointer_default(unique) +] +interface IUIAnimationTransitionLibrary : IUnknown +{ + HRESULT CreateInstantaneousTransition( + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateConstantTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateDiscreteTransition( + [in] UI_ANIMATION_SECONDS delay, + [in] double finalvalue, + [in] UI_ANIMATION_SECONDS hold, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateLinearTransitionFromSpeed( + [in] double speed, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromVelocity( + [in] UI_ANIMATION_SECONDS duration, + [in] UI_ANIMATION_SECONDS period, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSinusoidalTransitionFromRange( + [in] UI_ANIMATION_SECONDS duration, + [in] double minimumvalue, + [in] double maximumvalue, + [in] UI_ANIMATION_SECONDS period, + [in] UI_ANIMATION_SLOPE slope, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateAccelerateDecelerateTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double accelerationratio, + [in] double decelerationratio, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateReversalTransition( + [in] UI_ANIMATION_SECONDS duration, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateCubicTransition( + [in] UI_ANIMATION_SECONDS duration, + [in] double finalvalue, + [in] double finalvelocity, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateSmoothStopTransition( + [in] UI_ANIMATION_SECONDS maximumduration, + [in] double finalvalue, + [out, retval] IUIAnimationTransition **transition); + + HRESULT CreateParabolicTransitionFromAcceleration( + [in] UI_ANIMATION_SECONDS finalvalue, + [in] double finalvelocity, + [in] double acceleration, + [out, retval] IUIAnimationTransition **transition); +} + [ uuid(44ca24db-1a92-4149-bab5-fb14d64b401e), version(1.0) @@ -347,4 +590,28 @@ library UIAnimation { [default] interface IUIAnimationTimer; } + + [ + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8) + ] + coclass UIAnimationManager + { + [default] interface IUIAnimationManager; + } + + [ + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887) + ] + coclass UIAnimationTransitionFactory + { + [default] interface IUIAnimationTransitionFactory; + } + + [ + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145) + ] + coclass UIAnimationTransitionLibrary + { + [default] interface IUIAnimationTransitionLibrary; + } } -- 2.21.0

1 0

[PATCH] cmd: Allow starting native executables
by Fabian Maurer 07 Mar '19

07 Mar '19

Note that this is obviously different from what windows cmd does, but Wine has a different situation. Running native binaries without 'start' is pretty useful, IMHO. We check for a magic signature to avoid regressions in case there is a file without the extension that's not a native executable. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/cmd/wcmdmain.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 637c0e94bd..26910ee4c8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1009,6 +1009,29 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) } } +static BOOL is_native_executable(WCHAR *path) +{ + HANDLE file; + char buffer[4]; + static const char magic_elf[] = {0x7f, 'E', 'L', 'F'}; + DWORD bytes_read; + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ReadFile(file, buffer, ARRAY_SIZE(buffer), &bytes_read, NULL); + CloseHandle(file); + + if (bytes_read < ARRAY_SIZE(buffer)) + return FALSE; + + if (memcmp(buffer, magic_elf, 4) == 0) + return TRUE; + + if (memcmp(buffer, "#!/", 3) == 0) + return TRUE; + + return FALSE; +} + /****************************************************************************** * WCMD_run_program * @@ -1141,11 +1164,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) strcatW(thisDir, stemofsearch); pos = &thisDir[strlenW(thisDir)]; /* Pos = end of name */ - /* 1. If extension supplied, see if that file exists */ - if (extensionsupplied) { - if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { - found = TRUE; - } + /* 1. If extension supplied, see if that file exists - also check if we got a path to a native executable */ + if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) { + if (extensionsupplied || is_native_executable(thisDir)) { + found = TRUE; + } } /* 2. Any .* matches? */ -- 2.21.0

2 5

[PATCH 7/7] d3dx9: Merge the d3dx_effect_GetBoolArray() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 43 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4ff695c6dd..4deb40f55e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1400,30 +1400,6 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, BOOL *b, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && (param->class == D3DXPC_SCALAR - || param->class == D3DXPC_VECTOR - || param->class == D3DXPC_MATRIX_ROWS - || param->class == D3DXPC_MATRIX_COLUMNS)) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - for (i = 0; i < size; ++i) - { - set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); - } - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHANDLE parameter, INT n) { struct d3dx_parameter *param = get_valid_parameter(base, parameter); @@ -3522,10 +3498,27 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); - return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); + if (b && param && (param->class == D3DXPC_SCALAR + || param->class == D3DXPC_VECTOR + || param->class == D3DXPC_MATRIX_ROWS + || param->class == D3DXPC_MATRIX_COLUMNS)) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + for (i = 0; i < size; ++i) + { + set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); + } + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) -- 2.20.1

3 2

[PATCH 6/7] d3dx9: Merge the d3dx_effect_GetBool() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8147dc14a1..4ff695c6dd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1361,22 +1361,6 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_bool(struct d3dx9_base_effect *base, D3DXHANDLE parameter, BOOL *b) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) - { - set_number(b, D3DXPT_BOOL, param->data, param->type); - TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const BOOL *b, UINT count) { @@ -3510,10 +3494,20 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); - return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); + if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(b, D3DXPT_BOOL, param->data, param->type); + TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) -- 2.20.1

3 2

[PATCH 5/7] d3dx9: Move objects out of struct d3dx9_base_effect
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2a201446b4..8147dc14a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -156,7 +156,6 @@ struct d3dx9_base_effect struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; - struct d3dx_object *objects; struct d3dx_effect_pool *pool; DWORD flags; @@ -176,6 +175,7 @@ struct d3dx_effect struct d3dx9_base_effect base_effect; unsigned int parameter_count; unsigned int object_count; + struct d3dx_object *objects; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -705,14 +705,14 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) base->techniques = NULL; } - if (base->objects) + if (base->effect->objects) { for (i = 0; i < base->effect->object_count; ++i) { - free_object(&base->objects[i]); + free_object(&base->effect->objects[i]); } - HeapFree(GetProcessHeap(), 0, base->objects); - base->objects = NULL; + HeapFree(GetProcessHeap(), 0, base->effect->objects); + base->effect->objects = NULL; } } @@ -3171,7 +3171,7 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas FALSE, &param_dirty))) return hr; - data = param->object_id ? effect->base_effect.objects[param->object_id].data : NULL; + data = param->object_id ? effect->objects[param->object_id].data : NULL; if (state_table[state->operation].class == SC_VERTEXSHADER) desc->pVertexShaderFunction = data; else @@ -3884,7 +3884,6 @@ static D3DXHANDLE WINAPI d3dx_effect_GetCurrentTechnique(ID3DXEffect *iface) static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *tech = get_valid_technique(effect, technique); HRESULT ret = D3D_OK; unsigned int i, j; @@ -3916,7 +3915,7 @@ static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHAND FALSE, &param_dirty))) return hr; - if (param->object_id && base->objects[param->object_id].creation_failed) + if (param->object_id && effect->objects[param->object_id].creation_failed) { ret = E_FAIL; goto done; @@ -5310,7 +5309,7 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) static HRESULT d3dx9_copy_data(struct d3dx_effect *effect, unsigned int object_id, const char **ptr) { - struct d3dx_object *object = &effect->base_effect.objects[object_id]; + struct d3dx_object *object = &effect->objects[object_id]; if (object->size || object->data) { @@ -6007,7 +6006,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx struct d3dx9_base_effect *base = &effect->base_effect; DWORD string_size; struct d3dx_parameter *param = &state->parameter; - struct d3dx_object *object = &base->objects[param->object_id]; + struct d3dx_object *object = &effect->objects[param->object_id]; char *ptr = object->data; HRESULT ret; @@ -6048,7 +6047,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx if (!param->members[i].param_eval) { TRACE("Creating preshader for object %u.\n", param->members[i].object_id); - object = &base->objects[param->members[i].object_id]; + object = &effect->objects[param->members[i].object_id]; if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type, &param->members[i].param_eval, get_version_counter_ptr(base), skip_constants, skip_constants_count))) @@ -6149,7 +6148,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, TRACE("State operation %#x (%s).\n", state->operation, state_table[state->operation].name); param = &state->parameter; TRACE("Using object id %u.\n", param->object_id); - object = &base->objects[param->object_id]; + object = &effect->objects[param->object_id]; TRACE("Usage %u: class %s, type %s.\n", usage, debug_d3dxparameter_class(param->class), debug_d3dxparameter_type(param->type)); @@ -6207,7 +6206,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) { - struct d3dx_object *refobj = &base->objects[refpar->object_id]; + struct d3dx_object *refobj = &effect->objects[refpar->object_id]; if (!refpar->param_eval) { @@ -6266,8 +6265,9 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U read_dword(&ptr, &effect->object_count); TRACE("Object count: %u.\n", effect->object_count); - base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * effect->object_count); - if (!base->objects) + effect->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*effect->objects) * effect->object_count); + if (!effect->objects) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; @@ -6289,7 +6289,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); - hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); @@ -6315,7 +6315,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < base->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); - hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse technique %u.\n", i); @@ -6340,9 +6340,9 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U if (FAILED(hr = d3dx9_copy_data(effect, id, &ptr))) goto err_out; - if (base->objects[id].data) + if (effect->objects[id].data) { - if (FAILED(hr = d3dx9_create_object(base, &base->objects[id]))) + if (FAILED(hr = d3dx9_create_object(base, &effect->objects[id]))) goto err_out; } } @@ -6390,14 +6390,14 @@ err_out: base->parameters = NULL; } - if (base->objects) + if (effect->objects) { for (i = 0; i < effect->object_count; ++i) { - free_object(&base->objects[i]); + free_object(&effect->objects[i]); } - HeapFree(GetProcessHeap(), 0, base->objects); - base->objects = NULL; + HeapFree(GetProcessHeap(), 0, effect->objects); + effect->objects = NULL; } return hr; -- 2.20.1

3 2

[PATCH 4/7] d3dx9: Merge the d3dx_effect_GetPassDesc() helper
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 95 +++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 51 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index acc0eb786f..2a201446b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1110,55 +1110,6 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta return E_NOTIMPL; } -static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, - D3DXHANDLE pass_handle, D3DXPASS_DESC *desc) -{ - struct d3dx_pass *pass = get_valid_pass(base, pass_handle); - unsigned int i; - - if (!desc || !pass) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = pass->name; - desc->Annotations = pass->annotation_count; - - desc->pVertexShaderFunction = NULL; - desc->pPixelShaderFunction = NULL; - - if (base->flags & D3DXFX_NOT_CLONEABLE) - return D3D_OK; - - for (i = 0; i < pass->state_count; ++i) - { - struct d3dx_state *state = &pass->states[i]; - - if (state_table[state->operation].class == SC_VERTEXSHADER - || state_table[state->operation].class == SC_PIXELSHADER) - { - struct d3dx_parameter *param; - void *param_value; - BOOL param_dirty; - HRESULT hr; - void *data; - - if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, - FALSE, &param_dirty))) - return hr; - - data = param->object_id ? base->objects[param->object_id].data : NULL; - if (state_table[state->operation].class == SC_VERTEXSHADER) - desc->pVertexShaderFunction = data; - else - desc->pPixelShaderFunction = data; - } - } - - return D3D_OK; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3180,13 +3131,55 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL return D3D_OK; } -static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) +static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle); + unsigned int i; TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); - return d3dx9_base_effect_get_pass_desc(&effect->base_effect, pass, desc); + if (!desc || !pass) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = pass->name; + desc->Annotations = pass->annotation_count; + + desc->pVertexShaderFunction = NULL; + desc->pPixelShaderFunction = NULL; + + if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE) + return D3D_OK; + + for (i = 0; i < pass->state_count; ++i) + { + struct d3dx_state *state = &pass->states[i]; + + if (state_table[state->operation].class == SC_VERTEXSHADER + || state_table[state->operation].class == SC_PIXELSHADER) + { + struct d3dx_parameter *param; + void *param_value; + BOOL param_dirty; + HRESULT hr; + void *data; + + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, &pass->states[i], &param_value, &param, + FALSE, &param_dirty))) + return hr; + + data = param->object_id ? effect->base_effect.objects[param->object_id].data : NULL; + if (state_table[state->operation].class == SC_VERTEXSHADER) + desc->pVertexShaderFunction = data; + else + desc->pPixelShaderFunction = data; + } + } + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, -- 2.20.1

3 2

[PATCH 3/7] d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data()
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 992d7b466f..acc0eb786f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5315,9 +5315,9 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx_effect *effect, unsigned int object_id, const char **ptr) { - struct d3dx_object *object = &base->objects[object_id]; + struct d3dx_object *object = &effect->base_effect.objects[object_id]; if (object->size || object->data) { @@ -6168,7 +6168,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (object->data) @@ -6187,7 +6187,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval, get_version_counter_ptr(base), NULL, 0))) @@ -6202,7 +6202,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); @@ -6234,7 +6234,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; hr = d3dx_parse_array_selector(effect, state, skip_constants, skip_constants_count); break; @@ -6344,7 +6344,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U read_dword(&ptr, &id); TRACE("id: %u.\n", id); - if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, id, &ptr))) goto err_out; if (base->objects[id].data) -- 2.20.1

3 2

[PATCH 2/7] d3dx9: Move object_count out of struct d3dx9_base_effect
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bbbfb45a5e..992d7b466f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -153,7 +153,6 @@ struct d3dx9_base_effect struct d3dx_effect *effect; UINT technique_count; - UINT object_count; struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; @@ -176,6 +175,7 @@ struct d3dx_effect struct d3dx9_base_effect base_effect; unsigned int parameter_count; + unsigned int object_count; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -707,7 +707,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->objects) { - for (i = 0; i < base->object_count; ++i) + for (i = 0; i < base->effect->object_count; ++i) { free_object(&base->objects[i]); } @@ -6270,10 +6270,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U skip_dword_unknown(&ptr, 1); - read_dword(&ptr, &base->object_count); - TRACE("Object count: %u.\n", base->object_count); + read_dword(&ptr, &effect->object_count); + TRACE("Object count: %u.\n", effect->object_count); - base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * base->object_count); + base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * effect->object_count); if (!base->objects) { ERR("Out of memory.\n"); @@ -6399,7 +6399,7 @@ err_out: if (base->objects) { - for (i = 0; i < base->object_count; ++i) + for (i = 0; i < effect->object_count; ++i) { free_object(&base->objects[i]); } -- 2.20.1

3 2

[PATCH 1/7] d3dx9: Pass a struct d3dx_effect to the get technique helpers
by Michael Stefaniuc 07 Mar '19

07 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6a0b262b7a..bbbfb45a5e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -453,9 +453,10 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE)pass; } -static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *base, const char *name) +static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, const char *name) { - UINT i; + struct d3dx9_base_effect *base = &effect->base_effect; + unsigned int i; if (!name) return NULL; @@ -468,8 +469,9 @@ static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *ba return NULL; } -static struct d3dx_technique *get_valid_technique(struct d3dx9_base_effect *base, D3DXHANDLE technique) +static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3DXHANDLE technique) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; for (i = 0; i < base->technique_count; ++i) @@ -478,7 +480,7 @@ static struct d3dx_technique *get_valid_technique(struct d3dx9_base_effect *base return &base->techniques[i]; } - return get_technique_by_name(base, technique); + return get_technique_by_name(effect, technique); } static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass) @@ -1163,7 +1165,7 @@ static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXH struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); - struct d3dx_technique *technique = get_valid_technique(base, object); + struct d3dx_technique *technique = get_valid_technique(effect, object); if (pass) { @@ -3161,7 +3163,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0]; + struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->base_effect.techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); @@ -3357,7 +3359,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_technique_by_name(&effect->base_effect, name); + struct d3dx_technique *tech = get_technique_by_name(effect, name); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -3376,7 +3378,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); @@ -3394,7 +3396,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); @@ -3860,15 +3862,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** static HRESULT WINAPI d3dx_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &This->base_effect; - struct d3dx_technique *tech = get_valid_technique(base, technique); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(effect, technique); - TRACE("iface %p, technique %p\n", This, technique); + TRACE("iface %p, technique %p\n", iface, technique); if (tech) { - This->active_technique = tech; + effect->active_technique = tech; TRACE("Technique %p\n", tech); return D3D_OK; } @@ -3891,7 +3892,7 @@ static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHAND { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; - struct d3dx_technique *tech = get_valid_technique(base, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); HRESULT ret = D3D_OK; unsigned int i, j; @@ -3947,7 +3948,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D if (technique) { - if (!(prev_tech = get_valid_technique(base, technique))) + if (!(prev_tech = get_valid_technique(effect, technique))) return D3DERR_INVALIDCALL; for (i = 0; i < base->technique_count; ++i) @@ -4090,7 +4091,7 @@ static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE pa { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); BOOL ret; TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); -- 2.20.1

3 2

[PATCH] winebus.sys: Allow mapping of SDL controllers
by Aric Stewart 07 Mar '19

07 Mar '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

2 2

[PATCH 3/5] d3d12: Add stub for D3D12SerializeVersionedRootSignature().
by Józef Kucia 07 Mar '19

07 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12.spec | 2 ++ dlls/d3d12/d3d12_main.c | 13 +++++++++++++ include/d3d12.idl | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 9e798916658d..5c4f4cfecf8a 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -7,3 +7,5 @@ @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) +#@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 92a235ee5f7e..d6d691c3c237 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -182,3 +182,16 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); } + +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + FIXME("desc %p, blob %p, error_blob %p partial-stub!\n", + desc, blob, error_blob); + + if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) + return D3D12SerializeRootSignature(&desc->Desc_1_0, desc->Version, blob, error_blob); + + FIXME("Unsupported version %#x.\n", desc->Version); + return E_NOTIMPL; +} diff --git a/include/d3d12.idl b/include/d3d12.idl index 307a4fd375cb..3a5a9141e841 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,6 +2171,10 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); -- 2.19.2

3 2

[PATCH 5/5] dxgi: Trace mode on separate line for FindClosestMatchingMode().
by Józef Kucia 07 Mar '19

07 Mar '19

For more readable logs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a4b0fc987b1..123dee8c99e2 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -305,8 +305,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); wined3d_display_mode_from_dxgi(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); @@ -422,8 +424,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode1(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode1(mode)); wined3d_display_mode_from_dxgi1(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); -- 2.19.2

3 2

[PATCH 4/5] dxgi: Implement dxgi_output_GetDisplayModeList1().
by Józef Kucia 07 Mar '19

07 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 149 +++++++++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index b1f20b92ebf5..4a4b0fc987b1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,85 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +enum dxgi_mode_struct_version +{ + DXGI_MODE_STRUCT_VERSION_0, + DXGI_MODE_STRUCT_VERSION_1, +}; + +static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, + DXGI_FORMAT format, unsigned int *mode_count, void *modes, + enum dxgi_mode_struct_version struct_version) +{ + enum wined3d_format_id wined3d_format; + struct wined3d_display_mode mode; + unsigned int i, max_count; + struct wined3d *wined3d; + HRESULT hr; + + if (!mode_count) + return DXGI_ERROR_INVALID_CALL; + + if (format == DXGI_FORMAT_UNKNOWN) + { + *mode_count = 0; + return S_OK; + } + + wined3d_format = wined3dformat_from_dxgi_format(format); + + wined3d_mutex_lock(); + wined3d = output->adapter->factory->wined3d; + max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); + + if (!modes) + { + wined3d_mutex_unlock(); + *mode_count = max_count; + return S_OK; + } + + if (max_count > *mode_count) + { + wined3d_mutex_unlock(); + return DXGI_ERROR_MORE_DATA; + } + + *mode_count = max_count; + + for (i = 0; i < *mode_count; ++i) + { + if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode))) + { + WARN("Failed to enum adapter mode %u, hr %#x.\n", i, hr); + wined3d_mutex_unlock(); + return hr; + } + + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + { + DXGI_MODE_DESC *desc = modes; + dxgi_mode_from_wined3d(&desc[i], &mode); + break; + } + + case DXGI_MODE_STRUCT_VERSION_1: + { + DXGI_MODE_DESC1 *desc = modes; + dxgi_mode1_from_wined3d(&desc[i], &mode); + break; + } + } + } + wined3d_mutex_unlock(); + + return S_OK; +} + static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); @@ -208,66 +287,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O } static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, - DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) + DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - enum wined3d_format_id wined3d_format; - unsigned int i, max_count; - struct wined3d *wined3d; - - FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", - iface, debug_dxgi_format(format), flags, mode_count, desc); - - if (!mode_count) - return DXGI_ERROR_INVALID_CALL; - - if (format == DXGI_FORMAT_UNKNOWN) - { - *mode_count = 0; - return S_OK; - } - wined3d = output->adapter->factory->wined3d; - wined3d_format = wined3dformat_from_dxgi_format(format); + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); - wined3d_mutex_lock(); - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, - wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - - if (!desc) - { - wined3d_mutex_unlock(); - *mode_count = max_count; - return S_OK; - } - - if (max_count > *mode_count) - { - wined3d_mutex_unlock(); - return DXGI_ERROR_MORE_DATA; - } - - *mode_count = max_count; - - for (i = 0; i < *mode_count; ++i) - { - struct wined3d_display_mode mode; - HRESULT hr; - - hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, wined3d_format, - WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); - if (FAILED(hr)) - { - WARN("EnumAdapterModes failed, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - dxgi_mode_from_wined3d(&desc[i], &mode); - } - wined3d_mutex_unlock(); - - return S_OK; + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, @@ -378,10 +406,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - FIXME("iface %p, format %#x, flags %#x, mode_count %p, modes %p stub!\n", - iface, format, flags, mode_count, modes); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - return E_NOTIMPL; + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); + + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, -- 2.19.2

3 2

[PATCH 1/5] d3d12: Remove export ordinals.
by Józef Kucia 07 Mar '19

07 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 53151bf154e0..336138109e33 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,8 +1,8 @@ -100 stub GetBehaviorValue -101 stdcall D3D12CreateDevice(ptr long ptr ptr) -102 stdcall D3D12GetDebugInterface(ptr ptr) -103 stub D3D12CoreCreateLayeredDevice -104 stub D3D12CoreGetLayeredDeviceSize -105 stub D3D12CoreRegisterLayers -106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -107 stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stub GetBehaviorValue +@ stdcall D3D12CreateDevice(ptr long ptr ptr) +@ stdcall D3D12GetDebugInterface(ptr ptr) +@ stub D3D12CoreCreateLayeredDevice +@ stub D3D12CoreGetLayeredDeviceSize +@ stub D3D12CoreRegisterLayers +@ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) +@ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) -- 2.19.2

3 2

[PATCH 2/5] d3d12: Add stub for D3D12EnableExperimentalFeatures().
by Józef Kucia 07 Mar '19

07 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12.spec | 1 + dlls/d3d12/d3d12_main.c | 9 +++++++++ include/d3d12.idl | 3 +++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 336138109e33..9e798916658d 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -6,3 +6,4 @@ @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index f0c48ee7af43..92a235ee5f7e 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -45,6 +45,15 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return DXGI_ERROR_SDK_COMPONENT_MISSING; } +HRESULT WINAPI D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes) +{ + FIXME("feature_count %u, iids %p, configurations %p, configurations_sizes %p stub!\n", + feature_count, iids, configurations, configurations_sizes); + + return E_NOINTERFACE; +} + static HRESULT d3d12_signal_event(HANDLE event) { return SetEvent(event) ? S_OK : E_FAIL; diff --git a/include/d3d12.idl b/include/d3d12.idl index 6f515e6ad6d1..307a4fd375cb 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2180,3 +2180,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes); -- 2.19.2

3 2

[PATCH vkd3d 2/5] vkd3d: Allow more memory types for custom heaps.
by Józef Kucia 07 Mar '19

07 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c1a80c0360f8..1d13be5982c5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -24,7 +24,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; - VkMemoryPropertyFlags flags[2]; + VkMemoryPropertyFlags flags[3]; unsigned int i, j, count = 0; switch (heap_properties->Type) @@ -37,13 +37,18 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; + case D3D12_HEAP_TYPE_READBACK: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); - /* fall-through */ - case D3D12_HEAP_TYPE_READBACK: flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; break; default: -- 2.19.2

2 1

[PATCH vkd3d 4/5] vkd3d: Do not crash on NULL views in IASetIndexBuffers().
by Józef Kucia 07 Mar '19

07 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 6 ++++++ tests/d3d12.c | 1 + 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e535f2020012..9ed768d1ac5c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3583,6 +3583,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics TRACE("iface %p, view %p.\n", iface, view); + if (!view) + { + WARN("Ignoring NULL index buffer view.\n"); + return; + } + vk_procs = &list->device->vk_procs; switch (view->Format) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f869d229db3..173c576e1855 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4492,6 +4492,7 @@ static void test_draw_indexed_instanced(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, NULL); ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); -- 2.19.2

2 1

[PATCH vkd3d 5/5] vkd3d: Update command list to ID3D12GraphicsCommandList1.
by Józef Kucia 07 Mar '19

07 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 55 +++++++ libs/vkd3d/command.c | 310 ++++++++++++++++++++++--------------- libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 242 insertions(+), 129 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 53874141dd12..9d5fd7351837 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -216,6 +216,18 @@ typedef struct D3D12_RANGE SIZE_T End; } D3D12_RANGE; +typedef struct D3D12_RANGE_UINT64 +{ + UINT64 Begin; + UINT64 End; +} D3D12_RANGE_UINT64; + +typedef struct D3D12_SUBRESOURCE_RANGE_UINT64 +{ + UINT Subresource; + D3D12_RANGE_UINT64 Range; +} D3D12_SUBRESOURCE_RANGE_UINT64; + typedef struct D3D12_RESOURCE_ALLOCATION_INFO { UINT64 SizeInBytes; @@ -513,6 +525,20 @@ typedef struct D3D12_RESOURCE_DESC D3D12_RESOURCE_FLAGS Flags; } D3D12_RESOURCE_DESC; +typedef enum D3D12_RESOLVE_MODE +{ + D3D12_RESOLVE_MODE_DECOMPRESS = 0, + D3D12_RESOLVE_MODE_MIN = 1, + D3D12_RESOLVE_MODE_MAX = 2, + D3D12_RESOLVE_MODE_AVERAGE = 3, +} D3D12_RESOLVE_MODE; + +typedef struct D3D12_SAMPLE_POSITION +{ + INT8 X; + INT8 Y; +} D3D12_SAMPLE_POSITION; + typedef enum D3D12_TEXTURE_COPY_TYPE { D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX = 0, @@ -1917,6 +1943,35 @@ interface ID3D12GraphicsCommandList : ID3D12CommandList ID3D12Resource *count_buffer, UINT64 count_buffer_offset); } +[ + uuid(553103fb-1fe7-4557-bb38-946d7d0e7ca7), + object, + local, + pointer_default(unique) +] +interface ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandList +{ + void AtomicCopyBufferUINT(ID3D12Resource *dst_buffer, UINT64 dst_offset, + ID3D12Resource *src_buffer, UINT64 src_offset, + UINT dependent_resource_count, ID3D12Resource * const *dependent_resources, + const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges); + + void AtomicCopyBufferUINT64(ID3D12Resource *dst_buffer, UINT64 dst_offset, + ID3D12Resource *src_buffer, UINT64 src_offset, + UINT dependent_resource_count, ID3D12Resource * const *dependent_resources, + const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges); + + void OMSetDepthBounds(FLOAT min, FLOAT max); + + void SetSamplePositions(UINT sample_count, UINT pixel_count, + D3D12_SAMPLE_POSITION *sample_positions); + + void ResolveSubresourceRegion(ID3D12Resource *dst_resource, + UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y, + ID3D12Resource *src_resource, UINT src_sub_resource_idx, + D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode); +} + typedef enum D3D12_TILE_RANGE_FLAGS { D3D12_TILE_RANGE_FLAG_NONE = 0x0, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9ed768d1ac5c..872504df760a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1286,9 +1286,9 @@ HRESULT d3d12_command_allocator_create(struct d3d12_device *device, } /* ID3D12CommandList */ -static inline struct d3d12_command_list *impl_from_ID3D12GraphicsCommandList(ID3D12GraphicsCommandList *iface) +static inline struct d3d12_command_list *impl_from_ID3D12GraphicsCommandList1(ID3D12GraphicsCommandList1 *iface) { - return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList_iface); + return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface); } static void d3d12_command_list_invalidate_current_framebuffer(struct d3d12_command_list *list) @@ -1604,31 +1604,32 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l } } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList *iface, - REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12GraphicsCommandList1 *iface, + REFIID iid, void **object) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); - if (IsEqualGUID(riid, &IID_ID3D12GraphicsCommandList) - || IsEqualGUID(riid, &IID_ID3D12CommandList) - || IsEqualGUID(riid, &IID_ID3D12DeviceChild) - || IsEqualGUID(riid, &IID_ID3D12Object) - || IsEqualGUID(riid, &IID_IUnknown)) + if (IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList1) + || IsEqualGUID(iid, &IID_ID3D12GraphicsCommandList) + || IsEqualGUID(iid, &IID_ID3D12CommandList) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) { - ID3D12GraphicsCommandList_AddRef(iface); + ID3D12GraphicsCommandList1_AddRef(iface); *object = iface; return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList *iface) +static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList1 *iface) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); ULONG refcount = InterlockedIncrement(&list->refcount); TRACE("%p increasing refcount to %u.\n", list, refcount); @@ -1636,9 +1637,9 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandLi return refcount; } -static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList *iface) +static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList1 *iface) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); ULONG refcount = InterlockedDecrement(&list->refcount); TRACE("%p decreasing refcount to %u.\n", list, refcount); @@ -1661,67 +1662,67 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL return refcount; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetPrivateData(ID3D12GraphicsCommandList1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return vkd3d_get_private_data(&list->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateData(ID3D12GraphicsCommandList1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return vkd3d_set_private_data(&list->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetPrivateDataInterface(ID3D12GraphicsCommandList1 *iface, REFGUID guid, const IUnknown *data) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); return vkd3d_set_private_data_interface(&list->private_store, guid, data); } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList *iface, const WCHAR *name) +static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsCommandList1 *iface, const WCHAR *name) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, name %s.\n", iface, debugstr_w(name, list->device->wchar_size)); return name ? S_OK : E_INVALIDARG; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList1 *iface, REFIID riid, void **device) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); return ID3D12Device_QueryInterface(&list->device->ID3D12Device_iface, riid, device); } -static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList *iface) +static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList1 *iface) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p.\n", iface); return list->type; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandList *iface) +static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandList1 *iface) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; VkResult vr; @@ -1763,7 +1764,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL static void d3d12_command_list_reset_state(struct d3d12_command_list *list, ID3D12PipelineState *initial_pipeline_state) { - ID3D12GraphicsCommandList *iface = &list->ID3D12GraphicsCommandList_iface; + ID3D12GraphicsCommandList1 *iface = &list->ID3D12GraphicsCommandList1_iface; memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = D3D_PRIMITIVE_TOPOLOGY_POINTLIST; @@ -1788,14 +1789,14 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); - ID3D12GraphicsCommandList_SetPipelineState(iface, initial_pipeline_state); + ID3D12GraphicsCommandList1_SetPipelineState(iface, initial_pipeline_state); } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandList1 *iface, ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_pipeline_state) { struct d3d12_command_allocator *allocator_impl = unsafe_impl_from_ID3D12CommandAllocator(allocator); - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); HRESULT hr; TRACE("iface %p, allocator %p, initial_pipeline_state %p.\n", @@ -1822,7 +1823,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL return hr; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList *iface, +static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList1 *iface, ID3D12PipelineState *pipeline_state) { FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); @@ -2369,11 +2370,11 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c } } -static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList1 *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, vertex_count_per_instance %u, instance_count %u, " @@ -2393,11 +2394,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom instance_count, start_vertex_location, start_instance_location)); } -static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList1 *iface, UINT index_count_per_instance, UINT instance_count, UINT start_vertex_location, INT base_vertex_location, UINT start_instance_location) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, index_count_per_instance %u, instance_count %u, start_vertex_location %u, " @@ -2419,10 +2420,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } -static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList1 *iface, UINT x, UINT y, UINT z) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, x %u, y %u, z %u.\n", iface, x, y, z); @@ -2442,10 +2443,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL VK_CALL(vkCmdDispatch(list->vk_command_buffer, x, y, z)); } -static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *dst, UINT64 dst_offset, ID3D12Resource *src, UINT64 src_offset, UINT64 byte_count) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *dst_resource, *src_resource; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy buffer_copy; @@ -2666,11 +2667,11 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); } -static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12GraphicsCommandList1 *iface, const D3D12_TEXTURE_COPY_LOCATION *dst, UINT dst_x, UINT dst_y, UINT dst_z, const D3D12_TEXTURE_COPY_LOCATION *src, const D3D12_BOX *src_box) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *dst_resource, *src_resource; const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; @@ -2781,10 +2782,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic } } -static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *dst, ID3D12Resource *src) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *dst_resource, *src_resource; const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; @@ -2849,7 +2850,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } } -static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *tiled_resource, const D3D12_TILED_RESOURCE_COORDINATE *tile_region_start_coordinate, const D3D12_TILE_REGION_SIZE *tile_region_size, ID3D12Resource *buffer, UINT64 buffer_offset, D3D12_TILE_COPY_FLAGS flags) @@ -2860,11 +2861,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTiles(ID3D12GraphicsCommand buffer, buffer_offset, flags); } -static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *dst, UINT dst_sub_resource_idx, ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_format *src_format, *dst_format, *vk_format; struct d3d12_resource *dst_resource, *src_resource; const struct vkd3d_vk_device_procs *vk_procs; @@ -2933,10 +2934,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_resolve)); } -static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12GraphicsCommandList1 *iface, D3D12_PRIMITIVE_TOPOLOGY topology) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, topology %#x.\n", iface, topology); @@ -2950,11 +2951,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr d3d12_command_list_invalidate_current_pipeline(list); } -static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCommandList1 *iface, UINT viewport_count, const D3D12_VIEWPORT *viewports) { VkViewport vk_viewports[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE]; - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; unsigned int i; @@ -2982,10 +2983,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetViewports(ID3D12GraphicsCo VK_CALL(vkCmdSetViewport(list->vk_command_buffer, 0, viewport_count, vk_viewports)); } -static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12GraphicsCommandList1 *iface, UINT rect_count, const D3D12_RECT *rects) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; struct VkRect2D *vk_rects; unsigned int i; @@ -3012,10 +3013,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic free(vk_rects); } -static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList1 *iface, const FLOAT blend_factor[4]) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, blend_factor %p.\n", iface, blend_factor); @@ -3024,10 +3025,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12Graphics VK_CALL(vkCmdSetBlendConstants(list->vk_command_buffer, blend_factor)); } -static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList1 *iface, UINT stencil_ref) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, stencil_ref %u.\n", iface, stencil_ref); @@ -3036,11 +3037,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsC VK_CALL(vkCmdSetStencilReference(list->vk_command_buffer, VK_STENCIL_FRONT_AND_BACK, stencil_ref)); } -static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12GraphicsCommandList1 *iface, ID3D12PipelineState *pipeline_state) { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); @@ -3066,10 +3067,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics list->state = state; } -static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList1 *iface, UINT barrier_count, const D3D12_RESOURCE_BARRIER *barriers) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; unsigned int i; @@ -3256,13 +3257,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC WARN("Issuing split barrier(s) on D3D12_RESOURCE_BARRIER_FLAG_END_ONLY.\n"); } -static void STDMETHODCALLTYPE d3d12_command_list_ExecuteBundle(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ExecuteBundle(ID3D12GraphicsCommandList1 *iface, ID3D12GraphicsCommandList *command_list) { FIXME("iface %p, command_list %p stub!\n", iface, command_list); } -static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(ID3D12GraphicsCommandList1 *iface, UINT heap_count, ID3D12DescriptorHeap *const *heaps) { TRACE("iface %p, heap_count %u, heaps %p.\n", iface, heap_count, heaps); @@ -3287,10 +3288,10 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->push_descriptor_active_mask = 0; } -static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface, ID3D12RootSignature *root_signature) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_signature %p.\n", iface, root_signature); @@ -3298,10 +3299,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12G unsafe_impl_from_ID3D12RootSignature(root_signature)); } -static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList1 *iface, ID3D12RootSignature *root_signature) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_signature %p.\n", iface, root_signature); @@ -3323,10 +3324,10 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } -static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n", iface, root_parameter_index, base_descriptor.ptr); @@ -3335,10 +3336,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(I root_parameter_index, base_descriptor); } -static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n", iface, root_parameter_index, base_descriptor.ptr); @@ -3361,10 +3362,10 @@ static void d3d12_command_list_set_root_constants(struct d3d12_command_list *lis c->stage_flags, c->offset + offset * sizeof(uint32_t), count * sizeof(uint32_t), data)); } -static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, UINT data, UINT dst_offset) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n", iface, root_parameter_index, data, dst_offset); @@ -3373,10 +3374,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3 root_parameter_index, dst_offset, 1, &data); } -static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, UINT data, UINT dst_offset) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n", iface, root_parameter_index, data, dst_offset); @@ -3385,10 +3386,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID root_parameter_index, dst_offset, 1, &data); } -static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n", iface, root_parameter_index, constant_count, data, dst_offset); @@ -3397,10 +3398,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID root_parameter_index, dst_offset, constant_count, data); } -static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, UINT constant_count, const void *data, UINT dst_offset) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n", iface, root_parameter_index, constant_count, data, dst_offset); @@ -3453,9 +3454,9 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3464,9 +3465,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferVie } static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3526,9 +3527,9 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3538,9 +3539,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootShaderResourceVie } static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3550,9 +3551,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootShaderResourceVi } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3562,9 +3563,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootUnorderedAccessVi } static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessView( - ID3D12GraphicsCommandList *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) + ID3D12GraphicsCommandList1 *iface, UINT root_parameter_index, D3D12_GPU_VIRTUAL_ADDRESS address) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address); @@ -3573,10 +3574,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootUnorderedAccessV root_parameter_index, address); } -static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12GraphicsCommandList1 *iface, const D3D12_INDEX_BUFFER_VIEW *view) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; struct d3d12_resource *resource; enum VkIndexType index_type; @@ -3611,10 +3612,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics view->BufferLocation - resource->gpu_address, index_type)); } -static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12GraphicsCommandList1 *iface, UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct vkd3d_gpu_va_allocator *gpu_va_allocator; VkDeviceSize offsets[ARRAY_SIZE(list->strides)]; const struct vkd3d_vk_device_procs *vk_procs; @@ -3667,10 +3668,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi d3d12_command_list_invalidate_current_pipeline(list); } -static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList1 *iface, UINT start_slot, UINT view_count, const D3D12_STREAM_OUTPUT_BUFFER_VIEW *views) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); VkDeviceSize offsets[ARRAY_SIZE(list->so_counter_buffers)]; VkDeviceSize sizes[ARRAY_SIZE(list->so_counter_buffers)]; VkBuffer buffers[ARRAY_SIZE(list->so_counter_buffers)]; @@ -3730,11 +3731,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes)); } -static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList1 *iface, UINT render_target_descriptor_count, const D3D12_CPU_DESCRIPTOR_HANDLE *render_target_descriptors, BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; struct vkd3d_view *view; @@ -3928,12 +3929,12 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, } } -static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12GraphicsCommandList1 *iface, D3D12_CPU_DESCRIPTOR_HANDLE dsv, D3D12_CLEAR_FLAGS flags, float depth, UINT8 stencil, UINT rect_count, const D3D12_RECT *rects) { const union VkClearValue clear_value = {.depthStencil = {depth, stencil}}; - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; @@ -3977,11 +3978,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra &clear_value, rect_count, rects); } -static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList1 *iface, D3D12_CPU_DESCRIPTOR_HANDLE rtv, const FLOAT color[4], UINT rect_count, const D3D12_RECT *rects) { const union VkClearValue clear_value = {{{color[0], color[1], color[2], color[3]}}}; - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference color_reference; @@ -4009,11 +4010,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra &clear_value, rect_count, rects); } -static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const UINT values[4], UINT rect_count, const D3D12_RECT *rects) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; @@ -4068,11 +4069,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID } } -static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList1 *iface, D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle, ID3D12Resource *resource, const float values[4], UINT rect_count, const D3D12_RECT *rects) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *resource_impl; FIXME("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p stub!\n", @@ -4083,16 +4084,16 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I d3d12_command_list_track_resource_usage(list, resource_impl); } -static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_DiscardResource(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *resource, const D3D12_DISCARD_REGION *region) { FIXME("iface %p, resource %p, region %p stub!\n", iface, resource, region); } -static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsCommandList1 *iface, ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); const struct vkd3d_vk_device_procs *vk_procs; VkQueryControlFlags flags = 0; @@ -4119,10 +4120,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman VK_CALL(vkCmdBeginQuery(list->vk_command_buffer, query_heap->vk_query_pool, index, flags)); } -static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandList1 *iface, ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT index) { - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); const struct vkd3d_vk_device_procs *vk_procs; @@ -4164,12 +4165,12 @@ static size_t get_query_stride(D3D12_QUERY_TYPE type) return sizeof(uint64_t); } -static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList1 *iface, ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT start_index, UINT query_count, ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset) { const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); const struct vkd3d_vk_device_procs *vk_procs; unsigned int i, first, count; @@ -4245,26 +4246,26 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics } } -static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetPredication(ID3D12GraphicsCommandList1 *iface, ID3D12Resource *buffer, UINT64 aligned_buffer_offset, D3D12_PREDICATION_OP operation) { FIXME("iface %p, buffer %p, aligned_buffer_offset %#"PRIx64", operation %#x stub!\n", iface, buffer, aligned_buffer_offset, operation); } -static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_SetMarker(ID3D12GraphicsCommandList1 *iface, UINT metadata, const void *data, UINT size) { FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size); } -static void STDMETHODCALLTYPE d3d12_command_list_BeginEvent(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_BeginEvent(ID3D12GraphicsCommandList1 *iface, UINT metadata, const void *data, UINT size) { FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size); } -static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandList *iface) +static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandList1 *iface) { FIXME("iface %p stub!\n", iface); } @@ -4273,13 +4274,13 @@ STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMEN STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS)); STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS)); -static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList1 *iface, ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer, UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset) { struct d3d12_command_signature *sig_impl = unsafe_impl_from_ID3D12CommandSignature(command_signature); struct d3d12_resource *arg_impl = unsafe_impl_from_ID3D12Resource(arg_buffer); - struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); const D3D12_COMMAND_SIGNATURE_DESC *signature_desc; const struct vkd3d_vk_device_procs *vk_procs; unsigned int i; @@ -4354,7 +4355,58 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC } } -static const struct ID3D12GraphicsCommandListVtbl d3d12_command_list_vtbl = +static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT(ID3D12GraphicsCommandList1 *iface, + ID3D12Resource *dst_buffer, UINT64 dst_offset, + ID3D12Resource *src_buffer, UINT64 src_offset, + UINT dependent_resource_count, ID3D12Resource * const *dependent_resources, + const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges) +{ + FIXME("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, " + "src_offset %#"PRIx64", dependent_resource_count %u, " + "dependent_resources %p, dependent_sub_resource_ranges %p stub!\n", + iface, dst_buffer, dst_offset, src_buffer, src_offset, + dependent_resource_count, dependent_resources, dependent_sub_resource_ranges); +} + +static void STDMETHODCALLTYPE d3d12_command_list_AtomicCopyBufferUINT64(ID3D12GraphicsCommandList1 *iface, + ID3D12Resource *dst_buffer, UINT64 dst_offset, + ID3D12Resource *src_buffer, UINT64 src_offset, + UINT dependent_resource_count, ID3D12Resource * const *dependent_resources, + const D3D12_SUBRESOURCE_RANGE_UINT64 *dependent_sub_resource_ranges) +{ + FIXME("iface %p, dst_resource %p, dst_offset %#"PRIx64", src_resource %p, " + "src_offset %#"PRIx64", dependent_resource_count %u, " + "dependent_resources %p, dependent_sub_resource_ranges %p stub!\n", + iface, dst_buffer, dst_offset, src_buffer, src_offset, + dependent_resource_count, dependent_resources, dependent_sub_resource_ranges); +} + +static void STDMETHODCALLTYPE d3d12_command_list_OMSetDepthBounds(ID3D12GraphicsCommandList1 *iface, + FLOAT min, FLOAT max) +{ + FIXME("iface %p, min %.8e, max %.8e stub!\n", iface, min, max); +} + +static void STDMETHODCALLTYPE d3d12_command_list_SetSamplePositions(ID3D12GraphicsCommandList1 *iface, + UINT sample_count, UINT pixel_count, D3D12_SAMPLE_POSITION *sample_positions) +{ + FIXME("iface %p, sample_count %u, pixel_count %u, sample_positions %p stub!\n", + iface, sample_count, pixel_count, sample_positions); +} + +static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresourceRegion(ID3D12GraphicsCommandList1 *iface, + ID3D12Resource *dst_resource, UINT dst_sub_resource_idx, UINT dst_x, UINT dst_y, + ID3D12Resource *src_resource, UINT src_sub_resource_idx, + D3D12_RECT *src_rect, DXGI_FORMAT format, D3D12_RESOLVE_MODE mode) +{ + FIXME("iface %p, dst_resource %p, dst_sub_resource_idx %u, " + "dst_x %u, dst_y %u, src_resource %p, src_sub_resource_idx %u, " + "src_rect %p, format %#x, mode %#x stub!\n", + iface, dst_resource, dst_sub_resource_idx, dst_x, dst_y, + src_resource, src_sub_resource_idx, src_rect, format, mode); +} + +static const struct ID3D12GraphicsCommandList1Vtbl d3d12_command_list_vtbl = { /* IUnknown methods */ d3d12_command_list_QueryInterface, @@ -4421,6 +4473,12 @@ static const struct ID3D12GraphicsCommandListVtbl d3d12_command_list_vtbl = d3d12_command_list_BeginEvent, d3d12_command_list_EndEvent, d3d12_command_list_ExecuteIndirect, + /* ID3D12GraphicsCommandList1 methods */ + d3d12_command_list_AtomicCopyBufferUINT, + d3d12_command_list_AtomicCopyBufferUINT64, + d3d12_command_list_OMSetDepthBounds, + d3d12_command_list_SetSamplePositions, + d3d12_command_list_ResolveSubresourceRegion, }; static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12CommandList *iface) @@ -4428,7 +4486,7 @@ static struct d3d12_command_list *unsafe_impl_from_ID3D12CommandList(ID3D12Comma if (!iface) return NULL; assert(iface->lpVtbl == (struct ID3D12CommandListVtbl *)&d3d12_command_list_vtbl); - return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList_iface); + return CONTAINING_RECORD(iface, struct d3d12_command_list, ID3D12GraphicsCommandList1_iface); } static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d3d12_device *device, @@ -4437,7 +4495,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d { HRESULT hr; - list->ID3D12GraphicsCommandList_iface.lpVtbl = &d3d12_command_list_vtbl; + list->ID3D12GraphicsCommandList1_iface.lpVtbl = &d3d12_command_list_vtbl; list->refcount = 1; list->type = type; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fa59593bbdef..3d9d90cb6558 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1745,8 +1745,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if initial_pipeline_state, &object))) return hr; - return return_interface(&object->ID3D12GraphicsCommandList_iface, - &IID_ID3D12GraphicsCommandList, riid, command_list); + return return_interface(&object->ID3D12GraphicsCommandList1_iface, + &IID_ID3D12GraphicsCommandList1, riid, command_list); } /* Direct3D feature levels restrict which formats can be optionally supported. */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3292e31bae5a..b4727a20a4df 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -778,7 +778,7 @@ struct vkd3d_pipeline_bindings /* ID3D12CommandList */ struct d3d12_command_list { - ID3D12GraphicsCommandList ID3D12GraphicsCommandList_iface; + ID3D12GraphicsCommandList1 ID3D12GraphicsCommandList1_iface; LONG refcount; D3D12_COMMAND_LIST_TYPE type; -- 2.19.2

2 1

[PATCH vkd3d 3/5] vkd3d: Validate image views before creating framebuffers.
by Józef Kucia 07 Mar '19

07 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4999280a2afc..e535f2020012 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1858,6 +1858,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; size_t start_idx = 0; + unsigned int i; VkResult vr; if (list->current_framebuffer != VK_NULL_HANDLE) @@ -1866,6 +1867,15 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l if (!list->state->u.graphics.rt_idx) ++start_idx; + for (i = 0; i < list->state->u.graphics.attachment_count; ++i) + { + if (!list->views[start_idx + i]) + { + FIXME("Invalid attachment %u.\n", i); + return false; + } + } + fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d: Add more formats.
by Józef Kucia 07 Mar '19

07 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 ++++++++++++++++ libs/vkd3d/utils.c | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f197c93faaa3..c1a80c0360f8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1648,6 +1648,22 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, FIXME("Alpha swizzle is not supported.\n"); } } + + if (format->dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM + || format->dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM_SRGB) + { + if (allowed_swizzle) + { + components->r = VK_COMPONENT_SWIZZLE_R; + components->g = VK_COMPONENT_SWIZZLE_G; + components->b = VK_COMPONENT_SWIZZLE_B; + components->a = VK_COMPONENT_SWIZZLE_ONE; + } + else + { + FIXME("B8G8R8X8 swizzle is not supported.\n"); + } + } } struct vkd3d_texture_view_desc diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 1c10450d1ea9..e8ebd2cfead9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -43,7 +43,9 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32_UINT, VK_FORMAT_R32G32_UINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32_SINT, VK_FORMAT_R32G32_SINT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R10G10B10A2_UINT, VK_FORMAT_A2B10G10R10_UINT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, @@ -81,8 +83,11 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_BC1_TYPELESS, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, {DXGI_FORMAT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, {DXGI_FORMAT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, 1, 4, 4, 8, COLOR}, @@ -98,8 +103,10 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_BC5_TYPELESS, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, 1, 4, 4, 16, COLOR}, + {DXGI_FORMAT_BC6H_TYPELESS, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, + {DXGI_FORMAT_BC7_TYPELESS, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, 1, 4, 4, 16, COLOR}, }; -- 2.19.2

2 1

[PATCH] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs
by Vijay Kiran Kamuju 07 Mar '19

07 Mar '19

added additional checks From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41591 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/registry.c | 30 +++++++++++++++++++ .../api-ms-win-core-registry-l1-1-0.spec | 4 +-- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 +-- dlls/kernelbase/kernelbase.spec | 4 +-- include/winreg.h | 7 +++++ 6 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index eb1f5463357..4686825224c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -648,8 +648,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) @ stdcall RegGetValueA(long str str long ptr ptr ptr) @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) -# @ stub RegLoadAppKeyA -# @ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) +@ stdcall RegLoadAppKeyW(wstr ptr long long long) @ stdcall RegLoadKeyA(long str str) @ stdcall RegLoadKeyW(long wstr wstr) @ stdcall RegLoadMUIStringA(long str str long ptr long str) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 14604e010e3..9a4c961343b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3514,3 +3514,33 @@ LONG WINAPI RegDisableReflectionKey(HKEY base) FIXME("%p: stub\n", base); return ERROR_SUCCESS; } + +/****************************************************************************** + * RegLoadAppKeyA [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved) +{ + FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved); + + if (!file || reserved) + return ERROR_INVALID_PARAMETER; + + *result = (HKEY)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * RegLoadAppKeyW [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved) +{ + FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved); + + if (!file || reserved) + return ERROR_INVALID_PARAMETER; + + *result = (HKEY)0xdeadbeef; + return ERROR_SUCCESS; +} diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec index 7a48e3b9899..f81f027e88e 100644 --- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec +++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec @@ -17,8 +17,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW -@ stub RegLoadAppKeyA -@ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5bdad41d2c2..b2dcc17cb3c 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -102,8 +102,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW -@ stub RegLoadAppKeyA -@ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9a014b2d3dc..c43ccceedc7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1288,8 +1288,8 @@ # @ stub RegKrnResetAppKeyLoaded # @ stub RegKrnSetDllHasThreadStateGlobal # @ stub RegKrnSetTermsrvRegistryExtensionFlags -# @ stub RegLoadAppKeyA -# @ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA @ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW @ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA diff --git a/include/winreg.h b/include/winreg.h index 51e9f02c3a6..45057df7020 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -84,6 +84,10 @@ typedef LONG LSTATUS; #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29) +#define REG_PROCESS_APPKEY 0x00000001 + +#define REG_MUI_STRING_TRUNCATE 0x00000001 + WINADVAPI BOOL WINAPI AbortSystemShutdownA(LPSTR); WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) @@ -133,6 +137,9 @@ WINADVAPI LSTATUS WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY WINADVAPI LSTATUS WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); WINADVAPI LSTATUS WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); #define RegGetValue WINELIB_NAME_AW(RegGetValue) +WINADVAPI LSTATUS WINAPI RegLoadAppKeyA(const char*,HKEY*,REGSAM,DWORD,DWORD); +WINADVAPI LSTATUS WINAPI RegLoadAppKeyW(const WCHAR*,HKEY*,REGSAM,DWORD,DWORD); +#define RegLoadAppKey WINELIB_NAME_AW(RegLoadAppKey) WINADVAPI LSTATUS WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); WINADVAPI LSTATUS WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); #define RegLoadKey WINELIB_NAME_AW(RegLoadKey) -- 2.17.0

1 0

[PATCH 9/9] user32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-)

2 1

[PATCH 7/9] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 113 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 89 insertions(+), 24 deletions(-)

2 1

[PATCH 6/9] user32: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-)

2 1

[PATCH 5/9] user32/tests: Tests default margin size with various font face.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-)

2 1

[PATCH 4/9] user32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)

2 1

[PATCH 2/9] user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 1 - 2 files changed, 13 insertions(+), 35 deletions(-)

2 1

[PATCH 3/9] user32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 100 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 26 deletions(-)

1 0

[PATCH 1/9] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 07 Mar '19

07 Mar '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true in the CJK charset font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-)

1 0

Re: TestBot job 48888 results: [PATCH] kernel32: Remove some duplicate code.
by Ken Thomases 07 Mar '19

07 Mar '19

My change was trivial, only affects a code path dealing with Mach-O files, and could not have caused these failures. > On Mar 6, 2019, at 7:22 PM, Marvin <testbot(a)winehq.org> wrote: > > VM Status Failures Command > debian9 failed 2 > debian9 failed 2 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=48888 > > > === debian9 (32 bit report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7eb6885d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit Chinese:China report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7e9b385d). > > Report errors: > kernel32:virtual prints too much data (90431 bytes) > > === debian9 (32 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x7eb6885d). > > Report errors: > kernel32:virtual prints too much data (90502 bytes) > > === debian9 (64 bit WoW report) === > > kernel32: > Unhandled exception: page fault on write access to 0x00000000 in 64-bit code (0x00007f8786bbe8a1). > > Report errors: > kernel32:virtual prints too much data (87157 bytes) > <debian9_win32.report><debian9_win32_zh_CN.report><debian9_log.txt><debian9_wow32.report><debian9_wow64.report><debian9_log.txt>

1 0

[PATCH 2/2] amsi: Add stub implementations for a couple of functions.
by Hans Leidekker 07 Mar '19

07 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/amsi/Makefile.in | 3 ++ dlls/amsi/amsi.spec | 12 ++++---- dlls/amsi/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/amsi.idl | 36 ++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 dlls/amsi/main.c create mode 100644 include/amsi.idl diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index dfaec30d39..213d3e06ce 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1 +1,4 @@ MODULE = amsi.dll + +C_SRCS = \ + main.c diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec index 6c2b4ae60b..27e6b3dbda 100644 --- a/dlls/amsi/amsi.spec +++ b/dlls/amsi/amsi.spec @@ -1,12 +1,12 @@ -@ stub AmsiCloseSession -@ stub AmsiInitialize -@ stub AmsiOpenSession -@ stub AmsiScanBuffer -@ stub AmsiScanString +@ stdcall AmsiCloseSession(ptr ptr) +@ stdcall AmsiInitialize(wstr ptr) +@ stdcall AmsiOpenSession(ptr ptr) +@ stdcall AmsiScanBuffer(ptr ptr long wstr ptr ptr) +@ stdcall AmsiScanString(ptr wstr wstr ptr ptr) @ stub AmsiUacInitialize @ stub AmsiUacScan @ stub AmsiUacUninitialize -@ stub AmsiUninitialize +@ stdcall AmsiUninitialize(ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stub DllRegisterServer diff --git a/dlls/amsi/main.c b/dlls/amsi/main.c new file mode 100644 index 0000000000..f56e699c35 --- /dev/null +++ b/dlls/amsi/main.c @@ -0,0 +1,65 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "amsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(amsi); + +HRESULT WINAPI AmsiInitialize( const WCHAR *appname, HAMSICONTEXT *context ) +{ + FIXME( "%s, %p\n", debugstr_w(appname), context ); + *context = (HAMSICONTEXT)0xdeadbeef; + return S_OK; +} + +HRESULT WINAPI AmsiOpenSession( HAMSICONTEXT context, HAMSISESSION *session ) +{ + FIXME( "%p, %p\n", context, session ); + *session = (HAMSISESSION)0xdeadbeef; + return S_OK; +} + +void WINAPI AmsiCloseSession( HAMSICONTEXT context, HAMSISESSION session ) +{ + FIXME( "%p, %p\n", context, session ); +} + +HRESULT WINAPI AmsiScanBuffer( HAMSICONTEXT context, void *buffer, ULONG length, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %p, %u, %s, %p, %p\n", context, buffer, length, debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +HRESULT WINAPI AmsiScanString( HAMSICONTEXT context, const WCHAR *string, const WCHAR *name, + HAMSISESSION session, AMSI_RESULT *result ) +{ + FIXME( "%p, %s, %s, %p, %p\n", context, debugstr_w(string), debugstr_w(name), session, result ); + *result = AMSI_RESULT_NOT_DETECTED; + return S_OK; +} + +void WINAPI AmsiUninitialize( HAMSICONTEXT context ) +{ + FIXME( "%p\n", context ); +} diff --git a/include/Makefile.in b/include/Makefile.in index c9f5be9791..2817c10d17 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -11,6 +11,7 @@ SOURCES = \ advpub.h \ af_irda.h \ amaudio.h \ + amsi.idl \ amstream.idl \ amvideo.idl \ appcompatapi.h \ diff --git a/include/amsi.idl b/include/amsi.idl new file mode 100644 index 0000000000..31303a3629 --- /dev/null +++ b/include/amsi.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("DECLARE_HANDLE(HAMSICONTEXT);") +cpp_quote("DECLARE_HANDLE(HAMSISESSION);") + +typedef [v1_enum] enum AMSI_RESULT +{ + AMSI_RESULT_CLEAN = 0x00, + AMSI_RESULT_NOT_DETECTED = 0x01, + AMSI_RESULT_BLOCKED_BY_ADMIN_START = 0x4000, + AMSI_RESULT_BLOCKED_BY_ADMIN_END = 0x4fff, + AMSI_RESULT_DETECTED = 0x8000, +} AMSI_RESULT; + +cpp_quote("void WINAPI AmsiCloseSession(HAMSICONTEXT,HAMSISESSION);") +cpp_quote("HRESULT WINAPI AmsiInitialize(const WCHAR*,HAMSICONTEXT*);") +cpp_quote("HRESULT WINAPI AmsiOpenSession(HAMSICONTEXT,HAMSISESSION*);") +cpp_quote("HRESULT WINAPI AmsiScanBuffer(HAMSICONTEXT,void*,ULONG,const WCHAR*,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("HRESULT WINAPI AmsiScanString(HAMSICONTEXT,const WCHAR*,const WCHAR *,HAMSISESSION,AMSI_RESULT*);") +cpp_quote("void WINAPI AmsiUninitialize(HAMSICONTEXT);") -- 2.20.1

1 0

[PATCH 1/2] amsi: New dll.
by Hans Leidekker 07 Mar '19

07 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 1 + dlls/amsi/Makefile.in | 1 + dlls/amsi/amsi.spec | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 dlls/amsi/Makefile.in create mode 100644 dlls/amsi/amsi.spec diff --git a/configure.ac b/configure.ac index a55d2f825a..71e8606e7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2869,6 +2869,7 @@ WINE_CONFIG_MAKEFILE(dlls/advapi32) WINE_CONFIG_MAKEFILE(dlls/advapi32/tests) WINE_CONFIG_MAKEFILE(dlls/advpack) WINE_CONFIG_MAKEFILE(dlls/advpack/tests) +WINE_CONFIG_MAKEFILE(dlls/amsi) WINE_CONFIG_MAKEFILE(dlls/amstream) WINE_CONFIG_MAKEFILE(dlls/amstream/tests) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-appmodel-identity-l1-1-0) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in new file mode 100644 index 0000000000..dfaec30d39 --- /dev/null +++ b/dlls/amsi/Makefile.in @@ -0,0 +1 @@ +MODULE = amsi.dll diff --git a/dlls/amsi/amsi.spec b/dlls/amsi/amsi.spec new file mode 100644 index 0000000000..6c2b4ae60b --- /dev/null +++ b/dlls/amsi/amsi.spec @@ -0,0 +1,13 @@ +@ stub AmsiCloseSession +@ stub AmsiInitialize +@ stub AmsiOpenSession +@ stub AmsiScanBuffer +@ stub AmsiScanString +@ stub AmsiUacInitialize +@ stub AmsiUacScan +@ stub AmsiUacUninitialize +@ stub AmsiUninitialize +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer -- 2.20.1

1 0

[PATCH 1/2] ntdll/tests: Mark sync NtReadFile() result for async regular file as broken.
by Paul Gofman 07 Mar '19

07 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/file.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index a23c3edbb1..5058439953 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -635,9 +635,9 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); - ok( status == STATUS_SUCCESS || - status == STATUS_PENDING, /* vista */ - "wrong status %x\n", status ); + todo_wine ok(status == STATUS_PENDING + || broken(status == STATUS_SUCCESS) /* before Vista */, + "wrong status %x.\n", status); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); @@ -4450,9 +4450,8 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, 0, &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ - if (!ret) - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -4480,9 +4479,8 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ - if (!ret) - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -4526,6 +4524,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4535,7 +4535,6 @@ static void test_read_write(void) } else { - ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); } @@ -4551,13 +4550,12 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) - { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); - } - else ok(bytes == 14, "bytes %u\n", bytes); + else + ok(bytes == 14, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); @@ -4600,7 +4598,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4659,10 +4658,10 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); - /* ReadFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); -- 2.20.1

2 3

[PATCH] rpcrt4/tests: Avoid fnprintf redefinition.
by Jacek Caban 07 Mar '19

07 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46680 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 2

[PATCH v2] rpcrt4/tests: Avoid type redefinition.
by Jacek Caban 07 Mar '19

07 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46680 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 2 +- dlls/rpcrt4/tests/server.idl | 50 +++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 24 deletions(-)

1 0

[PATCH v2] riched20: Handle REO_IOB_SELECTION in IRichEditOle::GetObject().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 10 +++++++ dlls/riched20/tests/richole.c | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 447e7d4599..93003eb281 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1391,6 +1391,16 @@ IRichEditOle_fnGetObject(IRichEditOle *me, LONG iob, else reobj = cursor.pRun->member.run.reobj; } + else if (iob == REO_IOB_SELECTION) + { + ME_Cursor *from, *to; + + ME_GetSelection(This->editor, &from, &to); + if (!from->pRun->member.run.reobj) + return E_INVALIDARG; + else + reobj = from->pRun->member.run.reobj; + } else { if (iob > IRichEditOle_GetObjectCount(me)) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 52399047ad..d9c7fa1670 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3328,6 +3328,61 @@ static void test_InsertObject(void) /* received_reo4 didn't be zeroed in E_INVALIDARG case */ CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo2.polesite, 2); + SendMessageA(hwnd, EM_SETSEL, 0, 1); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 1; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo1.polesite, 1); + + SendMessageA(hwnd, EM_SETSEL, 1, 2); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo3.polesite, 3); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo2.polesite, 2); + + SendMessageA(hwnd, EM_SETSEL, 0, 2); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo1.polesite, 1); + + SendMessageA(hwnd, EM_SETSEL, 1, 3); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo3.polesite, 3); + + SendMessageA(hwnd, EM_SETSEL, 2, 0); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo1.polesite, 1); + + SendMessageA(hwnd, EM_SETSEL, 0, 6); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); + CHECK_REOBJECT_STRUCT(received_reo4, NULL, NULL, reo1.polesite, 1); + + SendMessageA(hwnd, EM_SETSEL, 4, 5); + received_reo4.cbStruct = sizeof(received_reo4); + received_reo4.cp = 0; + hr = IRichEditOle_GetObject(reole, REO_IOB_SELECTION, &received_reo4, REO_GETOBJ_ALL_INTERFACES); + ok(hr == E_INVALIDARG, "IRichEditOle_GetObject should fail: 0x%08x\n", hr); + release_interfaces(&hwnd, &reole, &doc, NULL); } -- 2.20.1

2 1

[PATCH v3 4/4] propsys: Partially implement PropVariantToBuffer().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 26 +++++++++ dlls/propsys/tests/propsys.c | 106 +++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index d9347e27ae..8416b6dc74 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -111,7 +111,7 @@ @ stub PropVariantToBooleanVector @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault -@ stub PropVariantToBuffer +@ stdcall PropVariantToBuffer(ptr ptr long) @ stdcall PropVariantToDouble(ptr ptr) @ stub PropVariantToDoubleVector @ stub PropVariantToDoubleVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 988cf81971..c56a737ede 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -306,6 +306,32 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb) +{ + HRESULT hr = S_OK; + + TRACE("(%p, %p, %d)\n", propvarIn, ret, cb); + + switch(propvarIn->vt) + { + case VT_VECTOR|VT_UI1: + if(cb > propvarIn->u.caub.cElems) + return E_FAIL; + memcpy(ret, propvarIn->u.caub.pElems, cb); + break; + case VT_ARRAY|VT_UI1: + FIXME("Unsupported type: VT_ARRAY|VT_UI1\n"); + hr = E_NOTIMPL; + break; + default: + WARN("Unexpected type: %x\n", propvarIn->vt); + hr = E_INVALIDARG; + } + + return hr; +} + + HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) { HRESULT hr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 059b622544..c47729ea97 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1407,6 +1407,111 @@ static void test_PropVariantToString(void) SysFreeString(propvar.u.bstrVal); } +static void test_PropVariantToBuffer(void) +{ + PROPVARIANT propvar; + HRESULT hr; + UINT8 data[] = {1,2,3,4,5,6,7,8,9,10}; + INT8 data_int8[] = {1,2,3,4,5,6,7,8,9,10}; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + void *pdata; + UINT8 buffer[256]; + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, NULL, 0); /* crash when cb isn't zero */ + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, buffer, 10); + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + buffer[0] = 99; + hr = PropVariantToBuffer(&propvar, buffer, 11); + ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); + ok(buffer[0] == 99, "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + hr = InitPropVariantFromBuffer(data, 10, &propvar); + ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + hr = PropVariantToBuffer(&propvar, buffer, 9); + ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + ok(!memcmp(buffer, data, 9) && !buffer[9], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_UI1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data); + sa = NULL; + sa = SafeArrayCreate(VT_UI1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data, sizeof(data)); + U(propvar).parray = sa; + buffer[0] = 99; + hr = PropVariantToBuffer(&propvar, buffer, 11); + todo_wine ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); + ok(buffer[0] == 99, "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_UI1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data); + sa = NULL; + sa = SafeArrayCreate(VT_UI1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data, sizeof(data)); + U(propvar).parray = sa; + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data)); + todo_wine ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); + todo_wine ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); + memset(buffer, 0, sizeof(buffer)); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_VECTOR|VT_I1; + U(propvar).caub.pElems = CoTaskMemAlloc(sizeof(data_int8)); + U(propvar).caub.cElems = sizeof(data_int8); + memcpy(U(propvar).caub.pElems, data_int8, sizeof(data_int8)); + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); + ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_ARRAY|VT_I1; + sabound.lLbound = 0; + sabound.cElements = sizeof(data_int8); + sa = NULL; + sa = SafeArrayCreate(VT_I1, 1, &sabound); + ok(sa != NULL, "SafeArrayCreate failed.\n"); + hr = SafeArrayAccessData(sa, &pdata); + ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); + memcpy(pdata, data_int8, sizeof(data_int8)); + U(propvar).parray = sa; + hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); + ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); + SafeArrayDestroy(sa); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1424,4 +1529,5 @@ START_TEST(propsys) test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); test_PropVariantToString(); + test_PropVariantToBuffer(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4fb12d87eb..a4eedefdb6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); -- 2.20.1

2 1

[PATCH v3 3/4] propsys: Add VT_CLSID support for PropVariantToGUID().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propvar.c | 3 +++ dlls/propsys/tests/propsys.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ef490be978..988cf81971 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -739,6 +739,9 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + case VT_CLSID: + memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); + return S_OK; default: FIXME("unsupported vt: %d\n", ppropvar->vt); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 299675db2e..059b622544 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -568,7 +568,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); @@ -576,7 +576,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); propvar.u.pwszVal[1] = 'd'; @@ -584,7 +584,7 @@ static void test_PropVariantToGUID(void) propvar.u.pwszVal[3] = 'a'; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); propvar.u.pwszVal[1] = 'z'; hres = PropVariantToGUID(&propvar, &guid); @@ -597,7 +597,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); VariantClear(&var); hres = InitVariantFromGUIDAsString(&dummy_guid, &var); @@ -605,7 +605,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); V_BSTR(&var)[1] = 'z'; @@ -618,7 +618,14 @@ static void test_PropVariantToGUID(void) V_VT(&var) = VT_EMPTY; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + PropVariantClear(&propvar); + + memset(&guid, 0, sizeof(guid)); + InitPropVariantFromCLSID(&dummy_guid, &propvar); + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); } -- 2.20.1

2 1

[PATCH v3 2/4] propsys: Implement PropVariantToString().
by Jactry Zeng 07 Mar '19

07 Mar '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 25 ++++++++++ dlls/propsys/tests/propsys.c | 91 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 118 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 9193f3664d..d9347e27ae 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -133,7 +133,7 @@ @ stub PropVariantToInt64VectorAlloc @ stub PropVariantToInt64WithDefault @ stub PropVariantToStrRet -@ stub PropVariantToString +@ stdcall PropVariantToString(ptr ptr long) @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 396afbf050..ef490be978 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -34,6 +34,7 @@ #include "winuser.h" #include "shlobj.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -305,6 +306,30 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) +{ + HRESULT hr; + WCHAR *stringW = NULL; + + TRACE("(%p, %p, %d)\n", propvarIn, ret, cch); + + ret[0] = '\0'; + + if(!cch) + return E_INVALIDARG; + + hr = PropVariantToStringAlloc(propvarIn, &stringW); + if(SUCCEEDED(hr)) + { + if(lstrlenW(stringW) >= cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + lstrcpynW(ret, stringW, cch); + CoTaskMemFree(stringW); + } + + return hr; +} + HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) { WCHAR *res = NULL; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 926dc3de71..299675db2e 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "propsys.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -1310,6 +1311,95 @@ static void test_PropVariantToDouble(void) ok(value == 8.0, "Unexpected value: %f.\n", value); } +static void test_PropVariantToString(void) +{ + PROPVARIANT propvar; + static CHAR string[] = "Wine"; + static WCHAR stringW[] = {'W','i','n','e',0}; + WCHAR bufferW[256] = {0}; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, 0); + ok(hr == E_INVALIDARG, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_NULL; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 22; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, 4); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString returned: 0x%08x.\n", hr); + ok(!memcmp(bufferW, stringW, 4), "got wrong string.\n"); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, 4); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString returned: 0x%08x.\n", hr); + ok(!memcmp(bufferW, stringW, 4), "got wrong string.\n"); + memset(bufferW, 0, sizeof(bufferW)); + + PropVariantInit(&propvar); + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(stringW); + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + SysFreeString(propvar.u.bstrVal); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1326,4 +1416,5 @@ START_TEST(propsys) test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); + test_PropVariantToString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 80f081cbc3..4fb12d87eb 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.20.1

2 1

[PATCH v3 1/4] propsys: Add VT_EMPTY support for PropVariantToStringAlloc().
by Jactry Zeng 07 Mar '19

07 Mar '19

Superseded patch 158584 to 158587. ChangeLog: v3: - Rewrite implementation of PropVariantToBuffer().(4/4) - Add more tests for PropVariantToBuffer().(4/4) v2: - Fix test failures on Windows 64 bit.(1/3) - Use PropVariantToStringAlloc() for implementing PropVariantToString().(1/3) - Use IsEqualGUID() for checking GUID instread of memcmp().(2/3) - Add more tests for PropVariantToBuffer().(3/3) Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propvar.c | 1 + dlls/propsys/tests/propsys.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0edf4621b3..396afbf050 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -314,6 +314,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) switch(propvarIn->vt) { + case VT_EMPTY: case VT_NULL: res = CoTaskMemAlloc(1*sizeof(WCHAR)); res[0] = '\0'; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a9c0a7730b..926dc3de71 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -641,6 +641,12 @@ static void test_PropVariantToStringAlloc(void) ok(!lstrcmpW(str, topicW), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); PropVariantClear(&prop); + + prop.vt = VT_EMPTY; + hres = PropVariantToStringAlloc(&prop, &str); + ok(hres == S_OK, "returned %x\n", hres); + ok(!lstrcmpW(str, emptyW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); } static void test_PropVariantCompare(void) -- 2.20.1

2 1

[PATCH v2 1/7] comctl32/button: Implement NM_CUSTOMDRAW for Push Buttons
by Gabriel Ivăncescu 07 Mar '19

07 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=10531 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/button.c | 103 ++++++++++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 56a4730..f9b4368 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -237,6 +237,28 @@ static inline WCHAR *get_button_text( const BUTTON_INFO *infoPtr ) return buffer; } +static void init_custom_draw(NMCUSTOMDRAW *nmcd, const BUTTON_INFO *infoPtr, HDC hdc, const RECT *rc) +{ + nmcd->hdr.hwndFrom = infoPtr->hwnd; + nmcd->hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + nmcd->hdr.code = NM_CUSTOMDRAW; + nmcd->hdc = hdc; + nmcd->rc = *rc; + nmcd->dwDrawStage = CDDS_PREERASE; + nmcd->dwItemSpec = 0; + nmcd->lItemlParam = 0; + nmcd->uItemState = IsWindowEnabled(infoPtr->hwnd) ? 0 : CDIS_DISABLED; + if (infoPtr->state & BST_PUSHED) nmcd->uItemState |= CDIS_SELECTED; + if (infoPtr->state & BST_FOCUS) nmcd->uItemState |= CDIS_FOCUS; + if (infoPtr->state & BST_HOT) nmcd->uItemState |= CDIS_HOT; + if (infoPtr->state & BST_INDETERMINATE) + nmcd->uItemState |= CDIS_INDETERMINATE; + + /* Windows doesn't seem to send CDIS_CHECKED (it fails the tests) */ + /* CDIS_SHOWKEYBOARDCUES is misleading, as the meaning is reversed */ + /* FIXME: Handle it properly when we support keyboard cues? */ +} + HRGN set_control_clipping( HDC hdc, const RECT *rect ) { RECT rc = *rect; @@ -1476,7 +1498,9 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) HBRUSH hOldBrush; INT oldBkMode; COLORREF oldTxtColor; + LRESULT cdrf; HFONT hFont; + NMCUSTOMDRAW nmcd; LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); BOOL pushedState = (state & BST_PUSHED); @@ -1498,6 +1522,12 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hOldBrush = SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); + init_custom_draw(&nmcd, infoPtr, hDC, &rc); + + /* Send erase notifications */ + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (get_button_type(style) == BS_DEFPUSHBUTTON) { if (action != ODA_FOCUS) @@ -1505,44 +1535,65 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) InflateRect( &rc, -1, -1 ); } - /* completely skip the drawing if only focus has changed */ - if (action == ODA_FOCUS) goto draw_focus; + /* Skip the frame drawing if only focus has changed */ + if (action != ODA_FOCUS) + { + uState = DFCS_BUTTONPUSH; - uState = DFCS_BUTTONPUSH; + if (style & BS_FLAT) + uState |= DFCS_MONO; + else if (pushedState) + { + if (get_button_type(style) == BS_DEFPUSHBUTTON ) + uState |= DFCS_FLAT; + else + uState |= DFCS_PUSHED; + } - if (style & BS_FLAT) - uState |= DFCS_MONO; - else if (pushedState) - { - if (get_button_type(style) == BS_DEFPUSHBUTTON ) - uState |= DFCS_FLAT; - else - uState |= DFCS_PUSHED; + if (state & (BST_CHECKED | BST_INDETERMINATE)) + uState |= DFCS_CHECKED; + + DrawFrameControl( hDC, &rc, DFC_BUTTON, uState ); } - if (state & (BST_CHECKED | BST_INDETERMINATE)) - uState |= DFCS_CHECKED; + if (cdrf & CDRF_NOTIFYPOSTERASE) + { + nmcd.dwDrawStage = CDDS_POSTERASE; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } - DrawFrameControl( hDC, &rc, DFC_BUTTON, uState ); + /* Send paint notifications */ + nmcd.dwDrawStage = CDDS_PREPAINT; + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - /* draw button label */ - labelRect = rc; - /* Shrink label rect at all sides by 2 so that the content won't touch the surrounding frame */ - InflateRect(&labelRect, -2, -2); - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + if (!(cdrf & CDRF_DOERASE) && action != ODA_FOCUS) + { + /* draw button label */ + labelRect = rc; + /* Shrink label rect at all sides by 2 so that the content won't touch the surrounding frame */ + InflateRect(&labelRect, -2, -2); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); - if (dtFlags == (UINT)-1L) - goto cleanup; + if (dtFlags != (UINT)-1L) + { + if (pushedState) OffsetRect(&labelRect, 1, 1); - if (pushedState) OffsetRect(&labelRect, 1, 1); + oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); - oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); + BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); + SetTextColor( hDC, oldTxtColor ); + } + } - SetTextColor( hDC, oldTxtColor ); + if (cdrf & CDRF_NOTIFYPOSTPAINT) + { + nmcd.dwDrawStage = CDDS_POSTPAINT; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + if ((cdrf & CDRF_SKIPPOSTPAINT) || dtFlags == (UINT)-1L) goto cleanup; -draw_focus: if (action == ODA_FOCUS || (state & BST_FOCUS)) { InflateRect( &rc, -2, -2 ); -- 2.20.1

2 13

[PATCH 1/3] imm32: Replace macros with helper functions.
by Nikolay Sivov 07 Mar '19

07 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/imm32/imm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f355..96a11abba5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -119,8 +119,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; -#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) -#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static inline BOOL is_himc_ime_unicode(const InputContextData *data) +{ + return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); +} + +static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl) +{ + return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); +} static BOOL IMM_DestroyContext(HIMC hIMC); static InputContextData* get_imc_data(HIMC hIMC); -- 2.20.1

1 2

[PATCH 1/3] mf: Control time source state from presentation clock.
by Nikolay Sivov 07 Mar '19

07 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 121 ++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 67 +++++++++++++++++++++++++ include/mferror.h | 3 +- 3 files changed, 182 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2961abe879..27b2c4cce6 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -47,6 +47,7 @@ struct presentation_clock IMFShutdown IMFShutdown_iface; LONG refcount; IMFPresentationTimeSource *time_source; + IMFClockStateSink *time_source_sink; MFCLOCK_STATE state; CRITICAL_SECTION cs; }; @@ -341,6 +342,8 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) { if (clock->time_source) IMFPresentationTimeSource_Release(clock->time_source); + if (clock->time_source_sink) + IMFClockStateSink_Release(clock->time_source_sink); DeleteCriticalSection(&clock->cs); heap_free(clock); } @@ -395,9 +398,29 @@ static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, M static HRESULT WINAPI present_clock_SetTimeSource(IMFPresentationClock *iface, IMFPresentationTimeSource *time_source) { - FIXME("%p, %p.\n", iface, time_source); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, time_source); + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + IMFPresentationTimeSource_Release(clock->time_source); + if (clock->time_source_sink) + IMFClockStateSink_Release(clock->time_source_sink); + clock->time_source = NULL; + clock->time_source_sink = NULL; + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&clock->time_source_sink); + if (SUCCEEDED(hr)) + { + clock->time_source = time_source; + IMFPresentationTimeSource_AddRef(clock->time_source); + } + + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, @@ -443,25 +466,107 @@ static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *i return E_NOTIMPL; } +enum clock_command +{ + CLOCK_CMD_START = 0, + CLOCK_CMD_STOP, + CLOCK_CMD_PAUSE, + CLOCK_CMD_MAX, +}; + +static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_command command) +{ + static const BYTE state_change_is_allowed[MFCLOCK_STATE_PAUSED+1][CLOCK_CMD_MAX] = + { /* S S* P */ + /* INVALID */ { 1, 1, 1 }, + /* RUNNING */ { 1, 1, 1 }, + /* STOPPED */ { 1, 1, 0 }, + /* PAUSED */ { 1, 1, 0 }, + }; + static const MFCLOCK_STATE states[CLOCK_CMD_MAX] = + { + /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, + /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, + /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + }; + HRESULT hr; + + /* FIXME: use correct timestamps. */ + + if (clock->state == states[command] && clock->state != MFCLOCK_STATE_RUNNING) + return MF_E_CLOCK_STATE_ALREADY_SET; + + if (!state_change_is_allowed[clock->state][command]) + return MF_E_INVALIDREQUEST; + + switch (command) + { + case CLOCK_CMD_START: + if (clock->state == MFCLOCK_STATE_PAUSED) + hr = IMFClockStateSink_OnClockRestart(clock->time_source_sink, 0); + else + hr = IMFClockStateSink_OnClockStart(clock->time_source_sink, 0, 0); + break; + case CLOCK_CMD_STOP: + hr = IMFClockStateSink_OnClockStop(clock->time_source_sink, 0); + break; + case CLOCK_CMD_PAUSE: + hr = IMFClockStateSink_OnClockPause(clock->time_source_sink, 0); + break; + default: + ; + } + + if (FAILED(hr)) + return hr; + + clock->state = states[command]; + + /* FIXME: notify registered sinks. */ + + return S_OK; +} + static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG start_offset) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_START); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_STOP); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_Pause(IMFPresentationClock *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_PAUSE); + LeaveCriticalSection(&clock->cs); + + return hr; } static const IMFPresentationClockVtbl presentationclockvtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9fa0bda839..bae674d7fa 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -735,8 +735,37 @@ static void test_MFShutdownObject(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +enum clock_action +{ + CLOCK_START, + CLOCK_STOP, + CLOCK_PAUSE, +}; + static void test_presentation_clock(void) { + static const struct clock_state_test + { + enum clock_action action; + MFCLOCK_STATE clock_state; + MFCLOCK_STATE source_state; + HRESULT hr; + } + clock_state_change[] = + { + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID, MF_E_INVALIDREQUEST }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, MFCLOCK_STATE_PAUSED }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, MFCLOCK_STATE_PAUSED, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED, MF_E_INVALIDREQUEST }, + }; IMFPresentationTimeSource *time_source; IMFRateControl *rate_control; IMFPresentationClock *clock; @@ -746,6 +775,7 @@ static void test_presentation_clock(void) MFCLOCK_STATE state; IMFTimer *timer; MFTIME systime; + unsigned int i; DWORD value; HRESULT hr; @@ -779,6 +809,43 @@ todo_wine todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + /* Set default time source. */ + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationClock_SetTimeSource(clock, time_source); + ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + + /* State changes. */ + for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) + { + switch (clock_state_change[i].action) + { + case CLOCK_STOP: + hr = IMFPresentationClock_Stop(clock); + break; + case CLOCK_PAUSE: + hr = IMFPresentationClock_Pause(clock); + break; + case CLOCK_START: + hr = IMFPresentationClock_Start(clock, 0); + break; + default: + ; + } + ok(hr == clock_state_change[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].source_state, "%u: unexpected state %d.\n", i, state); + + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].clock_state, "%u: unexpected state %d.\n", i, state); + } + + IMFPresentationTimeSource_Release(time_source); + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); IMFRateControl_Release(rate_control); diff --git a/include/mferror.h b/include/mferror.h index be35e6e20f..f7f0934d6c 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -82,6 +82,7 @@ #define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) #define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) -#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) +#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) +#define MF_E_CLOCK_STATE_ALREADY_SET _HRESULT_TYPEDEF_(0xc00d9c42) #endif /* __WINE_MFERROR_H */ -- 2.20.1

1 2

[PATCH v2 1/9] msvfw32: Use the global HeapAlloc() wrappers.
by Zebediah Figura 07 Mar '19

07 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 118 +++++++++++++++++------------------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4b09913667..da227402ce 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -40,6 +40,7 @@ #include "vfw.h" #include "msvideo_private.h" #include "wine/debug.h" +#include "wine/heap.h" /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" @@ -366,8 +367,8 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe if (driver) return FALSE; /* Register the driver */ - driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(reg_driver)); - if (!driver) goto oom; + if (!(driver = heap_alloc_zero(sizeof(*driver)))) + return FALSE; driver->fccType = fccType; driver->fccHandler = fccHandler; @@ -375,29 +376,27 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe { case ICINSTALL_FUNCTION: driver->proc = (DRIVERPROC)lParam; - driver->name = NULL; break; case ICINSTALL_DRIVER: - driver->proc = NULL; len = MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, NULL, 0); - driver->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!driver->name) goto oom; + if (!(driver->name = heap_alloc(len * sizeof(WCHAR)))) + { + heap_free(driver); + return FALSE; + } MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, driver->name, len); - break; + break; default: - ERR("Invalid flags!\n"); - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; - } + ERR("Invalid flags!\n"); + heap_free(driver); + return FALSE; + } /* Insert our driver in the list*/ driver->next = reg_driver_list; reg_driver_list = driver; - - return TRUE; -oom: - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; + + return TRUE; } /*********************************************************************** @@ -423,8 +422,8 @@ BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags) /* Remove the driver from the list */ drv = *pdriver; *pdriver = (*pdriver)->next; - HeapFree(GetProcessHeap(), 0, drv->name); - HeapFree(GetProcessHeap(), 0, drv); + heap_free(drv->name); + heap_free(drv); return TRUE; } @@ -517,8 +516,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) return 0; } - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) + if (!(whic = heap_alloc(sizeof(*whic)))) { CloseDriver(hdrv, 0, 0); return FALSE; @@ -557,8 +555,8 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO icopen.pV2Reserved = NULL; icopen.dnDevNode = 0; /* FIXME */ - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) return 0; + if (!(whic = heap_alloc(sizeof(*whic)))) + return NULL; whic->driverproc = lpfnHandler; while (MSVIDEO_GetHicPtr((HIC)(ULONG_PTR)IC_HandleRef) != NULL) IC_HandleRef++; @@ -573,7 +571,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_LOAD failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } /* return value is not checked */ @@ -587,7 +585,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_OPEN failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -925,7 +923,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); @@ -978,7 +976,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo.fccType = streamtypeVIDEO; ic->icinfo.fccHandler = comptypeDIB; ic->hic = 0; @@ -1099,7 +1097,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA if (!ic || (LONG_PTR)ic == CB_ERR) break; if (ic->hic) ICClose(ic->hic); - HeapFree(GetProcessHeap(), 0, ic); + heap_free(ic); } EndDialog(hdlg, LOWORD(wparam) == IDOK); @@ -1171,23 +1169,25 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn, */ void VFWAPI ICCompressorFree(PCOMPVARS pc) { - TRACE("(%p)\n",pc); + TRACE("(%p)\n", pc); - if (pc != NULL && pc->cbSize == sizeof(COMPVARS)) { - if (pc->hic != NULL) { - ICClose(pc->hic); - pc->hic = NULL; + if (pc && pc->cbSize == sizeof(COMPVARS)) + { + if (pc->hic) + { + ICClose(pc->hic); + pc->hic = NULL; + } + heap_free(pc->lpbiIn); + pc->lpbiIn = NULL; + heap_free(pc->lpBitsOut); + pc->lpBitsOut = NULL; + heap_free(pc->lpBitsPrev); + pc->lpBitsPrev = NULL; + heap_free(pc->lpState); + pc->lpState = NULL; + pc->dwFlags = 0; } - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - pc->lpbiIn = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - pc->lpBitsPrev = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpState); - pc->lpState = NULL; - pc->dwFlags = 0; - } } /*********************************************************************** @@ -1297,7 +1297,7 @@ LRESULT WINAPI ICClose(HIC hic) } } - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -1382,8 +1382,7 @@ HANDLE VFWAPI ICImageDecompress( cbHdr = ICDecompressGetFormatSize(hic,lpbiIn); if ( cbHdr < sizeof(BITMAPINFOHEADER) ) goto err; - pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); - if ( pHdr == NULL ) + if (!(pHdr = heap_alloc_zero(cbHdr + sizeof(RGBQUAD) * 256))) goto err; if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; @@ -1438,7 +1437,7 @@ err: ICDecompressEnd( hic ); if ( bReleaseIC ) ICClose(hic); - HeapFree(GetProcessHeap(),0,pHdr); + heap_free(pHdr); if ( pMem != NULL ) GlobalUnlock( hMem ); if ( !bSucceeded && hMem != NULL ) @@ -1509,14 +1508,14 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL static void clear_compvars(PCOMPVARS pc) { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - HeapFree(GetProcessHeap(), 0, pc->lpState); + heap_free(pc->lpbiIn); + heap_free(pc->lpBitsPrev); + heap_free(pc->lpBitsOut); + heap_free(pc->lpState); pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + heap_free(pc->lpbiOut); pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } @@ -1542,15 +1541,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) */ DWORD ret; ICCOMPRESS* icComp; - pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); - if (!pc->lpbiIn) + + if (!(pc->lpbiIn = heap_alloc(sizeof(BITMAPINFO)))) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS) - + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)); - if (!pc->lpState) + if (!(pc->lpState = heap_alloc(sizeof(ICCOMPRESS) + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)))) goto error; pc->cbState = sizeof(ICCOMPRESS); @@ -1563,8 +1560,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (size <= 0) goto error; - pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!pc->lpbiOut) + if (!(pc->lpbiOut = heap_alloc_zero(size))) goto error; /* Flag to show that we allocated lpbiOut for proper cleanup */ pc->dwFlags |= 0x80000000; @@ -1600,13 +1596,11 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut->bmiHeader.biSizeImage); /* Buffer for compressed frame data */ - pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsOut) + if (!(pc->lpBitsOut = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; /* Buffer for previous compressed frame data */ - pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsPrev) + if (!(pc->lpBitsPrev = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; TRACE("Compvars:\n" -- 2.20.1

1 8

[PATCH 1/8] msvfw32: Use the global HeapAlloc() wrappers.
by Zebediah Figura 07 Mar '19

07 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 118 +++++++++++++++++------------------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4b09913667..da227402ce 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -40,6 +40,7 @@ #include "vfw.h" #include "msvideo_private.h" #include "wine/debug.h" +#include "wine/heap.h" /* Drivers32 settings */ #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32" @@ -366,8 +367,8 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe if (driver) return FALSE; /* Register the driver */ - driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(reg_driver)); - if (!driver) goto oom; + if (!(driver = heap_alloc_zero(sizeof(*driver)))) + return FALSE; driver->fccType = fccType; driver->fccHandler = fccHandler; @@ -375,29 +376,27 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR szDe { case ICINSTALL_FUNCTION: driver->proc = (DRIVERPROC)lParam; - driver->name = NULL; break; case ICINSTALL_DRIVER: - driver->proc = NULL; len = MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, NULL, 0); - driver->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!driver->name) goto oom; + if (!(driver->name = heap_alloc(len * sizeof(WCHAR)))) + { + heap_free(driver); + return FALSE; + } MultiByteToWideChar(CP_ACP, 0, (char*)lParam, -1, driver->name, len); - break; + break; default: - ERR("Invalid flags!\n"); - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; - } + ERR("Invalid flags!\n"); + heap_free(driver); + return FALSE; + } /* Insert our driver in the list*/ driver->next = reg_driver_list; reg_driver_list = driver; - - return TRUE; -oom: - HeapFree(GetProcessHeap(), 0, driver); - return FALSE; + + return TRUE; } /*********************************************************************** @@ -423,8 +422,8 @@ BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags) /* Remove the driver from the list */ drv = *pdriver; *pdriver = (*pdriver)->next; - HeapFree(GetProcessHeap(), 0, drv->name); - HeapFree(GetProcessHeap(), 0, drv); + heap_free(drv->name); + heap_free(drv); return TRUE; } @@ -517,8 +516,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) return 0; } - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) + if (!(whic = heap_alloc(sizeof(*whic)))) { CloseDriver(hdrv, 0, 0); return FALSE; @@ -557,8 +555,8 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO icopen.pV2Reserved = NULL; icopen.dnDevNode = 0; /* FIXME */ - whic = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_HIC)); - if (!whic) return 0; + if (!(whic = heap_alloc(sizeof(*whic)))) + return NULL; whic->driverproc = lpfnHandler; while (MSVIDEO_GetHicPtr((HIC)(ULONG_PTR)IC_HandleRef) != NULL) IC_HandleRef++; @@ -573,7 +571,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_LOAD failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } /* return value is not checked */ @@ -587,7 +585,7 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPRO { WARN("DRV_OPEN failed for hic %p\n", whic->hic); MSVIDEO_FirstHic = whic->next; - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -925,7 +923,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); @@ -978,7 +976,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA LoadStringW(MSVFW32_hModule, IDS_FULLFRAMES, buf, 128); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_ADDSTRING, 0, (LPARAM)buf); - ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); + ic = heap_alloc(sizeof(*ic)); ic->icinfo.fccType = streamtypeVIDEO; ic->icinfo.fccHandler = comptypeDIB; ic->hic = 0; @@ -1099,7 +1097,7 @@ static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARA if (!ic || (LONG_PTR)ic == CB_ERR) break; if (ic->hic) ICClose(ic->hic); - HeapFree(GetProcessHeap(), 0, ic); + heap_free(ic); } EndDialog(hdlg, LOWORD(wparam) == IDOK); @@ -1171,23 +1169,25 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd, UINT uiFlags, LPVOID pvIn, */ void VFWAPI ICCompressorFree(PCOMPVARS pc) { - TRACE("(%p)\n",pc); + TRACE("(%p)\n", pc); - if (pc != NULL && pc->cbSize == sizeof(COMPVARS)) { - if (pc->hic != NULL) { - ICClose(pc->hic); - pc->hic = NULL; + if (pc && pc->cbSize == sizeof(COMPVARS)) + { + if (pc->hic) + { + ICClose(pc->hic); + pc->hic = NULL; + } + heap_free(pc->lpbiIn); + pc->lpbiIn = NULL; + heap_free(pc->lpBitsOut); + pc->lpBitsOut = NULL; + heap_free(pc->lpBitsPrev); + pc->lpBitsPrev = NULL; + heap_free(pc->lpState); + pc->lpState = NULL; + pc->dwFlags = 0; } - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - pc->lpbiIn = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - pc->lpBitsOut = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - pc->lpBitsPrev = NULL; - HeapFree(GetProcessHeap(), 0, pc->lpState); - pc->lpState = NULL; - pc->dwFlags = 0; - } } /*********************************************************************** @@ -1297,7 +1297,7 @@ LRESULT WINAPI ICClose(HIC hic) } } - HeapFree(GetProcessHeap(), 0, whic); + heap_free(whic); return 0; } @@ -1382,8 +1382,7 @@ HANDLE VFWAPI ICImageDecompress( cbHdr = ICDecompressGetFormatSize(hic,lpbiIn); if ( cbHdr < sizeof(BITMAPINFOHEADER) ) goto err; - pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); - if ( pHdr == NULL ) + if (!(pHdr = heap_alloc_zero(cbHdr + sizeof(RGBQUAD) * 256))) goto err; if ( ICDecompressGetFormat( hic, lpbiIn, pHdr ) != ICERR_OK ) goto err; @@ -1438,7 +1437,7 @@ err: ICDecompressEnd( hic ); if ( bReleaseIC ) ICClose(hic); - HeapFree(GetProcessHeap(),0,pHdr); + heap_free(pHdr); if ( pMem != NULL ) GlobalUnlock( hMem ); if ( !bSucceeded && hMem != NULL ) @@ -1509,14 +1508,14 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL static void clear_compvars(PCOMPVARS pc) { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpBitsOut); - HeapFree(GetProcessHeap(), 0, pc->lpState); + heap_free(pc->lpbiIn); + heap_free(pc->lpBitsPrev); + heap_free(pc->lpBitsOut); + heap_free(pc->lpState); pc->lpbiIn = pc->lpBitsPrev = pc->lpBitsOut = pc->lpState = NULL; if (pc->dwFlags & 0x80000000) { - HeapFree(GetProcessHeap(), 0, pc->lpbiOut); + heap_free(pc->lpbiOut); pc->lpbiOut = NULL; pc->dwFlags &= ~0x80000000; } @@ -1542,15 +1541,13 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) */ DWORD ret; ICCOMPRESS* icComp; - pc->lpbiIn = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFO)); - if (!pc->lpbiIn) + + if (!(pc->lpbiIn = heap_alloc(sizeof(BITMAPINFO)))) return FALSE; *pc->lpbiIn = *lpbiIn; - pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS) - + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)); - if (!pc->lpState) + if (!(pc->lpState = heap_alloc(sizeof(ICCOMPRESS) + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)))) goto error; pc->cbState = sizeof(ICCOMPRESS); @@ -1563,8 +1560,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (size <= 0) goto error; - pc->lpbiOut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!pc->lpbiOut) + if (!(pc->lpbiOut = heap_alloc_zero(size))) goto error; /* Flag to show that we allocated lpbiOut for proper cleanup */ pc->dwFlags |= 0x80000000; @@ -1600,13 +1596,11 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) pc->lpbiOut->bmiHeader.biSizeImage); /* Buffer for compressed frame data */ - pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsOut) + if (!(pc->lpBitsOut = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; /* Buffer for previous compressed frame data */ - pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); - if (!pc->lpBitsPrev) + if (!(pc->lpBitsPrev = heap_alloc(pc->lpbiOut->bmiHeader.biSizeImage))) goto error; TRACE("Compvars:\n" -- 2.20.1

2 11

[PATCH] msvcrt: Fix vtable alignment on macOS.
by Ken Thomases 07 Mar '19

07 Mar '19

On macOS, the .align <n> directive aligns to 2^n, not just n. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/msvcrt/cxx.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 027026e..7174f7e 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -42,9 +42,15 @@ #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 3" +#else +#define __ASM_VTABLE_ALIGN ".align 8" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 8\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ @@ -54,9 +60,15 @@ #define VTABLE_ADD_FUNC(name) "\t.long " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 2" +#else +#define __ASM_VTABLE_ALIGN ".align 4" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 4\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ -- 2.10.2

1 0

[PATCH 1/3] libwine: On Mac, use a more capable Mach function to map memory and avoid calling mmap() in some cases.
by Ken Thomases 07 Mar '19

07 Mar '19

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/mmap.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 458cc13..affdc0a 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -165,23 +165,29 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, #elif defined(__APPLE__) #include <mach/mach_init.h> -#include <mach/vm_map.h> +#include <mach/mach_vm.h> /* - * On Darwin, we can use the Mach call vm_allocate to allocate - * anonymous memory at the specified address, and then use mmap with - * MAP_FIXED to replace the mapping. + * On Darwin, we can use the Mach call mach_vm_map to allocate + * anonymous memory at the specified address and then, if necessary, use + * mmap with MAP_FIXED to replace the mapping. */ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, int fildes, off_t off) { - vm_address_t result = (vm_address_t)addr; + mach_vm_address_t result = (mach_vm_address_t)addr; + int vm_flags = VM_FLAGS_FIXED; - if (!vm_allocate(mach_task_self(),&result,len,0)) + if (flags & MAP_NOCACHE) + vm_flags |= VM_FLAGS_NO_CACHE; + if (!mach_vm_map( mach_task_self(), &result, len, 0, vm_flags, MEMORY_OBJECT_NULL, + 0, 0, prot, VM_PROT_ALL, VM_INHERIT_COPY )) { - if (mmap( (void *)result, len, prot, flags | MAP_FIXED, fildes, off ) != MAP_FAILED) + flags |= MAP_FIXED; + if (((flags & ~(MAP_NORESERVE | MAP_NOCACHE)) == (MAP_ANON | MAP_FIXED | MAP_PRIVATE)) || + mmap( (void *)result, len, prot, flags, fildes, off ) != MAP_FAILED) return 1; - vm_deallocate(mach_task_self(),result,len); + mach_vm_deallocate(mach_task_self(),result,len); } return 0; } -- 2.10.2

1 2

[PATCH] kernel32: Remove some duplicate code.
by Ken Thomases 07 Mar '19

07 Mar '19

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/kernel32/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 89b561e..09f0433 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -344,11 +344,6 @@ static enum binary_type get_binary_info( HANDLE hfile, pe_image_info_t *info ) case 2: return BINARY_UNIX_EXE; case 8: return BINARY_UNIX_LIB; } - switch(header.macho.filetype) - { - case 2: return BINARY_UNIX_EXE; - case 8: return BINARY_UNIX_LIB; - } } return BINARY_UNKNOWN; } -- 2.10.2

1 0

[PATCH 1/3] setupapi: Added CM_Request_Device_EjectA/W stub
by Vijay Kiran Kamuju 06 Mar '19

06 Mar '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45879 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ include/cfgmgr32.h | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cea6daca3f5..d633211db99 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -168,8 +168,8 @@ @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children @ stub CM_Remove_Unmarked_Children_Ex -@ stub CM_Request_Device_EjectA -@ stub CM_Request_Device_EjectW +@ stdcall CM_Request_Device_EjectA(ptr ptr ptr long long) +@ stdcall CM_Request_Device_EjectW(ptr ptr ptr long long) @ stub CM_Request_Eject_PC @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4994ca4854d..4db32dd51c7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -696,3 +696,21 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Devi SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * CM_Request_Device_EjectA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Request_Device_EjectW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index da091153e4d..15340a60c64 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -175,6 +175,23 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; +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_VETO_TYPE, *PPNP_VETO_TYPE; + DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -213,6 +230,9 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags); +#define CM_Request_Device_Eject WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) #ifdef __cplusplus } -- 2.17.0

1 3

[PATCH 1/2] ntdll/tests: Mark sync NtWriteFile() result for async regular file as broken.
by Paul Gofman 06 Mar '19

06 Mar '19

Vista+ always return async status. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3320ccecfa..75166feddb 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -619,7 +619,8 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - ok( status == STATUS_SUCCESS || status == STATUS_PENDING, "wrong status %x\n", status ); + todo_wine ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "wrong status %x.\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); @@ -725,7 +726,8 @@ static void read_file_test(void) ResetEvent(event); status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + todo_wine ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING + || broken(status == STATUS_SUCCESS) /* before Vista */, "Wrong status %x.\n", status); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); @@ -3472,6 +3474,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3490,8 +3494,6 @@ static void test_file_completion_information(void) ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key); ok(pov == &ov, "expected %p, got %p\n", &ov, pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3502,6 +3504,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3516,8 +3520,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = 0; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3528,6 +3530,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3544,8 +3548,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); CloseHandle(port); CloseHandle(h); @@ -4365,7 +4367,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4580,7 +4583,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4622,10 +4626,10 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); - /* WriteFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); -- 2.20.1

2 3

Re: RFC: reducing wasted disk space from addon files
by Olivier F. R. Dierick 06 Mar '19

06 Mar '19

I have more than one version of wine installed and more than one wineprefix. I added a configuration file in each wineprefix that remember the wine version used, and my scripts use that to launch the apps in the prefix with the proper wine version. Since the wine versions may depend on different wine-mono version, the sharing mechanism would have to allow parallel installation of multiple wine-mono versions, and wine would have to make the prefix link to the right wine-mono shared install. Updating the prefix with another wine version will have to update the wine-mono link to the right wine-mono shared install, when it differs. Whatever sharing mechanism that will end up in wine would have to handle that situation. Also, having to use another filesystem type/partition is not a solution. It must work on ANY filesystem used by the user. -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

1 0

[PATCH] user32: GetRawInputDeviceInfo uses characters for RIDI_DEVICENAME size
by Andrew Eikum 06 Mar '19

06 Mar '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/user32/rawinput.c | 41 ++++++++++++++++++++++-------- dlls/user32/tests/input.c | 53 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index b247c157dc..2085fd3f9f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -329,16 +329,37 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(RAWINPUT *data, UINT *data_size, */ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) { - UINT ret; - TRACE("device %p, command %#x, data %p, data_size %p.\n", device, command, data, data_size); - ret = GetRawInputDeviceInfoW(device, command, data, data_size); - if (command == RIDI_DEVICENAME && ret && ret != ~0U) - ret = WideCharToMultiByte(CP_ACP, 0, data, -1, data, *data_size, NULL, NULL); + /* RIDI_DEVICENAME data_size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, nameW_sz; - return ret; + if (!data_size) return ~0U; + + nameW_sz = *data_size; + + if (data && nameW_sz > 0) + nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); + else + nameW = NULL; + + ret = GetRawInputDeviceInfoW(device, command, nameW, &nameW_sz); + + if (ret && ret != ~0U) + WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); + + *data_size = nameW_sz; + + HeapFree(GetProcessHeap(), 0, nameW); + + return ret; + } + + return GetRawInputDeviceInfoW(device, command, data, data_size); } /*********************************************************************** @@ -366,18 +387,18 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: if (device == WINE_MOUSE_HANDLE) { - s = sizeof(mouse_name); + s = ARRAY_SIZE(mouse_name); name = mouse_name; } else if (device == WINE_KEYBOARD_HANDLE) { - s = sizeof(keyboard_name); + s = ARRAY_SIZE(keyboard_name); name = keyboard_name; } else { hid_device = device; - s = (strlenW(hid_device->path) + 1) * sizeof(WCHAR); + s = strlenW(hid_device->path) + 1; name = hid_device->path; } break; @@ -402,7 +423,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT if (command == RIDI_DEVICENAME) { - memcpy(data, name, s); + memcpy(data, name, s * sizeof(WCHAR)); return s; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 835dfb108d..625de3d768 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -80,6 +80,8 @@ static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); +static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); +static UINT (WINAPI *pGetRawInputDeviceInfoA) (HANDLE, UINT, void *, UINT *); #define MAXKEYEVENTS 12 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -164,6 +166,8 @@ static void init_function_pointers(void) GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetRawInputDeviceList); + GET_PROC(GetRawInputDeviceInfoW); + GET_PROC(GetRawInputDeviceInfoA); #undef GET_PROC } @@ -1555,7 +1559,7 @@ static void test_GetMouseMovePointsEx(void) static void test_GetRawInputDeviceList(void) { RAWINPUTDEVICELIST devices[32]; - UINT ret, oret, devcount, odevcount; + UINT ret, oret, devcount, odevcount, i; DWORD err; SetLastError(0xdeadbeef); @@ -1587,6 +1591,53 @@ static void test_GetRawInputDeviceList(void) ret = pGetRawInputDeviceList(devices, &devcount, sizeof(devices[0])); ok(ret > 0, "expected non-zero\n"); + for(i = 0; i < devcount; ++i) + { + WCHAR name[128]; + char nameA[128]; + UINT sz, len; + RID_DEVICE_INFO info; + + /* get required buffer size */ + name[0] = '\0'; + sz = 5; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz > 5 && sz < ARRAY_SIZE(name), "Size should have been set and not too large (got: %u)\n", sz); + + /* buffer size for RIDI_DEVICENAME is in CHARs, not BYTEs */ + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICENAME, name, &sz); + ok(ret == sz, "GetRawInputDeviceInfo gave wrong return: %d\n", err); + len = lstrlenW(name); + ok(len + 1 == ret, "GetRawInputDeviceInfo returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* test A variant with same size */ + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICENAME, nameA, &sz); + ok(ret == sz, "GetRawInputDeviceInfoA gave wrong return: %d\n", err); + len = strlen(nameA); + ok(len + 1 == ret, "GetRawInputDeviceInfoA returned wrong length (name: %u, ret: %u)\n", len + 1, ret); + + /* buffer size for RIDI_DEVICEINFO is in BYTEs */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + sz = sizeof(info) - 1; + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == -1, "GetRawInputDeviceInfo gave wrong failure: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + + ret = pGetRawInputDeviceInfoW(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + ret = pGetRawInputDeviceInfoA(devices[i].hDevice, RIDI_DEVICEINFO, &info, &sz); + ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); + ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); + ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + } + /* check if variable changes from larger to smaller value */ devcount = odevcount = ARRAY_SIZE(devices); oret = ret = pGetRawInputDeviceList(devices, &odevcount, sizeof(devices[0])); -- 2.21.0

2 1

[PATCH] wined3d: Implement eval_sample_index shader instruction.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Fixes text rendering in Metro Exodus. --- dlls/wined3d/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa6e302a4b9d..ebc015957784 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6175,6 +6175,22 @@ static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins shader_addline(buffer, ", 0, 0, 0)%s);\n", dst_swizzle); } +static void shader_glsl_interpolate(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_src_param *input = &ins->src[0]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param sample_param; + char dst_swizzle[6]; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_get_swizzle(input, FALSE, write_mask, dst_swizzle); + + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &sample_param); + shader_addline(buffer, "interpolateAtSample(shader_in.reg%u, %s)%s);\n", + input->reg.idx[0].offset, sample_param.param_str, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -11466,7 +11482,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_F16TOF32 */ shader_glsl_float16, -- 2.19.2

2 1

[PATCH 6/8] dxgi: Reject DXGI_FORMAT_UNKNOWN for swapchains.
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cf084f7183c2..07764826c01b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -85,7 +85,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; - if (!dxgi_validate_flip_swap_effect_format(desc->Format)) + if (desc->Format && !dxgi_validate_flip_swap_effect_format(desc->Format)) return FALSE; if (desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality) @@ -738,6 +738,9 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi */ if (!implicit) { + if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) + return E_INVALIDARG; + if (FAILED(hr = IWineDXGIAdapter_GetParent(device->adapter, &IID_IDXGIFactory, (void **)&swapchain->factory))) { @@ -2604,6 +2607,9 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu ID3D12Device *device; HRESULT hr; + if (swapchain_desc->Format == DXGI_FORMAT_UNKNOWN) + return DXGI_ERROR_INVALID_CALL; + if (!fullscreen_desc) { memset(&default_fullscreen_desc, 0, sizeof(default_fullscreen_desc)); -- 2.19.2

3 2

[PATCH 8/8] dxgi/tests: Add tests for creating swapchain with DXGI_FORMAT_UNKNOWN.
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 138 ++++++++++++++++++++++++----------------- 1 file changed, 81 insertions(+), 57 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index fcbaf791dc4e..23d6a29c8ed3 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -141,6 +141,12 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, return hr; } +static BOOL is_flip_model(DXGI_SWAP_EFFECT swap_effect) +{ + return swap_effect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL + || swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD; +} + static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, DXGI_FORMAT format, unsigned int sample_count) { @@ -1404,13 +1410,13 @@ static void test_create_swapchain(void) creation_desc.Flags = 0; hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); + ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); expected_refcount = get_refcount((IUnknown *)adapter); refcount = get_refcount((IUnknown *)factory); @@ -1433,7 +1439,7 @@ static void test_create_swapchain(void) hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)adapter); ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); @@ -1446,13 +1452,13 @@ static void test_create_swapchain(void) ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent); - ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent,%#x.\n", hr); ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent); - ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent,%#x.\n", hr); ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); @@ -1495,10 +1501,10 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "Test %u: CreateSwapChain failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to create swapchain, hr %#x.\n", i, hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "Test %u: GetDesc failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr); ok(result_desc.Windowed == creation_desc.Windowed, "Test %u: Got unexpected windowed %#x.\n", i, result_desc.Windowed); @@ -1514,7 +1520,7 @@ static void test_create_swapchain(void) fullscreen = 0xdeadbeef; target = (void *)0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: GetFullscreenState failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); ok(!target, "Test %u: Got unexpected target %p.\n", i, target); @@ -1540,10 +1546,10 @@ static void test_create_swapchain(void) ok(!!bgra_device, "Failed to create BGRA capable device.\n"); hr = IDXGIDevice_QueryInterface(bgra_device, &IID_IUnknown, (void **)&obj2); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); + ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); if (SUCCEEDED(hr)) @@ -1560,16 +1566,16 @@ static void test_create_swapchain(void) creation_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; creation_desc.Flags = 0; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); - ok(SUCCEEDED(hr), "Failed to get front buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get front buffer, hr %#x.\n", hr); hr = IDXGISurface1_GetDC(surface, FALSE, &hdc); - ok(SUCCEEDED(hr), "Expected GetDC() to succeed, %#x\n", hr); + ok(hr == S_OK, "Expected GetDC() to succeed, %#x\n", hr); IDXGISurface1_ReleaseDC(surface, NULL); IDXGISurface1_Release(surface); @@ -1591,10 +1597,10 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "Test %u: CreateSwapChain failed, hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Failed to create swapchain, hr %#x.\n", i, hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "Test %u: GetDesc failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr); /* When numerator is non-zero and denominator is zero, the windowed mode is used. * Additionally, some versions of WARP seem to always fail to change fullscreen state. */ @@ -1612,7 +1618,7 @@ static void test_create_swapchain(void) fullscreen = FALSE; target = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: GetFullscreenState failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); ok(fullscreen == !result_desc.Windowed, "Test %u: Got fullscreen %#x, expected %#x.\n", i, fullscreen, result_desc.Windowed); ok(result_desc.Windowed ? !target : !!target, "Test %u: Got unexpected target %p.\n", i, target); @@ -1620,7 +1626,7 @@ static void test_create_swapchain(void) { IDXGIOutput *containing_output; hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr), "Test %u: GetContainingOutput failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get containing output, hr %#x.\n", i, hr); ok(containing_output == target, "Test %u: Got unexpected containing output pointer %p.\n", i, containing_output); IDXGIOutput_Release(containing_output); @@ -1644,12 +1650,12 @@ static void test_create_swapchain(void) } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "Test %u: SetFullscreenState failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to set fullscreen state, hr %#x.\n", i, hr); fullscreen = 0xdeadbeef; target = (void *)0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: GetFullscreenState failed, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); ok(!target, "Test %u: Got unexpected target %p.\n", i, target); @@ -1659,6 +1665,26 @@ static void test_create_swapchain(void) check_window_fullscreen_state(creation_desc.OutputWindow, &initial_state.fullscreen_state); + /* Test swapchain creation with DXGI_FORMAT_UNKNOWN. */ + creation_desc.BufferDesc.Format = DXGI_FORMAT_UNKNOWN; + creation_desc.Windowed = TRUE; + creation_desc.Flags = 0; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + creation_desc.Windowed = FALSE; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + creation_desc.BufferCount = 2; + creation_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(hr == E_INVALIDARG || hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + creation_desc.BufferCount = 1; + creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + + check_window_fullscreen_state(creation_desc.OutputWindow, &initial_state.fullscreen_state); + /* Test swapchain creation with backbuffer width and height equal to 0. */ expected_state = initial_state; expected_client_rect = &expected_state.fullscreen_state.client_rect; @@ -1669,12 +1695,13 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.Width = 0; creation_desc.BufferDesc.Height = 0; + creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; creation_desc.Windowed = TRUE; creation_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -1694,9 +1721,9 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.Width = 0; creation_desc.BufferDesc.Height = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -1715,9 +1742,9 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.Width = 0; creation_desc.BufferDesc.Height = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -1732,14 +1759,14 @@ static void test_create_swapchain(void) /* Fullscreen */ creation_desc.Windowed = FALSE; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); - ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "Failed to get containing output, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); if (hr == DXGI_ERROR_UNSUPPORTED) @@ -1764,16 +1791,16 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, expected_height); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); @@ -1788,16 +1815,16 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, expected_height); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); @@ -3993,17 +4020,12 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) RECT rect; BOOL ret; - static const struct + static const DXGI_SWAP_EFFECT swap_effects[] = { - DXGI_SWAP_EFFECT swap_effect; - BOOL supported_in_d3d12; - } - tests[] = - { - {DXGI_SWAP_EFFECT_DISCARD, FALSE}, - {DXGI_SWAP_EFFECT_SEQUENTIAL, FALSE}, - {DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, - {DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + DXGI_SWAP_EFFECT_DISCARD, + DXGI_SWAP_EFFECT_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_DISCARD, }; get_factory(device, is_d3d12, &factory); @@ -4027,10 +4049,10 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) swapchain_desc.BufferDesc.Width = rect.right; swapchain_desc.BufferDesc.Height = rect.bottom; - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (i = 0; i < ARRAY_SIZE(swap_effects); ++i) { - swapchain_desc.SwapEffect = tests[i].swap_effect; - expected_hr = is_d3d12 && !tests[i].supported_in_d3d12 ? DXGI_ERROR_INVALID_CALL : S_OK; + swapchain_desc.SwapEffect = swap_effects[i]; + expected_hr = is_d3d12 && !is_flip_model(swap_effects[i]) ? DXGI_ERROR_INVALID_CALL : S_OK; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (FAILED(hr)) @@ -4074,7 +4096,6 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) IDXGIFactory *factory; unsigned int i; ULONG refcount; - BOOL is_flip; RECT rect; BOOL ret; @@ -4086,6 +4107,10 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) } tests[] = { + {DXGI_FORMAT_UNKNOWN, DXGI_SWAP_EFFECT_DISCARD, FALSE}, + {DXGI_FORMAT_UNKNOWN, DXGI_SWAP_EFFECT_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_UNKNOWN, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, FALSE}, + {DXGI_FORMAT_UNKNOWN, DXGI_SWAP_EFFECT_FLIP_DISCARD, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_DISCARD, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_SEQUENTIAL, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, @@ -4135,20 +4160,19 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - is_flip = tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL - || tests[i].swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD; - - if (is_d3d12 && !is_flip) + if (is_d3d12 && !is_flip_model(tests[i].swap_effect)) continue; swapchain_desc.BufferDesc.Format = tests[i].format; swapchain_desc.SwapEffect = tests[i].swap_effect; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); expected_hr = tests[i].supported ? S_OK : DXGI_ERROR_INVALID_CALL; + if (tests[i].format == DXGI_FORMAT_UNKNOWN && !is_d3d12) + expected_hr = E_INVALIDARG; ok(hr == expected_hr /* Flip presentation model not supported. */ - || broken(is_flip && hr == DXGI_ERROR_INVALID_CALL), - "Test %u: Got hr %#x, expected %#x.\n", i, hr, expected_hr); + || broken(hr == DXGI_ERROR_INVALID_CALL && is_flip_model(tests[i].swap_effect) && !is_d3d12), + "Test %u, d3d12 %#x: Got hr %#x, expected %#x.\n", i, is_d3d12, hr, expected_hr); if (SUCCEEDED(hr)) { -- 2.19.2

3 2

[PATCH 7/8] dxgi: Rename d3d12_swapchain_have_user_images() to d3d12_swapchain_has_user_images().
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07764826c01b..849b94ae9e09 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1070,7 +1070,7 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } -static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +static BOOL d3d12_swapchain_has_user_images(struct d3d12_swapchain *swapchain) { return !!swapchain->vk_images[0]; } @@ -1089,7 +1089,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (d3d12_swapchain_have_user_images(swapchain)) + if (d3d12_swapchain_has_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1461,7 +1461,7 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_has_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -2007,7 +2007,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2040,7 +2040,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (d3d12_swapchain_have_user_images(swapchain)) + if (d3d12_swapchain_has_user_images(swapchain)) { /* blit */ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -2108,7 +2108,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED; @@ -2141,7 +2141,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface vr = d3d12_swapchain_acquire_next_image(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - if (!d3d12_swapchain_have_user_images(swapchain)) + if (!d3d12_swapchain_has_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED; -- 2.19.2

3 2

[PATCH 5/8] dxgi: Implement dxgi_output_FindClosestMatchingMode1().
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 3 ++ dlls/dxgi/output.c | 85 ++++++++++++++++++++++++++++------------ dlls/dxgi/utils.c | 25 ++++++++++++ 3 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 320a347dde5e..1461e3c3af74 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -80,6 +80,7 @@ struct dxgi_device_layer /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) DECLSPEC_HIDDEN; +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) DECLSPEC_HIDDEN; void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; @@ -91,6 +92,8 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC1 *mode) DECLSPEC_HIDDEN; DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index bf0a4159376a..b1f20b92ebf5 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -34,6 +34,47 @@ static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_di mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ } +static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_display_mode *wined3d_mode) +{ + mode->Width = wined3d_mode->width; + mode->Height = wined3d_mode->height; + mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; + mode->RefreshRate.Denominator = 1; + mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); + mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ + mode->Stereo = FALSE; /* FIXME */ +} + +static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output, + struct wined3d_display_mode *mode, IUnknown *device) +{ + struct dxgi_adapter *adapter; + struct wined3d *wined3d; + HRESULT hr; + + if (!mode->width != !mode->height) + return DXGI_ERROR_INVALID_CALL; + + if (mode->format_id == WINED3DFMT_UNKNOWN && !device) + return DXGI_ERROR_INVALID_CALL; + + if (mode->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Matching formats to device not implemented.\n"); + return E_NOTIMPL; + } + + wined3d_mutex_lock(); + adapter = output->adapter; + wined3d = adapter->factory->wined3d; + + hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, mode); + wined3d_mutex_unlock(); + + return hr; +} + static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); @@ -234,33 +275,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); struct wined3d_display_mode wined3d_mode; - struct dxgi_adapter *adapter; - struct wined3d *wined3d; HRESULT hr; - TRACE("iface %p, mode %p, closest_match %p, device %p.\n", iface, mode, closest_match, device); - - if ((!mode->Width && mode->Height) || (mode->Width && !mode->Height)) - return DXGI_ERROR_INVALID_CALL; - - if (mode->Format == DXGI_FORMAT_UNKNOWN && !device) - return DXGI_ERROR_INVALID_CALL; - - TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); - if (mode->Format == DXGI_FORMAT_UNKNOWN) - { - FIXME("Matching formats to device not implemented.\n"); - return E_NOTIMPL; - } - - adapter = output->adapter; - wined3d = adapter->factory->wined3d; + TRACE("iface %p, mode %s, closest_match %p, device %p.\n", + iface, debug_dxgi_mode(mode), closest_match, device); - wined3d_mutex_lock(); wined3d_display_mode_from_dxgi(&wined3d_mode, mode); - hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter->ordinal, &wined3d_mode); - wined3d_mutex_unlock(); - + hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); if (SUCCEEDED(hr)) { dxgi_mode_from_wined3d(closest_match, &wined3d_mode); @@ -366,10 +387,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *i static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface, const DXGI_MODE_DESC1 *mode, DXGI_MODE_DESC1 *closest_match, IUnknown *device) { - FIXME("iface %p, mode %p, closest_match %p, device %p stub!\n", - iface, mode, closest_match, device); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, mode %s, closest_match %p, device %p.\n", + iface, debug_dxgi_mode1(mode), closest_match, device); + + wined3d_display_mode_from_dxgi1(&wined3d_mode, mode); + hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); + if (SUCCEEDED(hr)) + { + dxgi_mode1_from_wined3d(closest_match, &wined3d_mode); + TRACE("Returning %s.\n", debug_dxgi_mode1(closest_match)); + } + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplaySurfaceData1(IDXGIOutput4 *iface, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 3a67cfededff..23f5188b0111 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -380,12 +380,26 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) { + if (!desc) + return "(null)"; + return wine_dbg_sprintf("resolution %ux%u, refresh rate %u / %u, " "format %s, scanline ordering %#x, scaling %#x", desc->Width, desc->Height, desc->RefreshRate.Numerator, desc->RefreshRate.Denominator, debug_dxgi_format(desc->Format), desc->ScanlineOrdering, desc->Scaling); } +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) +{ + if (!desc) + return "(null)"; + + return wine_dbg_sprintf("resolution %ux%u, refresh rate %u / %u, " + "format %s, scanline ordering %#x, scaling %#x, stereo %#x", + desc->Width, desc->Height, desc->RefreshRate.Numerator, desc->RefreshRate.Denominator, + debug_dxgi_format(desc->Format), desc->ScanlineOrdering, desc->Scaling, desc->Stereo); +} + void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) { unsigned int i; @@ -455,6 +469,17 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } +void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, + const DXGI_MODE_DESC1 *mode) +{ + wined3d_mode->width = mode->Width; + wined3d_mode->height = mode->Height; + wined3d_mode->refresh_rate = dxgi_rational_to_uint(&mode->RefreshRate); + wined3d_mode->format_id = wined3dformat_from_dxgi_format(mode->Format); + wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); + FIXME("Ignoring stereo %#x.\n", mode->Stereo); +} + DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) { DXGI_USAGE dxgi_usage = 0; -- 2.19.2

3 2

[PATCH 4/8] dxgi/tests: Make sure that device is idle before destroying swapchains.
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7e60c69573e..fcbaf791dc4e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -608,6 +608,26 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } +#define wait_device_idle(a) wait_device_idle_(__LINE__, a) +static void wait_device_idle_(unsigned int line, IUnknown *device) +{ + ID3D12Device *d3d12_device; + ID3D12CommandQueue *queue; + HRESULT hr; + + hr = IUnknown_QueryInterface(device, &IID_ID3D12CommandQueue, (void **)&queue); + if (hr != S_OK) + return; + + hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&d3d12_device); + ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#x.\n", hr); + + wait_queue_idle_(line, d3d12_device, queue); + + ID3D12CommandQueue_Release(queue); + ID3D12Device_Release(d3d12_device); +} + #define get_factory(a, b, c) get_factory_(__LINE__, a, b, c) static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDXGIFactory **factory) { @@ -3952,6 +3972,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_device_idle(device); + IDXGISwapChain_Release(swapchain); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); @@ -4031,6 +4053,8 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + wait_device_idle(device); + IDXGISwapChain3_Release(swapchain3); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); -- 2.19.2

3 2

[PATCH 3/8] dxgi/tests: Fix potential crashes in test_get_containing_output().
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e630a4977288..a7e60c69573e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1963,20 +1963,23 @@ static void test_get_containing_output(void) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); + ok(ret, "Faled to set window position.\n"); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); - ok(!!monitor, "MonitorFromWindow failed.\n"); + ok(!!monitor, "Failed to get monitor from window.\n"); monitor_info.cbSize = sizeof(monitor_info); ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); ok(ret, "Failed to get monitor info.\n"); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), + "Failed to get containing output, hr %#x.\n", hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + continue; ok(!!output, "Got unexpected containing output %p.\n", output); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output desc, hr %#x.\n", hr); refcount = IDXGIOutput_Release(output); ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); -- 2.19.2

3 2

[PATCH 2/8] d3d12/tests: Add test for swapchain refcounts.
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 77 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 16e5c4ba5374..205f13fd10c7 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -149,6 +149,13 @@ static void print_adapter_info(void) adapter_desc.VendorId, adapter_desc.DeviceId); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -896,7 +903,6 @@ static void test_swapchain_draw(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - set_viewport(&context.viewport, 0.0f, 0.0f, rect.right, rect.bottom, 0.0f, 1.0f); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -951,6 +957,74 @@ static void test_swapchain_draw(void) destroy_test_context(&context); } +static void test_swapchain_refcount(void) +{ + const unsigned int buffer_count = 4; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain3 *swapchain; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < buffer_count; ++i) + { + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + ID3D12Resource_Release(context.render_target[i]); + context.render_target[i] = NULL; + } + refcount = get_refcount(swapchain); + ok(refcount == 1, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_AddRef(swapchain); + ok(refcount == 2, "Got refcount %u.\n", refcount); + hr = IDXGISwapChain3_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&context.render_target[0]); + ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + refcount = ID3D12Resource_AddRef(context.render_target[0]); + ok(refcount == 2, "Got refcount %u.\n", refcount); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + hr = IDXGISwapChain3_GetBuffer(swapchain, 1, &IID_ID3D12Resource, (void **)&context.render_target[1]); + ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + ID3D12Resource_Release(context.render_target[0]); + ID3D12Resource_Release(context.render_target[0]); + context.render_target[0] = NULL; + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_Release(swapchain); + todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + ID3D12Resource_Release(context.render_target[1]); + context.render_target[1] = NULL; + refcount = get_refcount(swapchain); + ok(refcount == 1, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; @@ -1192,6 +1266,7 @@ START_TEST(d3d12) test_interfaces(); test_draw(); test_swapchain_draw(); + test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); } -- 2.19.2

3 2

[PATCH 1/8] dxgi: Avoid recreating swapchain when we don't have user images.
by Józef Kucia 06 Mar '19

06 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 991a505ef6fa..cf084f7183c2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2138,7 +2138,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface vr = d3d12_swapchain_acquire_next_image(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) { + if (!d3d12_swapchain_have_user_images(swapchain)) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + TRACE("Recreating Vulkan swapchain.\n"); + d3d12_swapchain_destroy_buffers(swapchain, FALSE); return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } -- 2.19.2

3 2

[PATCH v2] d3d9/tests: Clarify that D3DFMT_A8R8G8B8 isn't a supported adapter format.
by Matteo Bruni 06 Mar '19

06 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix testbot failure. In case this patch fails to apply on the testbot, see https://testbot.winehq.org/JobDetails.pl?Key=48777 for a manual run. Supersedes https://source.winehq.org/patches/data/159984. dlls/d3d9/tests/device.c | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b7e34b07df6..76d19b91a23 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11671,11 +11671,6 @@ static void test_swapchain_parameters(void) static void test_check_device_format(void) { - static const D3DFORMAT adapter_formats[] = - { - D3DFMT_A8R8G8B8, - D3DFMT_X8R8G8B8, - }; static const D3DFORMAT mipmap_autogen_formats[] = { D3DFMT_R8G8B8, @@ -11689,11 +11684,11 @@ static void test_check_device_format(void) D3DFMT_A4R4G4B4, }; - D3DFORMAT adapter_format, format; BOOL render_target_supported; D3DDEVTYPE device_type; - unsigned int i, j; + D3DFORMAT format; IDirect3D9 *d3d; + unsigned int i; HRESULT hr; d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -11750,29 +11745,32 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(adapter_formats); ++i) - { - adapter_format = adapter_formats[i]; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3D_OK || broken(hr == D3DERR_NOTAVAILABLE) /* Testbot Windows <= 7 */, + "Got unexpected hr %#x.\n", hr); - for (j = 0; j < ARRAY_SIZE(mipmap_autogen_formats); ++j) - { - format = mipmap_autogen_formats[j]; + for (i = 0; i < ARRAY_SIZE(mipmap_autogen_formats); ++i) + { + format = mipmap_autogen_formats[i]; - hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, - D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); - render_target_supported = hr == D3D_OK; + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, format); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + render_target_supported = hr == D3D_OK; - hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, adapter_format, - D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); - if (render_target_supported) - { - ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); - } - else - { - ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); - } + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, format); + if (render_target_supported) + { + ok(hr == D3D_OK || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x.\n", hr); + } + else + { + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); } } -- 2.19.2

3 2

[PATCH v4 1/5] d3d9: Don't upload unused system memory vertex buffers.
by Matteo Bruni 06 Mar '19

06 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add a couple of small comments. v3: Split the test out to a separate patch, remove comment again since it doesn't apply anymore. v4: Compute stream map at declaration creation time. dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 8 +++++++- dlls/d3d9/vertexdeclaration.c | 8 ++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 3fe0376e5c1..b07d72a0662 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -251,6 +251,7 @@ struct d3d9_vertex_declaration LONG refcount; D3DVERTEXELEMENT9 *elements; UINT element_count; + DWORD stream_map; struct wined3d_vertex_declaration *wined3d_declaration; DWORD fvf; IDirect3DDevice9Ex *parent_device; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6cc3f180b09..5d59fd570ce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2730,9 +2730,11 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { + struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d9_vertexbuffer *d3d9_buffer; struct wined3d_resource *dst_resource; + struct d3d9_vertex_declaration *decl; unsigned int i, offset, stride, map; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; @@ -2740,13 +2742,17 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, if (!device->sysmem_vb) return; + wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); + if (!wined3d_decl) + return; if (base_vertex >= 0 || start_vertex >= -base_vertex) start_vertex += base_vertex; else FIXME("System memory vertex data offset is negative.\n"); - map = device->sysmem_vb; + decl = wined3d_vertex_declaration_get_parent(wined3d_decl); + map = decl->stream_map & device->sysmem_vb; while (map) { i = wined3d_bit_scan(&map); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index b6445255238..130383e5d1e 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -321,7 +321,7 @@ static const struct wined3d_parent_ops d3d9_vertexdeclaration_wined3d_parent_ops }; static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, - struct wined3d_vertex_element **wined3d_elements, UINT *element_count) + struct wined3d_vertex_element **wined3d_elements, UINT *element_count, DWORD *stream_map) { const D3DVERTEXELEMENT9* element; UINT count = 1; @@ -329,6 +329,8 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem TRACE("d3d9_elements %p, wined3d_elements %p, element_count %p\n", d3d9_elements, wined3d_elements, element_count); + *stream_map = 0; + element = d3d9_elements; while (element++->Stream != 0xff && count++ < 128); @@ -360,6 +362,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem (*wined3d_elements)[i].method = d3d9_elements[i].Method; (*wined3d_elements)[i].usage = d3d9_elements[i].Usage; (*wined3d_elements)[i].usage_idx = d3d9_elements[i].UsageIndex; + *stream_map |= 1u << d3d9_elements[i].Stream; } *element_count = count; @@ -375,7 +378,8 @@ static HRESULT vertexdeclaration_init(struct d3d9_vertex_declaration *declaratio UINT element_count; HRESULT hr; - hr = convert_to_wined3d_declaration(elements, &wined3d_elements, &wined3d_element_count); + hr = convert_to_wined3d_declaration(elements, &wined3d_elements, &wined3d_element_count, + &declaration->stream_map); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); -- 2.19.2

3 13

[PATCH] d2d1/tests: Add some missing EndDraw() checks (Coverity).
by Nikolay Sivov 06 Mar '19

06 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 617977f400..2214be6915 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4884,7 +4884,7 @@ static void test_draw_text_layout(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); todo_wine - ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr); + ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); @@ -4903,7 +4903,7 @@ todo_wine ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); - ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i) { @@ -6576,12 +6576,14 @@ todo_wine ok(SUCCEEDED(hr), "GetDC() was expected to succeed, hr %#x.\n", hr); ok(dc != NULL, "Expected NULL dc, got %p.\n", dc); ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); ID2D1RenderTarget_Clear(rt, &color); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); match = compare_wic_bitmap(wic_bitmap, "54034063dbc1c1bb61cb60ec57e4498678dc2b13"); ok(match, "Bitmap does not match.\n"); @@ -6596,7 +6598,8 @@ todo_wine FillRect(dc, &rect, GetStockObject(BLACK_BRUSH)); ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); match = compare_wic_bitmap(wic_bitmap, "60cacbf3d72e1e7834203da608037b1bf83b40e8"); ok(match, "Bitmap does not match.\n"); -- 2.20.1

2 1

[PATCH resend 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 06 Mar '19

06 Mar '19

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. Some casts have been removed by making variables signed (with an unsigned tmp since SystemParametersInfoW expects UINT), as suggested. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway and didn't help with overflow either, as initially assumed. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied as an *integer* back by WHEEL_DELTA, so if the float were to help with overflow before the division, it would overflow on the next line anyway since you apply the multiply back (but as an integer)... Anyway, overflow is extremely unlikely (and probably impossible in practice) since WHEEL_DELTA is just 120, and it was already vulnerable to overflow currently. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index bd9cffd..2f4d4fe 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,9 +2068,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2081,10 +2083,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.20.1

2 8

[PATCH vkd3d 05/10] vkd3d-shader: Take into account dst write mask for scalar stores.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index de4c683ee8ae..bb74400e0d50 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2933,6 +2933,7 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); + component_idx -= vkd3d_write_mask_get_component_idx(dst_write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); } -- 2.19.2

2 1

[PATCH vkd3d 10/10] tests: Use vkd3d_test_set_context() in test_null_cbv().
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5c3f38de0033..5f869d229db3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15552,6 +15552,8 @@ static void test_null_cbv(void) for (index = 0; index < 1200; index += 100) { + vkd3d_test_set_context("index %u", index); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); @@ -15568,12 +15570,13 @@ static void test_null_cbv(void) transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_float(context.render_target, 0, queue, command_list, 0x00000000, 0); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); -- 2.19.2

2 1

[PATCH vkd3d 09/10] tests: Add test for hull shader fork phase.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0e32f4067244..5c3f38de0033 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23194,6 +23194,238 @@ static void test_hull_shader_control_point_phase(void) destroy_test_context(&context); } +static void test_hull_shader_fork_phase(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main() : SV_Position + { + return float4(-1, -1, 0, 0); + } +#endif + 0x43425844, 0x9f5f70e7, 0x57507df4, 0xbf1a4a34, 0xdb2531df, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0xbf800000, 0xbf800000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[4] : SV_TessFactor; + float inside[2] : SV_InsideTessFactor; + float3 center : CENTER; + }; + + void patch_constant(OutputPatch<data, 4> control_points, + out patch_constant_data output) + { + uint i; + + output = (patch_constant_data)0; + + for (i = 0; i < 4; ++i) + { + output.edges[i] = 1.0; + } + + for (i = 0; i < 2; ++i) + { + output.inside[i] = 1.0; + } + + for (i = 0; i < 4; ++i) + { + output.center += control_points[i].position.xyz; + } + output.center /= 4; + } + + [domain("quad")] + [outputcontrolpoints(4)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input, + uint i : SV_OutputControlPointID) + { + data o = (data)0; + const float4 vertices[] = + { + float4(0, 0, 0, 1), + float4(0, 2, 0, 1), + float4(2, 0, 0, 1), + float4(2, 2, 0, 1), + }; + + o.position = input[0].position + vertices[i]; + + return o; + } + + [domain("quad")] + void ds_main(patch_constant_data input, + float2 tess_coord : SV_DomainLocation, + const OutputPatch<data, 4> patch, + out float4 position : SV_Position, + out float4 color : COLOR) + { + float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x); + float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x); + position = lerp(a, b, tess_coord.y); + + color = float4(input.center, 1.0); + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0xcecdcc7a, 0x1e0454ae, 0x8c490947, 0x7e33bb11, 0x00000001, 0x000005a4, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000017c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x000000dc, + 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x000000b0, 0x00000001, + 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x000000b0, 0x00000002, 0x0000000b, 0x00000003, + 0x00000002, 0x00000e01, 0x000000b0, 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000e01, + 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, 0x000000c5, 0x00000001, + 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x45430072, + 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373, 0x726f7463, 0xababab00, 0x58454853, + 0x00000420, 0x00030050, 0x00000108, 0x01000071, 0x01000893, 0x01002094, 0x01001895, 0x01000896, + 0x01001897, 0x0100086a, 0x00001835, 0x00000012, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, + 0x3f800000, 0x00000000, 0x40000000, 0x00000000, 0x3f800000, 0x40000000, 0x00000000, 0x00000000, + 0x3f800000, 0x40000000, 0x40000000, 0x00000000, 0x01000072, 0x0200005f, 0x00016000, 0x0400005f, + 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, + 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x06000036, 0x00100032, 0x00000000, 0x00909596, + 0x0010000a, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x08000000, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000004, 0x0200005f, 0x00017000, + 0x04000067, 0x00102012, 0x00000000, 0x0000000b, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, + 0x04000067, 0x00102012, 0x00000002, 0x0000000d, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, + 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000004, 0x04000036, 0x00100012, + 0x00000000, 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, + 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, + 0x00000004, 0x0000000f, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x02000068, 0x00000001, + 0x0400005b, 0x00102012, 0x00000004, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, + 0x07000036, 0x00d02012, 0x00000004, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x0400005f, 0x0021a012, 0x00000004, 0x00000000, 0x03000065, 0x00102022, 0x00000000, + 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000, 0x0021a00a, 0x00000001, 0x00000000, + 0x0021a00a, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0021a00a, 0x00000002, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0021a00a, 0x00000003, 0x00000000, 0x07000038, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f, 0x0021a022, 0x00000004, 0x00000000, + 0x03000065, 0x00102042, 0x00000000, 0x02000068, 0x00000001, 0x09000000, 0x00100012, 0x00000000, + 0x0021a01a, 0x00000001, 0x00000000, 0x0021a01a, 0x00000000, 0x00000000, 0x08000000, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000002, 0x00000000, 0x08000000, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x0021a01a, 0x00000003, 0x00000000, 0x07000038, 0x00102042, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000, 0x0100003e, 0x01000073, 0x0400005f, + 0x0021a042, 0x00000004, 0x00000000, 0x03000065, 0x00102082, 0x00000000, 0x02000068, 0x00000001, + 0x09000000, 0x00100012, 0x00000000, 0x0021a02a, 0x00000001, 0x00000000, 0x0021a02a, 0x00000000, + 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000002, + 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0021a02a, 0x00000003, + 0x00000000, 0x07000038, 0x00102082, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x3e800000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x6a721eb5, 0xa3ba6439, 0x3f31e765, 0x07e272c6, 0x00000001, 0x00000304, 0x00000004, + 0x00000030, 0x00000064, 0x00000148, 0x0000019c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x000000dc, 0x00000007, 0x00000008, 0x000000b0, 0x00000000, 0x0000000b, + 0x00000003, 0x00000000, 0x00000001, 0x000000be, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000e0e, 0x000000b0, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000001, 0x000000b0, + 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x000000b0, 0x00000003, 0x0000000b, + 0x00000003, 0x00000003, 0x00000001, 0x000000c5, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, + 0x00000001, 0x000000c5, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000001, 0x545f5653, + 0x46737365, 0x6f746361, 0x45430072, 0x5245544e, 0x5f565300, 0x69736e49, 0x65546564, 0x61467373, + 0x726f7463, 0xababab00, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x00000160, 0x00040050, 0x00000058, 0x01002093, 0x01001895, 0x0100086a, 0x0300005f, 0x0011b0e2, + 0x00000000, 0x0200005f, 0x0001c032, 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000002, + 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002, 0x00000000, 0x00219e46, + 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006, 0x00100e46, 0x00000000, + 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001, 0x80219e46, 0x00000041, + 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000001, + 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000, 0x08000000, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001, 0x08000032, 0x001020f2, + 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x00102072, + 0x00000001, 0x0011b796, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x00004001, 0x3f800000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(in float4 p : SV_Position, in float4 color : COLOR) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xbd83f517, 0x8974e87a, 0xaf402223, 0xaec7f351, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000003c, 0x00000050, + 0x0000000f, 0x0100086a, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PS = ps; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 1, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff000000, 0); + + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -25544,6 +25776,7 @@ START_TEST(d3d12) run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); run_test(test_hull_shader_control_point_phase); + run_test(test_hull_shader_fork_phase); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.19.2

2 1

[PATCH vkd3d 08/10] vkd3d-shader: Use epilogue functions for fork and join phases.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> In order to handle packed outputs properly. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 59 ++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 53aa74a6434d..a734539b7b88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2024,8 +2024,10 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) { + const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; struct vkd3d_dxbc_compiler *compiler; + unsigned int max_element_count; unsigned int i; if (!(compiler = vkd3d_malloc(sizeof(*compiler)))) @@ -2033,7 +2035,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader memset(compiler, 0, sizeof(*compiler)); - if (!(compiler->output_info = vkd3d_calloc(output_signature->element_count, sizeof(*compiler->output_info)))) + max_element_count = max(output_signature->element_count, patch_constant_signature->element_count); + if (!(compiler->output_info = vkd3d_calloc(max_element_count, sizeof(*compiler->output_info)))) { vkd3d_free(compiler); return NULL; @@ -4005,11 +4008,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } - if (!is_patch_constant) - { - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - } + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -4047,10 +4047,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } - if (use_private_variable && is_patch_constant) - FIXME("Private variables not supported for patch constants.\n"); - - if (use_private_variable && !is_patch_constant) + if (use_private_variable) { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; @@ -4115,6 +4112,9 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi write_mask &= dst_write_mask; use_mask = (output->mask >> 8) & 0xff; + if (!write_mask) + return; + if (output_info->component_type != VKD3D_TYPE_FLOAT) { type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, VKD3D_VEC4_SIZE); @@ -4177,11 +4177,12 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; - const struct vkd3d_shader_signature *signature = compiler->output_signature; uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_signature *signature; const struct vkd3d_shader_phase *phase; uint32_t output_index_id = 0; + bool is_patch_constant; unsigned int i, count; DWORD variable_idx; @@ -4190,6 +4191,9 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + is_patch_constant = phase && (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE); + + signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; function_id = compiler->epilogue_function_id; @@ -4251,7 +4255,10 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_return(&compiler->spirv_builder); vkd3d_spirv_build_op_function_end(builder); - memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + /* Fork and join phases share output registers (patch constants). */ + if (!phase || is_control_point_phase(phase)) + memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; @@ -5284,6 +5291,29 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } + if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) + { + signature = compiler->patch_constant_signature; + + memset(&reg, 0, sizeof(reg)); + reg.idx[1].offset = ~0u; + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + reg.type = VKD3DSPR_OUTPUT; + reg.idx[0].offset = e->register_index; + vkd3d_symbol_make_register(&reg_symbol, &reg); + + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } + } + } + if (phase->instance_count) { reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; @@ -6152,11 +6182,8 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_phase *phase; - if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY - && (!(phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler)) - || phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE)) + if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); -- 2.19.2

2 1

[PATCH vkd3d 07/10] vkd3d-shader: Add basic support for vocp registers.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 28 +++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c8e0c379897a..53aa74a6434d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3761,6 +3761,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; + case VKD3DSPR_OUTCONTROLPOINT: + /* See vkd3d_dxbc_compiler_leave_shader_phase(). */ + return; default: FIXME("Unhandled shader phase input register %#x.\n", reg->type); return; @@ -5227,8 +5230,8 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c { const struct vkd3d_shader_signature *signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + struct vkd3d_symbol reg_symbol, *symbol; struct vkd3d_shader_register reg; - struct vkd3d_symbol reg_symbol; struct rb_entry *entry; unsigned int i; @@ -5244,26 +5247,39 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c compiler->temp_count = 0; /* - * Output regsiters have a different purpose in the control point phase and - * in fork/join phases. We have to remove all output registers' symbols - * when leaving the control point phase. + * vocp inputs in fork and join shader phases are outputs of the control + * point phase. Reinsert symbols for vocp registers while leaving the + * control point phase. */ if (is_control_point_phase(phase)) { memset(&reg, 0, sizeof(reg)); - reg.type = VKD3DSPR_OUTPUT; reg.idx[1].offset = ~0u; for (i = 0; i < signature->element_count; ++i) { const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + reg.type = VKD3DSPR_OUTPUT; reg.idx[0].offset = e->register_index; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); + + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + + reg.type = VKD3DSPR_OUTCONTROLPOINT; + reg.idx[1].offset = reg.idx[0].offset; + reg.idx[0].offset = compiler->output_control_point_count; + vkd3d_symbol_make_register(symbol, &reg); + symbol->info.reg.is_aggregate = false; + + if (rb_put(&compiler->symbol_table, symbol, entry) == -1) + { + ERR("Failed to insert vocp symbol entry (%s).\n", debug_vkd3d_symbol(symbol)); + vkd3d_symbol_free(entry, NULL); + } } } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7ffcdd9c5e77..a6860969c068 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -765,7 +765,7 @@ static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) { - return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_OUTCONTROLPOINT; } static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_register *reg) -- 2.19.2

2 1

[PATCH vkd3d 06/10] vkd3d-shader: Use SPIR-V built-ins for hull shader inputs.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> I missed this case before because apps don't seem to use SV_Position for hull shader inputs. vkd3d_siv_from_sysval() needs to be restored for hull shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bb74400e0d50..c8e0c379897a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,6 +129,20 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } +static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) +{ + switch (sysval) + { + case VKD3D_SV_NONE: + return VKD3D_SIV_NONE; + case VKD3D_SV_POSITION: + return VKD3D_SIV_POSITION; + default: + FIXME("Unhandled sysval %#x.\n", sysval); + return VKD3D_SIV_NONE; + } +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3590,6 +3604,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && !sysval && signature_element->sysval_semantic) + sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); -- 2.19.2

2 1

[PATCH vkd3d 04/10] tests: Get rid of vk_driver_id static variable.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_crosstest.h | 62 ++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 082118fa35fe..ae49bf4c68f9 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -358,8 +358,8 @@ static inline bool is_radv_device(ID3D12Device *device) { return false; } + #else -static VkDriverIdKHR vk_driver_id; static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) { @@ -491,26 +491,20 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static void init_adapter_info(void) +static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPropertiesKHR *driver_properties) { PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; - VkPhysicalDeviceDriverPropertiesKHR driver_properties; VkPhysicalDeviceProperties2 device_properties2; VkPhysicalDevice vk_physical_device; - struct vkd3d_instance *instance; - ID3D12Device *device; - HRESULT hr; - - if (FAILED(hr = create_vkd3d_instance(&instance))) - return; - if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) - goto done; + memset(driver_properties, 0, sizeof(*driver_properties)); + driver_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; vk_physical_device = vkd3d_get_vk_physical_device(device); if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) { + struct vkd3d_instance *instance = vkd3d_instance_from_device(device); VkInstance vk_instance = vkd3d_instance_get_vk_instance(instance); pfn_vkGetPhysicalDeviceProperties2KHR @@ -519,19 +513,32 @@ static void init_adapter_info(void) memset(&device_properties2, 0, sizeof(device_properties2)); device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &driver_properties; - memset(&driver_properties, 0, sizeof(driver_properties)); - driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + device_properties2.pNext = driver_properties; pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + return true; + } - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + return false; +} - vk_driver_id = driver_properties.driverID; - } +static void init_adapter_info(void) +{ + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + struct vkd3d_instance *instance; + ID3D12Device *device; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + { + if (get_driver_properties(device, &driver_properties)) + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); - ID3D12Device_Release(device); + ID3D12Device_Release(device); + } -done: vkd3d_instance_decref(instance); } @@ -542,18 +549,27 @@ static inline bool is_amd_windows_device(ID3D12Device *device) static inline bool is_mesa_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR - || vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR + || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } static inline bool is_nvidia_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } static inline bool is_radv_device(ID3D12Device *device) { - return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR; + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } #endif -- 2.19.2

2 1

[PATCH vkd3d 03/10] tests: Implement --adapter option for Vulkan tests.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_crosstest.h | 208 +++++++++++++++++++++------------------- 1 file changed, 108 insertions(+), 100 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index be6076a45950..082118fa35fe 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -268,6 +268,25 @@ static IUnknown *create_adapter(void) return adapter; } +static ID3D12Device *create_device(void) +{ + IUnknown *adapter = NULL; + ID3D12Device *device; + HRESULT hr; + + if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) + { + trace("Failed to create adapter.\n"); + return NULL; + } + + hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IUnknown_Release(adapter); + + return SUCCEEDED(hr) ? device : NULL; +} + static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; @@ -340,9 +359,39 @@ static inline bool is_radv_device(ID3D12Device *device) return false; } #else -static bool have_VK_KHR_driver_properties; static VkDriverIdKHR vk_driver_id; +static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) +{ + VkExtensionProperties *properties; + bool ret = false; + unsigned int i; + uint32_t count; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return false; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = true; + break; + } + } + + free(properties); + return ret; +} + static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) { struct vkd3d_optional_instance_extensions_info optional_extensions_info; @@ -367,21 +416,58 @@ static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) return vkd3d_create_instance(&instance_create_info, instance); } +static VkPhysicalDevice select_physical_device(struct vkd3d_instance *instance) +{ + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + VkInstance vk_instance; + uint32_t count; + VkResult vr; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + if (use_adapter_idx >= count) + { + trace("Invalid physical device index %u.\n", use_adapter_idx); + return VK_NULL_HANDLE; + } + + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vk_physical_device = vk_physical_devices[use_adapter_idx]; + + free(vk_physical_devices); + + return vk_physical_device; +} + static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { struct vkd3d_device_create_info device_create_info; + VkPhysicalDevice vk_physical_device; static const char * const device_extensions[] = { VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, }; + if (!(vk_physical_device = select_physical_device(instance))) + return E_INVALIDARG; + memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; - if (have_VK_KHR_driver_properties) + device_create_info.vk_physical_device = vk_physical_device; + + if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) { device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); @@ -390,55 +476,19 @@ static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, return vkd3d_create_device(&device_create_info, iid, device); } -static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) -{ - VkExtensionProperties *properties; - bool ret = false; - unsigned int i; - uint32_t count; - VkResult vr; - - vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - if (!count) - return false; - - properties = calloc(count, sizeof(*properties)); - ok(properties, "Failed to allocate memory.\n"); - - vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - for (i = 0; i < count; ++i) - { - if (!strcmp(properties[i].extensionName, name)) - { - ret = true; - break; - } - } - - free(properties); - return ret; -} - -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, - D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +static ID3D12Device *create_device(void) { struct vkd3d_instance *instance; + ID3D12Device *device; HRESULT hr; if (SUCCEEDED(hr = create_vkd3d_instance(&instance))) { - hr = create_vkd3d_device(instance, minimum_feature_level, iid, device); + hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); vkd3d_instance_decref(instance); } - return hr; -} - -static IUnknown *create_adapter(void) -{ - return NULL; + return SUCCEEDED(hr) ? device : NULL; } static void init_adapter_info(void) @@ -446,61 +496,38 @@ static void init_adapter_info(void) PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; VkPhysicalDeviceDriverPropertiesKHR driver_properties; VkPhysicalDeviceProperties2 device_properties2; - VkPhysicalDevice *vk_physical_devices; VkPhysicalDevice vk_physical_device; struct vkd3d_instance *instance; - VkInstance vk_instance; ID3D12Device *device; - uint32_t count, i; - VkResult vr; HRESULT hr; if (FAILED(hr = create_vkd3d_instance(&instance))) return; - vk_instance = vkd3d_instance_get_vk_instance(instance); - - vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); - ok(vk_physical_devices, "Failed to allocate memory.\n"); - vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); - ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); - - have_VK_KHR_driver_properties = true; - for (i = 0; i < count; ++i) - { - if (!check_device_extension(vk_physical_devices[i],VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) - { - have_VK_KHR_driver_properties = false; - break; - } - } - - free(vk_physical_devices); - - if (!have_VK_KHR_driver_properties) - goto done; - if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) goto done; vk_physical_device = vkd3d_get_vk_physical_device(device); - pfn_vkGetPhysicalDeviceProperties2KHR - = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); - ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); + if (check_device_extension(vk_physical_device, VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) + { + VkInstance vk_instance = vkd3d_instance_get_vk_instance(instance); + + pfn_vkGetPhysicalDeviceProperties2KHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); - memset(&device_properties2, 0, sizeof(device_properties2)); - device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &driver_properties; - memset(&driver_properties, 0, sizeof(driver_properties)); - driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; - pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + memset(&device_properties2, 0, sizeof(device_properties2)); + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &driver_properties; + memset(&driver_properties, 0, sizeof(driver_properties)); + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); - vk_driver_id = driver_properties.driverID; + vk_driver_id = driver_properties.driverID; + } ID3D12Device_Release(device); @@ -530,25 +557,6 @@ static inline bool is_radv_device(ID3D12Device *device) } #endif -static ID3D12Device *create_device(void) -{ - IUnknown *adapter = NULL; - ID3D12Device *device; - HRESULT hr; - - if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) - { - trace("Failed to create adapter.\n"); - return NULL; - } - - hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); - if (adapter) - IUnknown_Release(adapter); - - return SUCCEEDED(hr) ? device : NULL; -} - static void parse_args(int argc, char **argv) { unsigned int i; -- 2.19.2

2 1

[PATCH vkd3d 02/10] vkd3d: Add feature level 11_1.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/device.c | 34 ++++++++++++++++++++++++++++------ libs/vkd3d/utils.c | 5 ----- libs/vkd3d/vkd3d_main.c | 6 ------ libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a1f87b22e87e..53874141dd12 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,7 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_UAV_SLOT_COUNT = 64; const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_MIP_LEVELS = 15; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 193a36cb2ee3..fa59593bbdef 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -853,9 +853,11 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } } -static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_info *vk_info, +static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, const VkPhysicalDeviceFeatures *features) { + bool have_11_0 = true; + #define CHECK_MIN_REQUIREMENT(name, value) \ if (vk_info->device_limits.name < value) \ WARN(#name " does not meet feature level 11_0 requirements.\n"); @@ -864,7 +866,10 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ WARN(#name " does not meet feature level 11_0 requirements.\n"); #define CHECK_FEATURE(name) \ if (!features->name) \ - WARN(#name " is not supported.\n"); + { \ + WARN(#name " is not supported.\n"); \ + have_11_0 = false; \ + } CHECK_MIN_REQUIREMENT(maxPushConstantsSize, D3D12_MAX_ROOT_COST * sizeof(uint32_t)); CHECK_MIN_REQUIREMENT(maxComputeSharedMemorySize, D3D12_CS_TGSM_REGISTER_COUNT * sizeof(uint32_t)); @@ -906,6 +911,17 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ #undef CHECK_MIN_REQUIREMENT #undef CHECK_MAX_REQUIREMENT #undef CHECK_FEATURE + + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; + + if (have_11_0 + && features->logicOp + && features->vertexPipelineStoresAndAtomics + && vk_info->device_limits.maxPerStageDescriptorStorageBuffers >= D3D12_UAV_SLOT_COUNT + && vk_info->device_limits.maxPerStageDescriptorStorageImages >= D3D12_UAV_SLOT_COUNT) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_1; + + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, @@ -1030,12 +1046,17 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->vertex_attrib_zero_divisor = false; } - vkd3d_check_feature_level_11_requirements(vulkan_info, features); + vkd3d_free(vk_extensions); + + vkd3d_init_feature_level(vulkan_info, features); + if (vulkan_info->max_feature_level < create_info->minimum_feature_level) + { + WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); + return E_INVALIDARG; + } features->shaderTessellationAndGeometryPointSize = VK_FALSE; - vkd3d_free(vk_extensions); - return S_OK; } @@ -1874,6 +1895,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * case D3D12_FEATURE_FEATURE_LEVELS: { + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; D3D12_FEATURE_DATA_FEATURE_LEVELS *data = feature_data; unsigned int i; @@ -1889,7 +1911,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * for (i = 0; i < data->NumFeatureLevels; ++i) { D3D_FEATURE_LEVEL fl = data->pFeatureLevelsRequested[i]; - if (data->MaxSupportedFeatureLevel < fl && check_feature_level_support(fl)) + if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } return S_OK; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 666319e46d90..1c10450d1ea9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -245,11 +245,6 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) return false; } -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) -{ - return feature_level <= D3D_FEATURE_LEVEL_11_0; -} - bool is_write_resource_state(D3D12_RESOURCE_STATES state) { return state & (D3D12_RESOURCE_STATE_RENDER_TARGET diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index c65a4abcac55..5e93a2a77407 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -55,12 +55,6 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return E_INVALIDARG; } - if (!check_feature_level_support(create_info->minimum_feature_level)) - { - FIXME("Unsupported feature level %#x.\n", create_info->minimum_feature_level); - return E_INVALIDARG; - } - if ((instance = create_info->instance)) { vkd3d_instance_incref(instance); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fa2c4609600c..3292e31bae5a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -100,6 +100,8 @@ struct vkd3d_vulkan_info VkPhysicalDeviceLimits device_limits; VkPhysicalDeviceSparseProperties sparse_properties; + + D3D_FEATURE_LEVEL max_feature_level; }; struct vkd3d_instance @@ -994,7 +996,6 @@ VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *d VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 01/10] vkd3d: Rework Vulkan queues initialisation.
by Józef Kucia 06 Mar '19

06 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 227 ++++++++++++++++++++++++++------------------ 1 file changed, 132 insertions(+), 95 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1de98f4a2ba..193a36cb2ee3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1097,6 +1097,25 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, return S_OK; } +/* Vulkan queues */ +enum vkd3d_queue_family +{ + VKD3D_QUEUE_FAMILY_DIRECT, + VKD3D_QUEUE_FAMILY_COMPUTE, + VKD3D_QUEUE_FAMILY_TRANSFER, + + VKD3D_QUEUE_FAMILY_COUNT, +}; + +struct vkd3d_device_queue_info +{ + unsigned int family_index[VKD3D_QUEUE_FAMILY_COUNT]; + VkQueueFamilyProperties vk_properties[VKD3D_QUEUE_FAMILY_COUNT]; + + unsigned int vk_family_count; + VkDeviceQueueCreateInfo vk_queue_create_info[VKD3D_QUEUE_FAMILY_COUNT]; +}; + static void d3d12_device_destroy_vkd3d_queues(struct d3d12_device *device) { if (device->direct_queue) @@ -1113,31 +1132,33 @@ static void d3d12_device_destroy_vkd3d_queues(struct d3d12_device *device) } static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, - const VkQueueFamilyProperties *queue_properties, uint32_t direct_queue_family_index, - uint32_t compute_queue_family_index, uint32_t copy_queue_family_index) + const struct vkd3d_device_queue_info *queue_info) { + uint32_t transfer_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER]; + uint32_t compute_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE]; + uint32_t direct_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; HRESULT hr; device->direct_queue = NULL; device->compute_queue = NULL; device->copy_queue = NULL; - if (FAILED((hr = vkd3d_queue_create(device, direct_queue_family_index, - &queue_properties[direct_queue_family_index], &device->direct_queue)))) + if (FAILED((hr = vkd3d_queue_create(device, direct_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT], &device->direct_queue)))) goto out_destroy_queues; - if (compute_queue_family_index == direct_queue_family_index) + if (compute_family_index == direct_family_index) device->compute_queue = device->direct_queue; - else if (FAILED(hr = vkd3d_queue_create(device, compute_queue_family_index, - &queue_properties[compute_queue_family_index], &device->compute_queue))) + else if (FAILED(hr = vkd3d_queue_create(device, compute_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE], &device->compute_queue))) goto out_destroy_queues; - if (copy_queue_family_index == direct_queue_family_index) + if (transfer_family_index == direct_family_index) device->copy_queue = device->direct_queue; - else if (copy_queue_family_index == compute_queue_family_index) + else if (transfer_family_index == compute_family_index) device->copy_queue = device->compute_queue; - else if (FAILED(hr = vkd3d_queue_create(device, copy_queue_family_index, - &queue_properties[copy_queue_family_index], &device->copy_queue))) + else if (FAILED(hr = vkd3d_queue_create(device, transfer_family_index, + &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER], &device->copy_queue))) goto out_destroy_queues; return S_OK; @@ -1147,100 +1168,126 @@ out_destroy_queues: return hr; } -static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, - const struct vkd3d_device_create_info *create_info) +static float queue_priorities[] = {1.0f}; + +static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, + VkPhysicalDevice physical_device, struct vkd3d_device_queue_info *info) { - unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; - const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; - VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; - struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + const struct vkd3d_vk_instance_procs *vk_procs = &vkd3d_instance->vk_procs; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; - VkPhysicalDeviceFeatures2 features2; - VkPhysicalDevice physical_device; - VkDeviceCreateInfo device_info; - uint32_t queue_family_count; - uint32_t extension_count; - const char **extensions; - VkDevice vk_device; unsigned int i; - VkResult vr; - HRESULT hr; - - TRACE("device %p, create_info %p.\n", device, create_info); - - physical_device = create_info->vk_physical_device; - if (!physical_device - && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) - return hr; + uint32_t count; - device->vk_physical_device = physical_device; + memset(info, 0, sizeof(*info)); + for (i = 0; i < ARRAY_SIZE(info->family_index); ++i) + info->family_index[i] = ~0u; - /* Create command queues */ - VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &queue_family_count, NULL)); - if (!(queue_properties = vkd3d_calloc(queue_family_count, sizeof(*queue_properties)))) + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, NULL)); + if (!(queue_properties = vkd3d_calloc(count, sizeof(*queue_properties)))) return E_OUTOFMEMORY; - VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, - &queue_family_count, queue_properties)); - - if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) - { - hr = E_OUTOFMEMORY; - goto done; - } + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, queue_properties)); - direct_queue_family_index = ~0u; - copy_queue_family_index = ~0u; - compute_queue_family_index = ~0u; - for (i = 0; i < queue_family_count; ++i) + for (i = 0; i < count; ++i) { - static float priorities[] = {1.0f}; - - queue_info[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; - queue_info[i].pNext = NULL; - queue_info[i].flags = 0; - queue_info[i].queueFamilyIndex = i; - queue_info[i].queueCount = 1; - queue_info[i].pQueuePriorities = priorities; + enum vkd3d_queue_family vkd3d_family = VKD3D_QUEUE_FAMILY_COUNT; if ((queue_properties[i].queueFlags & (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) == (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) { - direct_queue_family_index = i; - } - if (queue_properties[i].queueFlags & VK_QUEUE_TRANSFER_BIT) - { - copy_queue_family_index = i; + vkd3d_family = VKD3D_QUEUE_FAMILY_DIRECT; } if ((queue_properties[i].queueFlags & (VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT)) == VK_QUEUE_COMPUTE_BIT) { - compute_queue_family_index = i; + vkd3d_family = VKD3D_QUEUE_FAMILY_COMPUTE; } + if ((queue_properties[i].queueFlags & ~VK_QUEUE_SPARSE_BINDING_BIT) == VK_QUEUE_TRANSFER_BIT) + { + vkd3d_family = VKD3D_QUEUE_FAMILY_TRANSFER; + } + + if (vkd3d_family == VKD3D_QUEUE_FAMILY_COUNT) + continue; + + info->family_index[vkd3d_family] = i; + info->vk_properties[vkd3d_family] = queue_properties[i]; + queue_info = &info->vk_queue_create_info[vkd3d_family]; + + queue_info->sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info->pNext = NULL; + queue_info->flags = 0; + queue_info->queueFamilyIndex = i; + queue_info->queueCount = 1; /* FIXME: Use multiple queues. */ + queue_info->pQueuePriorities = queue_priorities; } - if (direct_queue_family_index == ~0u) + vkd3d_free(queue_properties); + + if (info->family_index[VKD3D_QUEUE_FAMILY_DIRECT] == ~0u) { FIXME("Could not find a suitable queue family for a direct command queue.\n"); - hr = E_FAIL; - goto done; + return E_FAIL; } - if (copy_queue_family_index == ~0u) + + /* No compute-only queue family, reuse the direct queue family with graphics and compute. */ + if (info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE] == ~0u) { - FIXME("Could not find a suitable queue family for a copy command queue.\n"); - hr = E_FAIL; - goto done; + info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; } - if (compute_queue_family_index == ~0u) + if (info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] == ~0u) { - /* No compute-only queue family, reuse the direct queue family with graphics and compute. */ - compute_queue_family_index = direct_queue_family_index; + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; } - TRACE("Using queue family %u for direct command queues.\n", direct_queue_family_index); - TRACE("Using queue family %u for copy command queues.\n", copy_queue_family_index); - TRACE("Using queue family %u for compute command queues.\n", compute_queue_family_index); + /* Compact the array. */ + info->vk_family_count = 1; + for (i = info->vk_family_count; i < ARRAY_SIZE(info->vk_queue_create_info); ++i) + { + if (info->vk_queue_create_info[i].queueCount) + info->vk_queue_create_info[info->vk_family_count++] = info->vk_queue_create_info[i]; + } + + return S_OK; +} + +static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info) +{ + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + struct vkd3d_device_queue_info device_queue_info; + VkPhysicalDeviceFeatures2 features2; + VkPhysicalDevice physical_device; + VkDeviceCreateInfo device_info; + uint32_t extension_count; + const char **extensions; + VkDevice vk_device; + VkResult vr; + HRESULT hr; + + TRACE("device %p, create_info %p.\n", device, create_info); + + physical_device = create_info->vk_physical_device; + if (!physical_device + && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) + return hr; + + device->vk_physical_device = physical_device; + + if (FAILED(hr = vkd3d_select_queues(device->vkd3d_instance, physical_device, &device_queue_info))) + return hr; + + TRACE("Using queue family %u for direct command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_DIRECT]); + TRACE("Using queue family %u for compute command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_COMPUTE]); + TRACE("Using queue family %u for copy command queues.\n", + device_queue_info.family_index[VKD3D_QUEUE_FAMILY_TRANSFER]); VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); @@ -1257,20 +1304,17 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2, &extension_count))) - goto done; + return hr; if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) - { - hr = E_OUTOFMEMORY; - goto done; - } + return E_OUTOFMEMORY; /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_info.pNext = &vertex_divisor_features; device_info.flags = 0; - device_info.queueCreateInfoCount = queue_family_count; - device_info.pQueueCreateInfos = queue_info; + device_info.queueCreateInfoCount = device_queue_info.vk_family_count; + device_info.pQueueCreateInfos = device_queue_info.vk_queue_create_info; device_info.enabledLayerCount = 0; device_info.ppEnabledLayerNames = NULL; device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, @@ -1286,8 +1330,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (vr < 0) { ERR("Failed to create Vulkan device, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto done; + return hresult_from_vk_result(vr); } if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) @@ -1295,26 +1338,20 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, ERR("Failed to load device procs, hr %#x.\n", hr); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto done; + return hr; } device->vk_device = vk_device; - if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, queue_properties, - direct_queue_family_index, compute_queue_family_index, copy_queue_family_index))) + if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, &device_queue_info))) { ERR("Failed to create queues, hr %#x.\n", hr); device->vk_procs.vkDestroyDevice(vk_device, NULL); - goto done; + return hr; } TRACE("Created Vulkan device %p.\n", vk_device); -done: - if (queue_properties) - vkd3d_free(queue_properties); - if (queue_info) - vkd3d_free(queue_info); return hr; } -- 2.19.2

2 1

[PATCH v2] msacm32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 06 Mar '19

06 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: !pad->hDrvr is NULL on all path leading to gotError so remove that check too. dlls/msacm32/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e0c5fdd90e..13187b2204 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -600,8 +600,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe return MMSYSERR_NOERROR; gotError: WARN("failed: ret = %08x\n", ret); - if (pad && !pad->hDrvr) - HeapFree(MSACM_hHeap, 0, pad); + HeapFree(MSACM_hHeap, 0, pad); return ret; } -- 2.20.1

2 1

[PATCH 4/5] d3d9/tests: Add tests for Fetch4 with 3D textures.
by Henri Verbeet 06 Mar '19

06 Mar '19

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f6b9211d84c..4b9b241b37d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15481,6 +15481,15 @@ static void test_fetch4(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + static const DWORD ps_code_3d[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0xa0000000, 0xa00f0800, /* dcl_volume s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0e40800, /* texld r0, v0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -15510,6 +15519,8 @@ static void test_fetch4(void) D3DCOLOR colour_amd[16]; D3DCOLOR colour_intel[16]; D3DCOLOR colour_fetch4_off[16]; + D3DCOLOR colour_3d_fetch4_off[16]; + D3DCOLOR colour_3d_amd_zround[16]; } expected_colours = { @@ -15532,6 +15543,16 @@ static void test_fetch4(void) 0x02020202, 0xf2f2f2f2, 0xf1f1f1f1, 0x01010101, 0x04040404, 0xf4f4f4f4, 0xf3f3f3f3, 0x03030303, 0x23232323, 0x22222222, 0x21212121, 0x20202020}, + /* Fetch4 off on 3D textures. */ + {0xff020202, 0xfff2f2f2, 0xfff1f1f1, 0xff010101, + 0xff050505, 0xfff4f4f4, 0xfff3f3f3, 0xff030303, + 0xff232323, 0xff222222, 0xff212121, 0xff202020, + 0xff131313, 0xff121212, 0xff111111, 0xff101010}, + /* Fetch4 on, 3D texture without nearest z rounding. */ + {0x02f204f4, 0xf2f1f4f3, 0xf101f303, 0x01010303, + 0x04f42322, 0xf4f32221, 0xf3032120, 0x03032020, + 0x23221312, 0x22211211, 0x21201110, 0x20201010, + 0x13121312, 0x12111211, 0x11101110, 0x10101010}, }; static const DWORD fetch4_data[] = {0x10111213, 0x01f1f202, 0x03f3f404, 0x20212223}; @@ -15618,15 +15639,18 @@ static void test_fetch4(void) }, }; - D3DCOLOR colour, colour_amd, colour_intel, colour_off; + D3DCOLOR colour, colour_amd, colour_intel, colour_off, colour_zround; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; + IDirect3DVolumeTexture9 *texture_3d; IDirect3DSurface9 *original_rt; + IDirect3DPixelShader9 *ps_3d; struct surface_readback rb; IDirect3DVertexShader9 *vs; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; unsigned int i, j, x, y; D3DLOCKED_RECT lr; + D3DLOCKED_BOX lb; IDirect3D9 *d3d; ULONG refcount; D3DCAPS9 caps; @@ -15681,6 +15705,8 @@ static void test_fetch4(void) hr = IDirect3DDevice9_CreatePixelShader(device, shaders[i].ps_code, &ps[i]); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code_3d, &ps_3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE4(0)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -15818,12 +15844,70 @@ static void test_fetch4(void) IDirect3DTexture9_Release(tex); } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 4, 4, 2, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture_3d, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture_3d, 0, &lb, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(fetch4_data); ++i) + { + memcpy((BYTE *)lb.pBits + i * lb.RowPitch, &fetch4_data[i], sizeof(fetch4_data[i])); + /* Shift the lower level, to keep it different. */ + memcpy((BYTE *)lb.pBits + i * lb.RowPitch + lb.SlicePitch, &fetch4_data[(i + 1) % 4], sizeof(fetch4_data[i])); + } + hr = IDirect3DVolumeTexture9_UnlockBox(texture_3d, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture_3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Fetch4 with 3D textures. */ + for (i = 0; i < 2; ++i) + { + hr = IDirect3DDevice9_SetVertexShader(device, i ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, i ? ps_3d : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(original_rt, &rb); + for (j = 0; j < ARRAY_SIZE(expected_colours.colour_amd); ++j) + { + x = expected_colours.x[j % 4]; + y = expected_colours.y[j / 4]; + colour_amd = expected_colours.colour_amd[j]; + colour_intel = expected_colours.colour_intel[j]; + colour_off = expected_colours.colour_3d_fetch4_off[j]; + colour_zround = expected_colours.colour_3d_amd_zround[j]; + colour = get_readback_color(&rb, x, y); + + /* Note: Fetch4 on 3D textures have different results based on the vendor/driver + * - AMD "HD 5700" rounds to nearest "z" texel, and does fetch4 normally on .xy + * - AMD "R500" has fetch4 disabled + * - AMD "R580" has fetch4 enabled sampling at .xy0 + * - Intel UHD 620 sample with fetch4 at .xy0 */ + ok(color_match(colour, colour_off, 2) || broken(color_match(colour, colour_zround, 2) + || color_match(colour, colour_intel, 2) || color_match(colour, colour_amd, 2)), + "Test 3D %s: Got unexpected colour 0x%08x at (%u, %u).\n", shaders[i].name, colour, x, y); + } + release_surface_readback(&rb); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + IDirect3DVolumeTexture9_Release(texture_3d); IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) { if (ps[i]) IDirect3DPixelShader9_Release(ps[i]); } + IDirect3DPixelShader9_Release(ps_3d); IDirect3DVertexShader9_Release(vs); IDirect3DSurface9_Release(original_rt); refcount = IDirect3DDevice9_Release(device); -- 2.11.0

2 1

[PATCH 3/5] d3d9/tests: Add tests for Fetch4 format support.
by Henri Verbeet 06 Mar '19

06 Mar '19

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c62a94a8fb1..f6b9211d84c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15493,6 +15493,15 @@ static void test_fetch4(void) {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 4.0f, 2.0f}}, {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 4.0f, 2.0f}}, {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 4.0f, 2.0f}}, + }, + quad2[] = + { + /* Tilted on the z-axis to get a depth gradient in the depth test. */ + /* Note: Using 0.55f-0.6f to avoid rounding errors on depth tests. */ + {{-1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 0.6f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.6f, 0.0f}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.6f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.6f, 0.0f}}, }; static const struct @@ -15548,6 +15557,67 @@ static void test_fetch4(void) {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, }; + static const struct + { + const char *name; + D3DFORMAT format; + DWORD data; + unsigned int x, y; + unsigned int w, h; + D3DCOLOR colour_amd[3]; + D3DCOLOR colour_intel[3]; + BOOL todo; + } + format_tests[] = + { + /* Enabled formats */ + { + "L8", D3DFMT_L8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x40101040, 0x40101040, 0x40101040}, + }, + { + "L16", D3DFMT_L16, + 0xff804010, 360, 30, 2, 2, + {0xffff0000, 0xffff0000, 0x40ff0000}, + {0xff4040ff, 0xff4040ff, 0xff4040ff}, + }, + { + "R16F", D3DFMT_R16F, + 0x38003c00, 360, 30, 2, 2, + {0x80800000, 0x80800000, 0xff800000}, + {0x80ffff80, 0x80ffff80, 0x80ffff80}, + }, + { + "R32F", D3DFMT_R32F, + 0x3f000000, 360, 30, 2, 2, + {0x00000000, 0x00000000, 0x80000000}, + {0x00808000, 0x00808000, 0x00808000}, + }, + { + "ATI1", MAKEFOURCC('A','T','I','1'), + 0xb97700ff, 360, 30, 4, 4, + {0x6d6d6d6d, 0x6d6d6d6d, 0x49494949}, + {0xff6d00ff, 0xff6d00ff, 0xff4900ff}, + }, + /* Unsupported on Intel, broken in Wine. */ + { + "A8", D3DFMT_A8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x00000000, 0x00000000, 0x00000000}, + TRUE, + }, + /* Unsupported format. */ + { + "A8R8G8B8", D3DFMT_A8R8G8B8, + 0xff804010, 360, 270, 2, 2, + {0x00000000, 0x00000000, 0xff804010}, + {0x00000000, 0x00000000, 0xff804010}, + }, + }; + D3DCOLOR colour, colour_amd, colour_intel, colour_off; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; IDirect3DSurface9 *original_rt; @@ -15695,6 +15765,58 @@ static void test_fetch4(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Fetch4 format support. */ + for (i = 0; i < ARRAY_SIZE(format_tests); ++i) + { + IDirect3DTexture9 *tex; + + hr = IDirect3DDevice9_CreateTexture(device, format_tests[i].w, format_tests[i].h, + 1, 0, format_tests[i].format, D3DPOOL_MANAGED, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(tex, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(lr.pBits, &format_tests[i].data, 4); + hr = IDirect3DTexture9_UnlockRect(tex, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(format_tests[i].colour_amd); ++j) + { + hr = IDirect3DDevice9_SetVertexShader(device, ps[j] ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[j]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + colour_amd = format_tests[i].colour_amd[j]; + colour_intel = format_tests[i].colour_intel[j]; + colour = get_readback_color(&rb, format_tests[i].x, format_tests[i].y); + /* On windows just test the R channel, since G/B might be 0xff or 0x00. */ + todo_wine_if(format_tests[i].todo) + ok(color_match(colour, colour_amd, 2) || broken(color_match(colour, colour_intel, 2)) + || broken(color_match(colour & 0x00ff0000, colour_amd & 0x00ff0000, 2)), + "Test %s on %s: Got unexpected colour 0x%08x at (%u, %u).\n", + shaders[j].name, format_tests[i].name, colour, format_tests[i].x, format_tests[i].y); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + IDirect3DTexture9_Release(tex); + } IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) -- 2.11.0

2 1

[PATCH 2/5] d3d9/tests: Add texldd/texldb/texldl Fetch4 sampling tests.
by Henri Verbeet 06 Mar '19

06 Mar '19

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This might have been more convincing if a texture with more than a single mip-level had been used. dlls/d3d9/tests/visual.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index adb04c14de1..c62a94a8fb1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15443,6 +15443,44 @@ static void test_fetch4(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + /* Fetch4 uses the same D3D state as LOD bias, and therefore disables LOD + * handling. Texldd/texldb/texldl give the same result as plain texld. */ + /* NOTE: The Radeon HD 5700 driver 8.17.10.1404 disables Fetch4 on these + * instructions. */ + static const DWORD ps_code_texldd[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, 0.5, 0.5 */ + 0x05000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 1.0, 1.0, 1.0 */ + 0x02000001, 0x800f0002, 0xa0e40000, /* mov r2, c0 */ + 0x0500005d, 0x800f0000, 0x90e40000, 0xa0e40800, 0xa0e40000, 0x80e40002, /* texldd r0, v0, s0, c0, r2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldb[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x40a00000, 0x40a00000, /* def c0, 0.0, 0.0, 5.0, 5.0 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x03020042, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldb r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldl[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x3f000000, 0x3f000000, /* def c0, 0.0, 0.0, 0.5, 0.5 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x0300005f, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldl r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -15503,6 +15541,9 @@ static void test_fetch4(void) {"texld", ps_code_texld, 0, FALSE, 0}, {"texldp", ps_code_texldp, 2, FALSE, 0}, {"texld_yzwx", ps_code_swizzle, 0, TRUE , 0}, + {"texldd", ps_code_texldd, 0, FALSE, 0}, + {"texldb", ps_code_texldb, 0, FALSE, 0}, + {"texldl", ps_code_texldl, 0, FALSE, 0}, {"FFP_proj", NULL, 2, FALSE, D3DTTFF_PROJECTED}, {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, }; -- 2.11.0

2 1

[PATCH 1/5] d3d9/tests: Add a basic Fetch4 sampling test.
by Henri Verbeet 06 Mar '19

06 Mar '19

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 69cd4418bd2..adb04c14de1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15396,6 +15396,280 @@ done: DestroyWindow(window); } +static void test_fetch4(void) +{ + static const DWORD vs_code[] = + { + 0xfffe0300, /* vs_3_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord v1 */ + 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x80000005, 0xe00f0001, /* dcl_texcoord o1 */ + 0x02000001, 0xe00f0000, 0x90e40000, /* mov o0, v0 */ + 0x02000001, 0xe00f0001, 0x90e40001, /* mov o1, v1 */ + 0x0000ffff, + }; + static const DWORD ps_code_texld[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0e40800, /* texld r0, v0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + /* AMD and Wine use the projection on Fetch4, Intel UHD ignores it. */ + static const DWORD ps_code_texldp[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + /* The idea here is that if we project from .z, we get a 4x zoom. From + * .w a 2x zoom. */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x40800000, 0x40000000, /* def c0, 0.0, 0.0, 4.0, 2.0 */ + 0x02000001, 0x80030000, 0x90f40000, /* mov r0.xy, v0.xyww */ + 0x02000001, 0x800c0000, 0xa0e00000, /* mov r0.zw, c0.xxzw */ + 0x03010042, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldp r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_swizzle[] = + { + /* Test texld when sampling with a .yzwx swizzle. */ + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x03000042, 0x800f0000, 0x90e40000, 0xa0390800, /* texld r0, v0, s0.yzwx */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + + static const struct + { + struct vec3 position; + struct vec4 texcoord; + } + quad[] = + { + {{-1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 4.0f, 2.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 4.0f, 2.0f}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 4.0f, 2.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 4.0f, 2.0f}}, + }; + + static const struct + { + unsigned int x[4], y[4]; + D3DCOLOR colour_amd[16]; + D3DCOLOR colour_intel[16]; + D3DCOLOR colour_fetch4_off[16]; + } + expected_colours = + { + /* Sample positions. */ + {40, 200, 360, 520}, + {30, 150, 270, 390}, + /* AMD implementation (-0.5 texel offsets). */ + {0x131202f2, 0x1211f2f1, 0x1110f101, 0x10100101, + 0x02f204f4, 0xf2f1f4f3, 0xf101f303, 0x01010303, + 0x04f42322, 0xf4f32221, 0xf3032120, 0x03032020, + 0x23222322, 0x22212221, 0x21202120, 0x20202020}, + /* Intel UHD 620 implementation (no texel offsets). + * We treat the Intel results as broken. */ + {0x13131313, 0x12131312, 0x11121211, 0x10111110, + 0x13021302, 0x120213f2, 0x11f212f1, 0x10f11101, + 0x02040204, 0xf20402f4, 0xf1f4f2f3, 0x01f3f103, + 0x04230423, 0xf4230422, 0xf322f421, 0x0321f320}, + /* Fetch4 off on 2D textures. */ + {0x13131313, 0x12121212, 0x11111111, 0x10101010, + 0x02020202, 0xf2f2f2f2, 0xf1f1f1f1, 0x01010101, + 0x04040404, 0xf4f4f4f4, 0xf3f3f3f3, 0x03030303, + 0x23232323, 0x22222222, 0x21212121, 0x20202020}, + }; + + static const DWORD fetch4_data[] = {0x10111213, 0x01f1f202, 0x03f3f404, 0x20212223}; + + static const struct + { + const char *name; + const DWORD *ps_code; + unsigned int projection; + BOOL swizzled; + DWORD ttff_flags; + } + shaders[] = + { + {"FFP", NULL, 0, FALSE, 0}, + {"texld", ps_code_texld, 0, FALSE, 0}, + {"texldp", ps_code_texldp, 2, FALSE, 0}, + {"texld_yzwx", ps_code_swizzle, 0, TRUE , 0}, + {"FFP_proj", NULL, 2, FALSE, D3DTTFF_PROJECTED}, + {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, + }; + + D3DCOLOR colour, colour_amd, colour_intel, colour_off; + IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; + IDirect3DSurface9 *original_rt; + struct surface_readback rb; + IDirect3DVertexShader9 *vs; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + unsigned int i, j, x, y; + D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('D','F','2','4')))) + { + skip("No DF24 support, skipping Fetch4 test.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("No pixel shader 3.0 support, skipping FETCH4 test.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(fetch4_data); ++i) + memcpy((BYTE *)lr.pBits + i * lr.Pitch, &fetch4_data[i], sizeof(fetch4_data[i])); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(shaders); ++i) + { + if (!shaders[i].ps_code) + { + ps[i] = NULL; + continue; + } + + hr = IDirect3DDevice9_CreatePixelShader(device, shaders[i].ps_code, &ps[i]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE4(0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* According to the documentation, Fetch4 is enabled when + * D3DSAMP_MIPMAPLODBIAS == GET4 and D3DSAMP_MAGFILTER == D3DTEXF_POINT. + * In practice, it seems that only GET4 is required. + * + * AMD r500 hardware always uses POINT filtering with Fetch4. The driver + * later on corrected this by adding a -0.5 texel offset. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T','4')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Fetch4 should work with any texture wrapping mode, and does in Wine. + * However, AMD RX 580 devices force clamping when fetch4 is on. + * No other driver/hardware does this, but to avoid problems, we test with + * CLAMP on. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSW, D3DTADDRESS_CLAMP); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test basic Fetch4 sampling. */ + for (i = 0; i < ARRAY_SIZE(shaders); ++i) + { + hr = IDirect3DDevice9_SetVertexShader(device, ps[i] ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[i]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, shaders[i].ttff_flags); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + for (j = 0; j < ARRAY_SIZE(expected_colours.colour_amd); ++j) + { + unsigned int projection = shaders[i].projection; + + x = expected_colours.x[j % 4]; + y = expected_colours.y[j / 4]; + colour_amd = expected_colours.colour_amd[j]; + if (projection) + colour_amd = expected_colours.colour_amd[j / 4 / projection * 4 + (j % 4) / projection]; + if (shaders[i].swizzled) + colour_amd = (colour_amd << 8) | (colour_amd >> 24); + colour_intel = expected_colours.colour_intel[j]; + colour_off = expected_colours.colour_fetch4_off[j]; + colour = get_readback_color(&rb, x, y); + + ok(color_match(colour, colour_amd, 1) || broken(color_match(colour, colour_intel, 1)) + || broken(color_match(colour, colour_off, 1)), + "Test %s: Got unexpected colour 0x%08x at (%u, %u).\n", + shaders[i].name, colour, x, y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + IDirect3DTexture9_Release(texture); + for (i = 0; i < ARRAY_SIZE(ps); ++i) + { + if (ps[i]) + IDirect3DPixelShader9_Release(ps[i]); + } + IDirect3DVertexShader9_Release(vs); + IDirect3DSurface9_Release(original_rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void shadow_test(void) { static const DWORD ps_code[] = @@ -24895,6 +25169,7 @@ START_TEST(visual) depth_buffer2_test(); depth_blit_test(); intz_test(); + test_fetch4(); shadow_test(); fp_special_test(); depth_bounds_test(); -- 2.11.0

2 1

[PATCH 5/5] d3d9/tests: Add tests for Fetch4 with depth textures.
by Henri Verbeet 06 Mar '19

06 Mar '19

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4b9b241b37d..61a67944a0a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15639,16 +15639,75 @@ static void test_fetch4(void) }, }; + static const struct + { + D3DCOLOR colour_off, colour_amd, colour_intel; + unsigned int x, y; + } + expected_depth[][4] = + { + { + /* Shadow samplers. */ + {0xffffffff, 0xffffffff, 0xffffffff, 20, 15}, + {0xffffffff, 0xffffffff, 0xffffffff, 260, 15}, + {0x00000000, 0x00000000, 0x00000000, 20, 255}, + {0x00000000, 0x00000000, 0x00000000, 260, 135}, + }, + { + /* DF16. */ + {0xfffe0000, 0xfedfdfbf, 0xffffffff, 20, 15}, + {0xff9f0000, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0xff800000, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0xff600000, 0x5f3f3f1f, 0x80809f60, 260, 135}, + }, + { + /* DF24. */ + {0xffff0000, 0xffdfdfbf, 0xffffffff, 20, 15}, + {0xff9f0000, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0xff800000, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0xff600000, 0x5f3f3f1f, 0x80809f60, 260, 135}, + }, + { + /* INTZ. */ + {0xffffffff, 0xffdfdfbf, 0xffffffff, 20, 15}, + {0x9f9f9f9f, 0x9f7f7f5f, 0x9fbfbf9f, 260, 15}, + {0x7f7f7f7f, 0x7f5f5f3f, 0x9f809f80, 20, 255}, + {0x5f5f5f5f, 0x5f3f3f1f, 0x80809f60, 260, 135}, + } + }; + + static const struct + { + const char *name; + D3DFORMAT format; + unsigned int index; + } + depth_tests[] = + { + {"D16_LOCKABLE", D3DFMT_D16_LOCKABLE, 0}, + {"D32", D3DFMT_D32, 0}, + {"D15S1", D3DFMT_D15S1, 0}, + {"D24S8", D3DFMT_D24S8, 0}, + {"D24X8", D3DFMT_D24X8, 0}, + {"D24X4S4", D3DFMT_D24X4S4, 0}, + {"D16", D3DFMT_D16, 0}, + {"D32F_LOCKABLE", D3DFMT_D32F_LOCKABLE, 0}, + {"D24FS8", D3DFMT_D24FS8, 0}, + {"DF16", MAKEFOURCC('D','F','1','6'), 1}, + {"DF24", MAKEFOURCC('D','F','2','4'), 2}, + {"INTZ", MAKEFOURCC('I','N','T','Z'), 3}, + }; + D3DCOLOR colour, colour_amd, colour_intel, colour_off, colour_zround; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; IDirect3DVolumeTexture9 *texture_3d; - IDirect3DSurface9 *original_rt; + IDirect3DSurface9 *original_rt, *rt; IDirect3DPixelShader9 *ps_3d; struct surface_readback rb; IDirect3DVertexShader9 *vs; IDirect3DTexture9 *texture; + unsigned int i, j, k, x, y; IDirect3DDevice9 *device; - unsigned int i, j, x, y; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; @@ -15682,6 +15741,9 @@ static void test_fetch4(void) } hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 8, 8, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 1, 0, D3DFMT_L8, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -15900,6 +15962,114 @@ static void test_fetch4(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + /* Test Fetch4 with depth textures. */ + for (i = 0; i < ARRAY_SIZE(depth_tests); ++i) + { + D3DFORMAT format = depth_tests[i].format; + IDirect3DTexture9 *depth_texture; + IDirect3DSurface9 *ds; + + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format))) + { + skip("Skipping %s depth test, unsupported format.\n", depth_tests[i].name); + continue; + } + + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, + D3DUSAGE_DEPTHSTENCIL, format, D3DPOOL_DEFAULT, &depth_texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(depth_texture, 0, &ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, + D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T','1')); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Setup the depth/stencil surface. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Render to the depth surface. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)depth_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Set a shader for depth sampling, otherwise Windows does not show + * anything. */ + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[1]); /* texld */ + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < 2; ++j) + { + hr = IDirect3DDevice9_SetSamplerState(device, 0, + D3DSAMP_MIPMAPLODBIAS, MAKEFOURCC('G','E','T', j ? '4' : '1' )); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Do the actual shadow mapping. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + for (k = 0; k < ARRAY_SIZE(expected_depth[depth_tests[i].index]); ++k) + { + x = expected_depth[depth_tests[i].index][k].x; + y = expected_depth[depth_tests[i].index][k].y; + colour_amd = expected_depth[depth_tests[i].index][k].colour_amd; + colour_intel = expected_depth[depth_tests[i].index][k].colour_intel; + colour_off = expected_depth[depth_tests[i].index][k].colour_off; + colour = get_readback_color(&rb, x, y); + + /* When Fetch4 is off, ignore the .g and .b channels on + * windows. Some implementations will replicate the .r channel + * to .g and .b, others will return 0 for .g and .b. */ + if (!j) + ok(color_match(colour, colour_off, 2) + || broken(color_match(colour & 0x00ff0000, colour_off & 0x00ff0000, 2)), + "Test off: Got unexpected colour 0x%08x for format %s at (%u, %u).\n", + colour, depth_tests[i].name, x, y); + else + ok(color_match(colour, colour_amd, 2) || broken(color_match(colour, colour_intel, 2)), + "Test on: Got unexpected colour 0x%08x for format %s at (%u, %u).\n", + colour, depth_tests[i].name, x, y); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DTexture9_Release(depth_texture); + } + IDirect3DVolumeTexture9_Release(texture_3d); IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i) @@ -15909,6 +16079,7 @@ static void test_fetch4(void) } IDirect3DPixelShader9_Release(ps_3d); IDirect3DVertexShader9_Release(vs); + IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(original_rt); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.11.0

1 0

[PATCH] mshtml: Don't store NSContainer in nsWineURI.
by Jacek Caban 06 Mar '19

06 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 59 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-)

1 0

[PATCH] ntdll: Mark 'float_status' as input operand in save_fpu().
by Paul Gofman 06 Mar '19

06 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f1deb1c65c..053c87da83 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -879,7 +879,7 @@ static inline void save_fpu( CONTEXT *context ) memcpy(&float_status, &context->FloatSave, sizeof(float_status)); float_status.StatusWord &= float_status.ControlWord | 0xffffff80; - __asm__ __volatile__( "fldenv %0" : "=m" (float_status) ); + __asm__ __volatile__( "fldenv %0" : : "m" (float_status) ); #endif } -- 2.20.1

1 0

[PATCH 1/5] mfplat: Fix potential invalid memory access (Coverity).
by Nikolay Sivov 06 Mar '19

06 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 1b9ef38a4e..96dd6dec4d 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -185,6 +185,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) MFASYNC_WORKQUEUE_TYPE queue_type; struct queue_handle *entry; + *ret = NULL; + if (!system_queues[SYS_QUEUE_STANDARD].pool) return MF_E_SHUTDOWN; -- 2.20.1

2 6

[PATCH v2 6/7] winemac.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 47 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 00ad7738bb..9a9c8695f4 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -75,27 +75,40 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; - memcpy(key, video_path, sizeof(video_path)); + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; - strcat(key, display0); + strcpy(key, substring); - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } @@ -108,7 +121,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) @@ -148,7 +161,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH v2 5/7] winex11.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..e867925c26 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -154,29 +154,43 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; - - strcat(key, display0); - - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; + + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; + + strcpy(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } + static BOOL read_registry_settings(DEVMODEW *dm) { char wine_x11_reg_key[128]; @@ -186,7 +200,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) @@ -225,7 +239,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH] bcrypt: Implement BCRYPT_HASH_REUSABLE_FLAG.
by Hans Leidekker 06 Mar '19

06 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 102 ++++++++++++++++---------- dlls/bcrypt/tests/bcrypt.c | 145 +++++++++++++++++++++++++++---------- include/bcrypt.h | 3 + 3 files changed, 173 insertions(+), 77 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1b84ace8ab..b9c51a1f9f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -366,13 +366,17 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, return STATUS_SUCCESS; } +#define HASH_FLAG_HMAC 0x01 +#define HASH_FLAG_REUSABLE 0x02 struct hash { - struct object hdr; - enum alg_id alg_id; - BOOL hmac; - struct hash_impl outer; - struct hash_impl inner; + struct object hdr; + enum alg_id alg_id; + ULONG flags; + UCHAR *secret; + ULONG secret_len; + struct hash_impl outer; + struct hash_impl inner; }; #define BLOCK_LENGTH_AES 16 @@ -587,19 +591,45 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } +static NTSTATUS prepare_hash( struct hash *hash ) +{ + UCHAR buffer[MAX_HASH_BLOCK_BITS / 8] = {0}; + int block_bytes, i; + NTSTATUS status; + + /* initialize hash */ + if ((status = hash_init( &hash->inner, hash->alg_id ))) return status; + if (!(hash->flags & HASH_FLAG_HMAC)) return STATUS_SUCCESS; + + /* initialize hmac */ + if ((status = hash_init( &hash->outer, hash->alg_id ))) return status; + block_bytes = alg_props[hash->alg_id].block_bits / 8; + if (hash->secret_len > block_bytes) + { + struct hash_impl temp; + if ((status = hash_init( &temp, hash->alg_id ))) return status; + if ((status = hash_update( &temp, hash->alg_id, hash->secret, hash->secret_len ))) return status; + if ((status = hash_finish( &temp, hash->alg_id, buffer, + alg_props[hash->alg_id].hash_length ))) return status; + } + else memcpy( buffer, hash->secret, hash->secret_len ); + + for (i = 0; i < block_bytes; i++) buffer[i] ^= 0x5c; + if ((status = hash_update( &hash->outer, hash->alg_id, buffer, block_bytes ))) return status; + for (i = 0; i < block_bytes; i++) buffer[i] ^= (0x5c ^ 0x36); + return hash_update( &hash->inner, hash->alg_id, buffer, block_bytes ); +} + NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { struct algorithm *alg = algorithm; - UCHAR buffer[MAX_HASH_BLOCK_BITS / 8] = {0}; struct hash *hash; - int block_bytes; NTSTATUS status; - int i; TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen, secret, secretlen, flags ); - if (flags) + if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) { FIXME( "unimplemented flags %08x\n", flags ); return STATUS_NOT_IMPLEMENTED; @@ -608,38 +638,23 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (object) FIXME( "ignoring object buffer\n" ); - if (!(hash = heap_alloc( sizeof(*hash) ))) return STATUS_NO_MEMORY; + if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - hash->hmac = alg->hmac; - - /* initialize hash */ - if ((status = hash_init( &hash->inner, hash->alg_id ))) goto end; - if (!hash->hmac) goto end; + if (alg->hmac) hash->flags = HASH_FLAG_HMAC; + if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; - /* initialize hmac */ - if ((status = hash_init( &hash->outer, hash->alg_id ))) goto end; - block_bytes = alg_props[hash->alg_id].block_bits / 8; - if (secretlen > block_bytes) - { - struct hash_impl temp; - if ((status = hash_init( &temp, hash->alg_id ))) goto end; - if ((status = hash_update( &temp, hash->alg_id, secret, secretlen ))) goto end; - if ((status = hash_finish( &temp, hash->alg_id, buffer, - alg_props[hash->alg_id].hash_length ))) goto end; - } - else + if (secretlen && !(hash->secret = heap_alloc( secretlen ))) { - memcpy( buffer, secret, secretlen ); + heap_free( hash ); + return STATUS_NO_MEMORY; } - for (i = 0; i < block_bytes; i++) buffer[i] ^= 0x5c; - if ((status = hash_update( &hash->outer, hash->alg_id, buffer, block_bytes ))) goto end; - for (i = 0; i < block_bytes; i++) buffer[i] ^= (0x5c ^ 0x36); - status = hash_update( &hash->inner, hash->alg_id, buffer, block_bytes ); + memcpy( hash->secret, secret, secretlen ); + hash->secret_len = secretlen; -end: - if (status != STATUS_SUCCESS) + if ((status = prepare_hash( hash )) != STATUS_SUCCESS) { + heap_free( hash->secret ); heap_free( hash ); return status; } @@ -664,6 +679,12 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND return STATUS_NO_MEMORY; memcpy( hash_copy, hash_orig, sizeof(*hash_orig) ); + if (hash_orig->secret && !(hash_copy->secret = heap_alloc( hash_orig->secret_len ))) + { + heap_free( hash_copy ); + return STATUS_NO_MEMORY; + } + memcpy( hash_copy->secret, hash_orig->secret, hash_orig->secret_len ); *handle_copy = hash_copy; return STATUS_SUCCESS; @@ -677,6 +698,7 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_PARAMETER; hash->hdr.magic = 0; + heap_free( hash->secret ); heap_free( hash ); return STATUS_SUCCESS; } @@ -705,13 +727,19 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!output) return STATUS_INVALID_PARAMETER; - if (!hash->hmac) - return hash_finish( &hash->inner, hash->alg_id, output, size ); + if (!(hash->flags & HASH_FLAG_HMAC)) + { + if ((status = hash_finish( &hash->inner, hash->alg_id, output, size ))) return status; + if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + return STATUS_SUCCESS; + } hash_length = alg_props[hash->alg_id].hash_length; if ((status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_length ))) return status; if ((status = hash_update( &hash->outer, hash->alg_id, buffer, hash_length ))) return status; - return hash_finish( &hash->outer, hash->alg_id, output, size ); + if ((status = hash_finish( &hash->outer, hash->alg_id, output, size ))) return status; + if (hash->flags & HASH_FLAG_REUSABLE) return prepare_hash( hash ); + return STATUS_SUCCESS; } NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5c1a9dc834..a8bc43ce3d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -221,7 +221,9 @@ struct hash_test const char *alg; unsigned hash_size; const char *hash; + const char *hash2; const char *hmac_hash; + const char *hmac_hash2; }; static void test_hash(const struct hash_test *test) @@ -269,6 +271,35 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + hash = NULL; + len = sizeof(buf); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, BCRYPT_HASH_REUSABLE_FLAG); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hash_buf, 0, sizeof(hash_buf)); + ret = pBCryptFinishHash(hash, hash_buf, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hash_buf, test->hash_size, str ); + ok(!strcmp(str, test->hash), "got %s\n", str); + + /* reuse it */ + ret = pBCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hash_buf, 0, sizeof(hash_buf)); + ret = pBCryptFinishHash(hash, hash_buf, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hash_buf, test->hash_size, str ); + ok(!strcmp(str, test->hash2), "got %s\n", str); + + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -298,6 +329,35 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + hash = NULL; + len = sizeof(buf_hmac); + ret = pBCryptCreateHash(alg, &hash, buf_hmac, len, (UCHAR *)"key", sizeof("key"), BCRYPT_HASH_REUSABLE_FLAG); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < win8 */, "got %08x\n", ret); + if (ret == STATUS_SUCCESS) + { + ret = pBCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hmac_hash, 0, sizeof(hmac_hash)); + ret = pBCryptFinishHash(hash, hmac_hash, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hmac_hash, test->hash_size, str ); + ok(!strcmp(str, test->hmac_hash), "got %s\n", str); + + /* reuse it */ + ret = pBCryptHashData(hash, (UCHAR *)"tset", sizeof("tset"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(hmac_hash, 0, sizeof(hmac_hash)); + ret = pBCryptFinishHash(hash, hmac_hash, test->hash_size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( hmac_hash, test->hash_size, str ); + ok(!strcmp(str, test->hmac_hash2), "got %s\n", str); + + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + } + ret = pBCryptDestroyHash(hash); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); @@ -310,52 +370,57 @@ static void test_hash(const struct hash_test *test) static void test_hashes(void) { - static const struct hash_test tests[] = { - { - "SHA1", - 20, - "961fa64958818f767707072755d7018dcd278e94", - "2472cf65d0e090618d769d3e46f0d9446cf212da" + static const struct hash_test tests[] = + { + { "SHA1", 20, + "961fa64958818f767707072755d7018dcd278e94", + "9314f62ff64197143c91fc86de37e9ae776a3fb8", + "2472cf65d0e090618d769d3e46f0d9446cf212da", + "b2d2ba8cfd714d474cf0d9622cc5d15e1f53d53f", }, - { - "SHA256", - 32, - "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", - "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72" + { "SHA256", 32, + "ceb73749c899693706ede1e30c9929b3fd5dd926163831c2fb8bd41e6efb1126", + "ea0938c118a7b15954f41b85195f2b42aec3a9429c63f593cfa65c137ffaa986", + "34c1aa473a4468a91d06e7cdbc75bc4f93b830ccfc2a47ffd74e8e6ed29e4c72", + "55feb7052060bd99e33f36eb0982c7f4856eb6a84fbefe19a1afd9faafc3af6f", }, - { - "SHA384", - 48, - "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" - "63eed1e743a692d70e0504b0cfd12ef9", - "4b3e6d6ff2da121790ab7e7b9247583e3a7eed2db5bd4dabc680303b1608f37d" - "fdc836d96a704c03283bc05b4f6c5eb8" + { "SHA384", 48, + "62b21e90c9022b101671ba1f808f8631a8149f0f12904055839a35c1ca78ae53" + "63eed1e743a692d70e0504b0cfd12ef9", + "724db7c0bbc51ef1ac3fc793083fc54c0e5c423faec9b11378c01c236b19aaaf" + "a45177ad055feaf003968cc40ece44c7", + "4b3e6d6ff2da121790ab7e7b9247583e3a7eed2db5bd4dabc680303b1608f37d" + "fdc836d96a704c03283bc05b4f6c5eb8", + "03e1818e5c165a0e54619e513acb06c393e1a6cb0ddbb4036b5f29617b334642" + "e6e0be8b214d8508595b17a8c4b4e7db", }, - { - "SHA512", - 64, - "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" - "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", - "415fb6b10018ca03b38a1b1399c42ac0be5e8aceddb9a73103f5e543bf2d888f" - "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513" + { "SHA512", 64, + "d55ced17163bf5386f2cd9ff21d6fd7fe576a915065c24744d09cfae4ec84ee1" + "ef6ef11bfbc5acce3639bab725b50a1fe2c204f8c820d6d7db0df0ecbc49c5ca", + "7752d707b54d2b00e7d1c09120d189475b0fd2e31ebb988cf0a01fc8492ddc0b" + "3ca9c9ca61d9d7d1fb65ca7665e87f043c1d5bc9f786f8345e951c2d91ac594f", + "415fb6b10018ca03b38a1b1399c42ac0be5e8aceddb9a73103f5e543bf2d888f" + "2eecf91373941f9315dd730a77937fa92444450fbece86f409d9cb5ec48c6513", + "1487bcecba46ae677622fa499e4cb2f0fdf92f6f3427cba76382d537a06e49c3" + "3e70a2fc1fc730092bf21128c3704cc6387f6dfbf7e2f9f315bbb894505a1205", }, - { - "MD2", - 16, - "1bb33606ba908912a84221109d29cd7e", - "7f05b0638d77f4a27f3a9c4d353cd648" + { "MD2", 16, + "1bb33606ba908912a84221109d29cd7e", + "b9a6ad9323b17e2d0cd389dddd6ef78a", + "7f05b0638d77f4a27f3a9c4d353cd648", + "05980873e6bfdd05dd7b30078de7e42a", }, - { - "MD4", - 16, - "74b5db93c0b41e36ca7074338fc0b637", - "bc2e8ac4d8248ed21b8d26227a30ea3a" + { "MD4", 16, + "74b5db93c0b41e36ca7074338fc0b637", + "a14a9ff2059a8c28f47b01e6bc48a1bf", + "bc2e8ac4d8248ed21b8d26227a30ea3a", + "b609db0eb4b8669db74f2c20099701e4", }, - { - "MD5", - 16, - "e2a3e68d23ce348b8f68b3079de3d4c9", - "7bda029b93fa8d817fcc9e13d6bdf092" + { "MD5", 16, + "e2a3e68d23ce348b8f68b3079de3d4c9", + "bcdd7ca574342aa9db0e212348eacb16", + "7bda029b93fa8d817fcc9e13d6bdf092", + "dd636ab8e9592c5088e57c37d44c5bb3", } }; unsigned i; diff --git a/include/bcrypt.h b/include/bcrypt.h index ba78c1d9d0..a0b0d52495 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -222,6 +222,9 @@ typedef PVOID BCRYPT_HASH_HANDLE; /* Flags for BCryptEncrypt/BCryptDecrypt */ #define BCRYPT_BLOCK_PADDING 0x00000001 +/* Flags for BCryptCreateHash */ +#define BCRYPT_HASH_REUSABLE_FLAG 0x00000020 + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); -- 2.20.1

1 0

[PATCH] advapi32: Add a stub implementation of SaferIdentifyLevel.
by Hans Leidekker 06 Mar '19

06 Mar '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 11 +++++++++++ include/winsafer.h | 30 ++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d3e2..eb1f546335 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -717,7 +717,7 @@ @ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) -# @ stub SaferIdentifyLevel +@ stdcall SaferIdentifyLevel(long ptr ptr ptr) # @ stub SaferRecordEventLogEntry @ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da40e7..6891feea2a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6184,6 +6184,17 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class return FALSE; } +/****************************************************************************** + * SaferIdentifyLevel [ADVAPI32.@] + */ +BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, SAFER_LEVEL_HANDLE *handle, + void *reserved) +{ + FIXME("(%u %p %p %p) stub\n", count, properties, handle, reserved); + *handle = (SAFER_LEVEL_HANDLE)0xdeadbeef; + return TRUE; +} + /****************************************************************************** * SaferSetLevelInformation [ADVAPI32.@] */ diff --git a/include/winsafer.h b/include/winsafer.h index 4855f53bda..25654846d9 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,32 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_MAX_HASH_SIZE 64 + +#include <pshpack8.h> +typedef struct _SAFER_CODE_PROPERTIES_V2 { + DWORD cbSize; + DWORD dwCheckFlags; + LPCWSTR ImagePath; + HANDLE hImageFileHandle; + DWORD UrlZoneId; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + DWORD dwImageHashSize; + LARGE_INTEGER ImageSize; + ALG_ID HashAlgorithm; + LPBYTE pByteBlock; + HWND hWndParent; + DWORD dwWVTUIChoice; + LPCWSTR PackageMoniker; + LPCWSTR PackagePublisher; + LPCWSTR PackageName; + ULONG64 PackageVersion; + BOOL PackageIsFramework; +} SAFER_CODE_PROPERTIES_V2, *PSAFER_CODE_PROPERTIES_V2; + +typedef SAFER_CODE_PROPERTIES_V2 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#include <poppack.h> + #define SAFER_SCOPEID_MACHINE 1 #define SAFER_SCOPEID_USER 2 @@ -41,8 +67,6 @@ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); #define SAFER_LEVEL_OPEN 1 -WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); - typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyLevelList = 1, SaferPolicyEnableTransparentEnforcement, @@ -70,7 +94,9 @@ typedef enum _SAFER_OBJECT_INFO_CLASS { SaferObjectExtendedError } SAFER_OBJECT_INFO_CLASS; +WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferIdentifyLevel(DWORD,PSAFER_CODE_PROPERTIES,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus -- 2.20.1

1 0

[PATCH] bthprops.cpl: add BluetoothFindDeviceClose stub
by Louis Lenders 06 Mar '19

06 Mar '19

Wine bug: https://bugs.winehq.org/show_bug.cgi?id=46706 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index ed80b0e265..626b3857c5 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -11,7 +11,7 @@ @ stub BluetoothEnumerateInstalledServicesEx @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId @ stdcall BluetoothFindFirstDevice(ptr ptr) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index d670f2e358..67eab76d07 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -60,3 +60,13 @@ BOOL WINAPI BluetoothFindRadioClose(HBLUETOOTH_RADIO_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindDeviceClose + */ +BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) +{ + FIXME("(%p): stub!\n", find); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.20.1

1 0

[PATCH v2 7/7] explorer: Remove setting primary adapter key via Atoms.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

The Atom mechanism is no longer used to store primary adapter key. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 23 +---------------------- programs/explorer/desktop.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..bb958b5225 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -98,33 +98,12 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; - switch (message) { case WM_NCCREATE: { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); - } return TRUE; } case WM_NCCALCSIZE: diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 97fc7a219d..df5fb7f6aa 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -773,7 +773,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver ) { static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -796,6 +796,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; + GUID guid; WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; @@ -851,9 +852,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) return module; } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + /* Create a GUID for primary adapter */ + UuidCreate( &guid ); + TRACE( "primary adapter guid %s\n", debugstr_guid(&guid) ); + sprintfW( key, device_keyW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); strcpyW( buffer, device_video_prefixW ); strcatW( buffer, key); @@ -877,7 +881,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (module) { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + TRACE( "display %s driver %s\n", debugstr_guid(&guid), debugstr_w(buffer) ); RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); } @@ -946,7 +950,6 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -998,13 +1001,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + graphics_driver = load_graphics_driver( driver ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, 0 ); if (hwnd) { -- 2.20.1

1 0

[PATCH v2 4/7] wintab32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wintab32/wintab32.c | 60 +++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index fe535fa1af..d9325899be 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -72,30 +72,58 @@ static VOID TABLET_Unregister(void) UnregisterClassW(WC_TABLETCLASSNAME, NULL); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key ))) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

1 0

[PATCH v2 3/7] user32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 63 +++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..548fe362af 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -41,37 +41,68 @@ static char driver_load_error[80]; static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key( WCHAR *key, int len ) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW( HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size )) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW( value_prefixW ); + if (strncmpiW( buffer, value_prefixW, length )) + goto fail; + + substring = buffer + length; + length = strlenW( substring ); + if (len < length + 1) + goto fail; + + strcpyW( key, substring ); + + ret = TRUE; + TRACE( "primary adapter key %s\n", wine_dbgstr_w(key) ); +fail: + if (!ret) + ERR( "Failed to get primary adapter registry key\n" ); + return ret; +} + static HMODULE load_desktop_driver( HWND hwnd ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + WCHAR key[MAX_PATH]; + BOOL result; + result = get_primary_adapter_key( key, ARRAY_SIZE(key) ); USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - if (!guid_atom) + if (!result) { SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + get_primary_adapter_key( key, ARRAY_SIZE(key) ); } - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) -- 2.20.1

1 0

[PATCH v2 2/7] imm32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/imm32/imm.c | 60 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f355..cca0744de5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -289,30 +289,58 @@ static void IMM_FreeThreadData(void) LeaveCriticalSection(&threaddata_cs); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key) )) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

1 0

[PATCH 7/7] explorer: Remove setting primary adapter key via Atoms.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

The Atom mechanism is no longer used to store primary adapter key. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 23 +---------------------- programs/explorer/desktop.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..bb958b5225 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -98,33 +98,12 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; - switch (message) { case WM_NCCREATE: { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); - } return TRUE; } case WM_NCCALCSIZE: diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 97fc7a219d..df5fb7f6aa 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -773,7 +773,7 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver ) { static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -796,6 +796,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; + GUID guid; WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; @@ -851,9 +852,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) return module; } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + /* Create a GUID for primary adapter */ + UuidCreate( &guid ); + TRACE( "primary adapter guid %s\n", debugstr_guid(&guid) ); + sprintfW( key, device_keyW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); strcpyW( buffer, device_video_prefixW ); strcatW( buffer, key); @@ -877,7 +881,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (module) { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + TRACE( "display %s driver %s\n", debugstr_guid(&guid), debugstr_w(buffer) ); RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); } @@ -946,7 +950,6 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -998,13 +1001,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + graphics_driver = load_graphics_driver( driver ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, 0 ); if (hwnd) { -- 2.20.1

2 1

[PATCH 6/7] winemac.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 47 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 00ad7738bb..9a9c8695f4 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -75,27 +75,40 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; - memcpy(key, video_path, sizeof(video_path)); + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; - strcat(key, display0); + strcpy(key, substring); - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } @@ -108,7 +121,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) @@ -148,7 +161,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + if (!get_primary_adapter_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH 5/7] winex11.drv: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 58 +++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..e867925c26 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -154,29 +154,43 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(char *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; - - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) - return FALSE; - - strcat(key, display0); - - TRACE("display device key %s\n", wine_dbgstr_a(key)); - return TRUE; + static const CHAR value_prefix[] = "\\Registry\\Machine\\"; + CHAR buffer[MAX_PATH]; + CHAR *substring; + DWORD size; + size_t length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", "\\Device\\Video0", + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlen(value_prefix); + if (strncasecmp(buffer, value_prefix, length)) + goto fail; + + substring = buffer + length; + length = strlen(substring); + if (len < length + 1) + goto fail; + + strcpy(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_a(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; } + static BOOL read_registry_settings(DEVMODEW *dm) { char wine_x11_reg_key[128]; @@ -186,7 +200,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields = 0; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) @@ -225,7 +239,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + if (!get_primary_adapter_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, -- 2.20.1

2 1

[PATCH 4/7] wintab32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wintab32/wintab32.c | 60 +++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index fe535fa1af..d9325899be 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -72,30 +72,58 @@ static VOID TABLET_Unregister(void) UnregisterClassW(WC_TABLETCLASSNAME, NULL); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key ))) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

2 1

[PATCH 1/3] iccvid: Fix calculation of stride and size
by Vijay Kiran Kamuju 06 Mar '19

06 Mar '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/iccvid/iccvid.c | 10 ++++++--- dlls/msvfw32/tests/msvfw.c | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 78c53b336bc..67967a0fb38 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -169,6 +169,10 @@ int x, y; } } +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} /* ------------------------------------------------------------------------ */ static void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, @@ -450,7 +454,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, break; } - frm_stride = out_width * bpp; + frm_stride = get_stride(out_width, bpp * 8); frm_ptr = output; if(frame.length != size) @@ -835,9 +839,9 @@ static LRESULT ICCVID_DecompressGetFormat( ICCVID_Info *info, LPBITMAPINFO in, L if( out ) { memcpy( out, in, size ); + out->bmiHeader.biBitCount = 24; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = get_stride(in->bmiHeader.biWidth, 24) * in->bmiHeader.biHeight; return ICERR_OK; } return size; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 7555015ef15..1791fcf77e6 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -25,6 +25,11 @@ #include "wine/test.h" +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void test_OpenCase(void) { HIC h; @@ -88,6 +93,7 @@ static void test_Locate(void) { static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8, 0,100000,100000, 0,0}; static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB, 0,100000,100000, 0,0}; + BITMAPINFOHEADER tmp = {sizeof(BITMAPINFOHEADER)}; HIC h; DWORD err; @@ -123,6 +129,45 @@ static void test_Locate(void) ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); bo.biHeight = -bo.biHeight; + bi.biWidth = 17; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + get_stride(17, 24) * 8, tmp.biSizeImage); + + bi.biWidth = 32; + ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bo.biBitCount = bi.biBitCount = 8; -- 2.17.0

1 2

[PATCH 3/7] user32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 63 +++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..548fe362af 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -41,37 +41,68 @@ static char driver_load_error[80]; static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key( WCHAR *key, int len ) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW( HKEY_LOCAL_MACHINE, video_keyW, device_video0W, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, + &size )) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW( value_prefixW ); + if (strncmpiW( buffer, value_prefixW, length )) + goto fail; + + substring = buffer + length; + length = strlenW( substring ); + if (len < length + 1) + goto fail; + + strcpyW( key, substring ); + + ret = TRUE; + TRACE( "primary adapter key %s\n", wine_dbgstr_w(key) ); +fail: + if (!ret) + ERR( "Failed to get primary adapter registry key\n" ); + return ret; +} + static HMODULE load_desktop_driver( HWND hwnd ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; - UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + WCHAR key[MAX_PATH]; + BOOL result; + result = get_primary_adapter_key( key, ARRAY_SIZE(key) ); USER_CheckNotLock(); strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ - if (!guid_atom) + if (!result) { SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ - guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + get_primary_adapter_key( key, ARRAY_SIZE(key) ); } - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) -- 2.20.1

2 1

[PATCH v2 2/3] user32: Check device name in EnumDisplayDevicesW().
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 28 ++++++++++++++++++++++++++++ dlls/user32/tests/monitor.c | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a45e1c882..256a26c71b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -276,12 +276,40 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD return TRUE; } +static BOOL is_display_device(LPCWSTR name) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW(name, display_deviceW, ARRAY_SIZE(display_deviceW))) + return FALSE; + + p += ARRAY_SIZE(display_deviceW); + + if (!isdigitW(*p++)) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW(*p)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { + if (lpDevice && !is_display_device(lpDevice)) + { + WARN("Wrong adapter name: %s\n", wine_dbgstr_w(lpDevice)); + return FALSE; + } + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8bf284a5e1..733220a426 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

2 1

[PATCH 2/7] imm32: Use registry to query primary adapter key.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/imm32/imm.c | 60 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 28eb00f355..cca0744de5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -289,30 +289,58 @@ static void IMM_FreeThreadData(void) LeaveCriticalSection(&threaddata_cs); } +/* Get the primary adapter key in the form of System\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ +static BOOL get_primary_adapter_key(WCHAR *key, int len) +{ + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR value_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + WCHAR buffer[MAX_PATH]; + WCHAR *substring; + DWORD size; + int length; + BOOL ret = FALSE; + + /* Vaule data of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, device_video0W, + RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, buffer, &size)) + goto fail; + + /* Need to strip "\Registry\Machine\" from the value data, which starts with "\Registry\Machine\System\..." */ + length = strlenW(value_prefixW); + if (strncmpiW(buffer, value_prefixW, length)) + goto fail; + + substring = buffer + length; + length = strlenW(substring); + if (len < length + 1) + goto fail; + + strcpyW(key, substring); + + ret = TRUE; + TRACE("primary adapter key %s\n", wine_dbgstr_w(key)); +fail: + if (!ret) + ERR("Failed to get primary adapter registry key\n"); + return ret; +} + static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + WCHAR key[MAX_PATH]; - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!get_primary_adapter_key( key, ARRAY_SIZE(key) )) return 0; if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); -- 2.20.1

1 0

[PATCH 1/7] explorer: Create primary adapter key if user driver didn't create it.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

This primary adapter key aims to replace the Atom mechanism currently used to store what registry key the primary adapter is using. This way we can let user drivers create the GUIDs for adapters if it's supported without treating primary adapter differently. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/desktop.c | 64 ++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24901..97fc7a219d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -775,6 +775,13 @@ static BOOL get_default_enable_shell( const WCHAR *name ) static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR device_video_prefixW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -793,6 +800,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; + DWORD disposition = 0; char error[80]; if (!driver) @@ -832,25 +840,51 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) + /* Create HKLM\HARDWARE\DEVICEMAP\VIDEO key if user drivers didn't do it */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, + &disposition )) { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + /* User driver did create it. Nothing to do */ + if (disposition != REG_CREATED_NEW_KEY) + { + RegCloseKey( hkey ); + return module; + } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + + strcpyW( buffer, device_video_prefixW ); + strcatW( buffer, key); + + TRACE( "primary adapter key %s\n", wine_dbgstr_w(buffer) ); + /* Set \Device\Video0 value data in HKLM\HARDWARE\DEVICEMAP\VIDEO key */ + if (RegSetValueExW( hkey, device_video0W, 0, REG_SZ, + (const BYTE *)(buffer), (strlenW( buffer ) + 1) * sizeof(WCHAR)) ) + { + ERR("Failed to set primary video value, display related functions may not function properly\n"); + RegCloseKey( hkey ); + return module; + } - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, - REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) - { - if (module) - RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); - else - RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); + + /* Create primary adapter key SYSTEM\CurrentControlSet\Control\Video\{Primary adapter GUID}\0000 */ + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, + REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) + { + if (module) + { + GetModuleFileNameW( module, buffer, MAX_PATH ); + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); + RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, + (BYTE *)buffer, (strlenW( buffer ) + 1) * sizeof(WCHAR) ); + } + else + RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen( error ) + 1 ); + RegCloseKey( hkey ); + } } return module; -- 2.20.1

1 0

[PATCH v2 3/3] user32: Improve EnumDisplayDevices stub.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SUBSYS_ should have 8 digits following. Supersede 158956~158958 dlls/user32/driver.c | 44 +++++++++++++++++++++++++++---------- dlls/user32/tests/monitor.c | 10 ++++----- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 483d5552bf..355248d3cc 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -361,25 +361,47 @@ static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISP static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; + static const WCHAR primary_monitor_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; + static const WCHAR nonpnp_monitor_string[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ', + 'M','o','n','i','t','o','r',0}; FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } + else + { + if (strcmpiW(lpDevice, primary_device_name)) + return FALSE; - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + memcpy(lpDisplayDevice->DeviceName, primary_monitor_name, sizeof (primary_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, nonpnp_monitor_string, sizeof(nonpnp_monitor_string)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + lpDisplayDevice->DeviceID[0] = 0; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } return TRUE; } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 733220a426..33c7e24128 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ -- 2.20.1

1 0

[PATCH v2 1/3] user32: Move EnumDisplayDevicesW stub to nulldrv.
by Zhiyi Zhang 06 Mar '19

06 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 26 +------------------------- dlls/user32/user_private.h | 1 + 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..483d5552bf 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -125,6 +125,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ClipCursor); GET_USER_FUNC(UpdateClipboard); GET_USER_FUNC(ChangeDisplaySettingsEx); + GET_USER_FUNC(EnumDisplayDevicesW); GET_USER_FUNC(EnumDisplayMonitors); GET_USER_FUNC(EnumDisplaySettingsEx); GET_USER_FUNC(GetMonitorInfo); @@ -354,6 +355,35 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } +static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', + 'S','y','s','t','e','m',0}; + static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; + + FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + if (i) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | + DISPLAY_DEVICE_PRIMARY_DEVICE | + DISPLAY_DEVICE_VGA_COMPATIBLE; + + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + + return TRUE; +} + static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { RECT r = {0, 0, 640, 480}; @@ -549,6 +579,7 @@ static USER_DRIVER null_driver = nulldrv_UpdateClipboard, /* display modes */ nulldrv_ChangeDisplaySettingsEx, + nulldrv_EnumDisplayDevicesW, nulldrv_EnumDisplayMonitors, nulldrv_EnumDisplaySettingsEx, nulldrv_GetMonitorInfo, @@ -691,6 +722,11 @@ static LONG CDECL loaderdrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mo return load_driver()->pChangeDisplaySettingsEx( name, mode, hwnd, flags, lparam ); } +static BOOL CDECL loaderdrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + return load_driver()->pEnumDisplayDevicesW( lpDevice, i, lpDisplayDevice, dwFlags ); +} + static BOOL CDECL loaderdrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return load_driver()->pEnumDisplayMonitors( hdc, rect, proc, lp ); @@ -770,6 +806,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, + loaderdrv_EnumDisplayDevicesW, loaderdrv_EnumDisplayMonitors, loaderdrv_EnumDisplaySettingsEx, loaderdrv_GetMonitorInfo, diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd05..1a45e1c882 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -243,12 +243,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -288,25 +282,7 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); - - if (i) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..51b60a4b5c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -86,6 +86,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUpdateClipboard)(void); /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); + BOOL (CDECL *pEnumDisplayDevicesW)(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD); BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (CDECL *pGetMonitorInfo)(HMONITOR,MONITORINFO*); -- 2.20.1

1 0

[PATCH 1/6] quartz/tests: Add some tests for AVI decompressor filter interfaces.
by Zebediah Figura 06 Mar '19

06 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/avidec.c | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 dlls/quartz/tests/avidec.c diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 34a111462f..569bbcb8b7 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = quartz.dll IMPORTS = oleaut32 ole32 advapi32 user32 C_SRCS = \ + avidec.c \ avisplit.c \ dsoundrender.c \ filesource.c \ diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c new file mode 100644 index 0000000000..f008fe10ea --- /dev/null +++ b/dlls/quartz/tests/avidec.c @@ -0,0 +1,81 @@ +/* + * AVI decompressor filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static IBaseFilter *create_avi_dec(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AVIDec, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_avi_dec(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + todo_wine check_interface(filter, &IID_IMediaPosition, FALSE); + todo_wine check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + todo_wine check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +START_TEST(avidec) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +} -- 2.20.1

1 5

[PATCH 1/2] bcrypt/tests: Test return on invalid flag passed to BCryptCreateHash.
by Brendan McGrath 05 Mar '19

05 Mar '19

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5c1a9dc8340..92b5a30e9fd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -247,6 +247,12 @@ static void test_hash(const struct hash_test *test) hash = NULL; len = sizeof(buf); + + /* test return on invalid flag */ + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 1); + todo_wine + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); -- 2.17.1

2 10

Discrepancies between Wine and Windows 10 NLS values for English (US)
by Isira Seneviratne 05 Mar '19

05 Mar '19

Hi, I queried several NLS values for English (US) on both Windows 10 and Wine using the attached code, and I found that some of these values did not match each other. These are the values that did not match Wine's on Windows 10: LOCALE_FONTSIGNATURE: lsUsb: 3 0 0 80000000 lsCsbSupported: 19f dfd70000 LOCALE_IDEFAULTUNIXCODEPAGE: 10000 Should the Wine NLS file be updated? And if so, how should the LOCALE_FONTSIGNATURE string be formatted? Isira

1 0

[PATCH 1/2] kernel32: Use Latin-3 codepage for Esperanto
by Alex Henrie 05 Mar '19

05 Mar '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Esperanto's circumflex characters are not representable in Latin-1. --- dlls/kernel32/nls/eox.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 0dc82fe3a7..d6713730e2 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -49,7 +49,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IDEFAULTANSICODEPAGE "0" LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "" - LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTEBCDICCODEPAGE "28593" LOCALE_IDEFAULTLANGUAGE "048f" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDEFAULTUNIXCODEPAGE "65001" -- 2.21.0

3 6

[PATCH 8/8] d3dx9: Merge the d3dx_effect_GetTechnique() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 126916d022..6a0b262b7a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1157,19 +1157,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) -{ - if (index >= base->technique_count) - { - WARN("Invalid argument specified.\n"); - return NULL; - } - - TRACE("Returning technique %p.\n", &base->techniques[index]); - - return get_technique_handle(&base->techniques[index]); -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3356,7 +3343,15 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index TRACE("iface %p, index %u.\n", iface, index); - return d3dx9_base_effect_get_technique(&effect->base_effect, index); + if (index >= effect->base_effect.technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]); + + return get_technique_handle(&effect->base_effect.techniques[index]); } static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) -- 2.20.1

2 1

[PATCH 7/8] d3dx9: Merge the d3dx_effect_GetTechniqueByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 473bb930df..126916d022 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1170,22 +1170,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base return get_technique_handle(&base->techniques[index]); } -static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effect *base, const char *name) -{ - struct d3dx_technique *tech = get_technique_by_name(base, name); - - if (tech) - { - D3DXHANDLE t = get_technique_handle(tech); - TRACE("Returning technique %p\n", t); - return t; - } - - WARN("Technique not found.\n"); - - return NULL; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3378,10 +3362,20 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_technique_by_name(&effect->base_effect, name); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); + if (tech) + { + D3DXHANDLE t = get_technique_handle(tech); + TRACE("Returning technique %p\n", t); + return t; + } + + WARN("Technique not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) -- 2.20.1

2 1

[PATCH 6/8] d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- The "struct d3dx_technique *tech = technique ? ..." line will fall under 120 chars after the cleanup is finished. So no reason to split it up now. dlls/d3dx9_36/effect.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eaaae0456e..473bb930df 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1014,24 +1014,6 @@ static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *ba return D3D_OK; } -static HRESULT d3dx9_base_effect_get_technique_desc(struct d3dx9_base_effect *base, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) -{ - struct d3dx_technique *tech = technique ? get_valid_technique(base, technique) : &base->techniques[0]; - - if (!desc || !tech) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = tech->name; - desc->Passes = tech->pass_count; - desc->Annotations = tech->annotation_count; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -3208,10 +3190,21 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); - return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) -- 2.20.1

2 1

[PATCH 5/8] d3dx9: Merge the d3dx_effect_GetPassByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 47 ++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c9aeb87a4b..eaaae0456e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,32 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE technique, const char *name) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && name) - { - unsigned int i; - - for (i = 0; i < tech->pass_count; ++i) - { - struct d3dx_pass *pass = &tech->passes[i]; - - if (!strcmp(pass->name, name)) - { - TRACE("Returning pass %p\n", pass); - return get_pass_handle(pass); - } - } - } - - WARN("Pass not found.\n"); - - return NULL; -} - static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -3438,10 +3412,29 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); - return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); + if (tech && name) + { + unsigned int i; + + for (i = 0; i < tech->pass_count; ++i) + { + struct d3dx_pass *pass = &tech->passes[i]; + + if (!strcmp(pass->name, name)) + { + TRACE("Returning pass %p\n", pass); + return get_pass_handle(pass); + } + } + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index) -- 2.20.1

2 1

[PATCH 4/8] d3dx9: Merge the d3dx_effect_GetPass() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c621b21562..c9aeb87a4b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base, - D3DXHANDLE technique, UINT index) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && index < tech->pass_count) - { - TRACE("Returning pass %p\n", &tech->passes[index]); - return get_pass_handle(&tech->passes[index]); - } - - WARN("Pass not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, D3DXHANDLE technique, const char *name) { @@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); - return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); + if (tech && index < tech->pass_count) + { + TRACE("Returning pass %p\n", &tech->passes[index]); + return get_pass_handle(&tech->passes[index]); + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) -- 2.20.1

2 1

[PATCH 3/8] d3dx9: Pass a struct d3dx_effect to get_annotation_from_object()
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e7b8b86eb3..c621b21562 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static UINT get_annotation_from_object(struct d3dx9_base_effect *base, - D3DXHANDLE object, struct d3dx_parameter **annotations) +static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, + struct d3dx_parameter **annotations) { + struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(base, object); @@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, object %p, index %u.\n", iface, object, index); - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); if (index < annotation_count) { @@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D return NULL; } - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); if (annotation) -- 2.20.1

2 1

[PATCH 2/8] d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea3563128f..e7b8b86eb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,33 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE object, const char *name) -{ - struct d3dx_parameter *annotation = NULL; - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - if (!name) - { - WARN("Invalid argument specified\n"); - return NULL; - } - - annotation_count = get_annotation_from_object(base, object, &annotations); - - annotation = get_annotation_by_name(base, annotation_count, annotations, name); - if (annotation) - { - TRACE("Returning parameter %p\n", annotation); - return get_parameter_handle(annotation); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, void *data) { @@ -3516,10 +3489,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotation = NULL; + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); - return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); + if (!name) + { + WARN("Invalid argument specified\n"); + return NULL; + } + + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + if (annotation) + { + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); + } + + WARN("Annotation not found.\n"); + + return NULL; } static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/8] d3dx9: Merge the d3dx_effect_GetAnnotation() helper
by Michael Stefaniuc 05 Mar '19

05 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dda460d17c..ea3563128f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,25 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation(struct d3dx9_base_effect *base, - D3DXHANDLE object, UINT index) -{ - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - annotation_count = get_annotation_from_object(base, object, &annotations); - - if (index < annotation_count) - { - TRACE("Returning parameter %p\n", &annotations[index]); - return get_parameter_handle(&annotations[index]); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, D3DXHANDLE object, const char *name) { @@ -3513,10 +3494,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, index %u.\n", iface, object, index); - return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + if (index < annotation_count) + { + TRACE("Returning parameter %p\n", &annotations[index]); + return get_parameter_handle(&annotations[index]); + } + + WARN("Annotation not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, -- 2.20.1

2 1

[PATCH] kernel32: Show that PAGE_WRITECOPY permission changes only on modified pages.
by Piotr Caban 05 Mar '19

05 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)

2 1

[PATCH v2 1/7] quartz/waveparser: Fix source pin name.
by Zebediah Figura 05 Mar '19

05 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/waveparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 609f192820..2ea3dc0427 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; +static const WCHAR outputW[] = {'o','u','t','p','u','t',0}; typedef struct WAVEParserImpl { @@ -256,7 +256,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; - lstrcpynW(piOutput.achName, wcsOutputPinName, ARRAY_SIZE(piOutput.achName)); + lstrcpynW(piOutput.achName, outputW, ARRAY_SIZE(piOutput.achName)); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list); -- 2.20.1

2 8

[PATCH 1/5] mf: Add a stub for default presentation clock.
by Nikolay Sivov 05 Mar '19

05 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 381 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 63 ++++++++ include/mferror.h | 2 + include/mfidl.idl | 58 ++++++- 5 files changed, 504 insertions(+), 2 deletions(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 7ec8e57c1f..2d02ef8fec 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -45,7 +45,7 @@ @ stub MFCreatePMPHost @ stub MFCreatePMPMediaSession @ stub MFCreatePMPServer -@ stub MFCreatePresentationClock +@ stdcall MFCreatePresentationClock(ptr) @ stub MFCreatePresentationDescriptorFromASFProfile @ stub MFCreateProxyLocator @ stub MFCreateRemoteDesktopPlugin diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b576a0f184..2961abe879 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "mfidl.h" #include "mfapi.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" @@ -38,11 +39,43 @@ struct media_session IMFMediaEventQueue *event_queue; }; +struct presentation_clock +{ + IMFPresentationClock IMFPresentationClock_iface; + IMFRateControl IMFRateControl_iface; + IMFTimer IMFTimer_iface; + IMFShutdown IMFShutdown_iface; + LONG refcount; + IMFPresentationTimeSource *time_source; + MFCLOCK_STATE state; + CRITICAL_SECTION cs; +}; + static inline struct media_session *impl_from_IMFMediaSession(IMFMediaSession *iface) { return CONTAINING_RECORD(iface, struct media_session, IMFMediaSession_iface); } +static struct presentation_clock *impl_from_IMFPresentationClock(IMFPresentationClock *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFPresentationClock_iface); +} + +static struct presentation_clock *impl_from_IMFRateControl(IMFRateControl *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFRateControl_iface); +} + +static struct presentation_clock *impl_from_IMFTimer(IMFTimer *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFTimer_iface); +} + +static struct presentation_clock *impl_from_IMFShutdown(IMFShutdown *iface) +{ + return CONTAINING_RECORD(iface, struct presentation_clock, IMFShutdown_iface); +} + static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) { struct media_session *session = impl_from_IMFMediaSession(iface); @@ -251,3 +284,351 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses return S_OK; } + +static HRESULT WINAPI present_clock_QueryInterface(IMFPresentationClock *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFPresentationClock) || + IsEqualIID(riid, &IID_IMFClock) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &clock->IMFPresentationClock_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *out = &clock->IMFRateControl_iface; + } + else if (IsEqualIID(riid, &IID_IMFTimer)) + { + *out = &clock->IMFTimer_iface; + } + else if (IsEqualIID(riid, &IID_IMFShutdown)) + { + *out = &clock->IMFShutdown_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI present_clock_AddRef(IMFPresentationClock *iface) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + ULONG refcount = InterlockedIncrement(&clock->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + ULONG refcount = InterlockedDecrement(&clock->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (clock->time_source) + IMFPresentationTimeSource_Release(clock->time_source); + DeleteCriticalSection(&clock->cs); + heap_free(clock); + } + + return refcount; +} + +static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetCorrelatedTime(IMFPresentationClock *iface, DWORD reserved, + LONGLONG *clock_time, MFTIME *system_time) +{ + FIXME("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetContinuityKey(IMFPresentationClock *iface, DWORD *key) +{ + TRACE("%p, %p.\n", iface, key); + + *key = 0; + + return S_OK; +} + +static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD reserved, MFCLOCK_STATE *state) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + + TRACE("%p, %#x, %p.\n", iface, reserved, state); + + EnterCriticalSection(&clock->cs); + *state = clock->state; + LeaveCriticalSection(&clock->cs); + + return S_OK; +} + +static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, MFCLOCK_PROPERTIES *props) +{ + FIXME("%p, %p.\n", iface, props); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_SetTimeSource(IMFPresentationClock *iface, + IMFPresentationTimeSource *time_source) +{ + FIXME("%p, %p.\n", iface, time_source); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, + IMFPresentationTimeSource **time_source) +{ + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, time_source); + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + { + *time_source = clock->time_source; + IMFPresentationTimeSource_AddRef(*time_source); + } + else + hr = MF_E_CLOCK_NO_TIME_SOURCE; + LeaveCriticalSection(&clock->cs); + + return hr; +} + +static HRESULT WINAPI present_clock_GetTime(IMFPresentationClock *iface, MFTIME *time) +{ + FIXME("%p, %p.\n", iface, time); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *iface, IMFClockStateSink *state_sink) +{ + FIXME("%p, %p.\n", iface, state_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *iface, + IMFClockStateSink *state_sink) +{ + FIXME("%p, %p.\n", iface, state_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG start_offset) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_Pause(IMFPresentationClock *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFPresentationClockVtbl presentationclockvtbl = +{ + present_clock_QueryInterface, + present_clock_AddRef, + present_clock_Release, + present_clock_GetClockCharacteristics, + present_clock_GetCorrelatedTime, + present_clock_GetContinuityKey, + present_clock_GetState, + present_clock_GetProperties, + present_clock_SetTimeSource, + present_clock_GetTimeSource, + present_clock_GetTime, + present_clock_AddClockStateSink, + present_clock_RemoveClockStateSink, + present_clock_Start, + present_clock_Stop, + present_clock_Pause, +}; + +static HRESULT WINAPI present_clock_rate_control_QueryInterface(IMFRateControl *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_rate_control_AddRef(IMFRateControl *iface) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_rate_control_Release(IMFRateControl *iface) +{ + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_rate_SetRate(IMFRateControl *iface, BOOL thin, float rate) +{ + FIXME("%p, %d, %f.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_rate_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) +{ + FIXME("%p, %p, %p.\n", iface, thin, rate); + + return E_NOTIMPL; +} + +static const IMFRateControlVtbl presentclockratecontrolvtbl = +{ + present_clock_rate_control_QueryInterface, + present_clock_rate_control_AddRef, + present_clock_rate_control_Release, + present_clock_rate_SetRate, + present_clock_rate_GetRate, +}; + +static HRESULT WINAPI present_clock_timer_QueryInterface(IMFTimer *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_timer_AddRef(IMFTimer *iface) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_timer_Release(IMFTimer *iface) +{ + struct presentation_clock *clock = impl_from_IMFTimer(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, LONGLONG time, + IMFAsyncCallback *callback, IUnknown *state, IUnknown **cancel_key) +{ + FIXME("%p, %#x, %s, %p, %p, %p.\n", iface, flags, wine_dbgstr_longlong(time), callback, state, cancel_key); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_timer_CancelTimer(IMFTimer *iface, IUnknown *cancel_key) +{ + FIXME("%p, %p.\n", iface, cancel_key); + + return E_NOTIMPL; +} + +static const IMFTimerVtbl presentclocktimervtbl = +{ + present_clock_timer_QueryInterface, + present_clock_timer_AddRef, + present_clock_timer_Release, + present_clock_timer_SetTimer, + present_clock_timer_CancelTimer, +}; + +static HRESULT WINAPI present_clock_shutdown_QueryInterface(IMFShutdown *iface, REFIID riid, void **out) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_QueryInterface(&clock->IMFPresentationClock_iface, riid, out); +} + +static ULONG WINAPI present_clock_shutdown_AddRef(IMFShutdown *iface) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_AddRef(&clock->IMFPresentationClock_iface); +} + +static ULONG WINAPI present_clock_shutdown_Release(IMFShutdown *iface) +{ + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + return IMFPresentationClock_Release(&clock->IMFPresentationClock_iface); +} + +static HRESULT WINAPI present_clock_shutdown_Shutdown(IMFShutdown *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI present_clock_shutdown_GetShutdownStatus(IMFShutdown *iface, MFSHUTDOWN_STATUS *status) +{ + FIXME("%p, %p.\n", iface, status); + + return E_NOTIMPL; +} + +static const IMFShutdownVtbl presentclockshutdownvtbl = +{ + present_clock_shutdown_QueryInterface, + present_clock_shutdown_AddRef, + present_clock_shutdown_Release, + present_clock_shutdown_Shutdown, + present_clock_shutdown_GetShutdownStatus, +}; + +/*********************************************************************** + * MFCreatePresentationClock (mf.@) + */ +HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) +{ + struct presentation_clock *object; + + TRACE("%p.\n", clock); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFPresentationClock_iface.lpVtbl = &presentationclockvtbl; + object->IMFRateControl_iface.lpVtbl = &presentclockratecontrolvtbl; + object->IMFTimer_iface.lpVtbl = &presentclocktimervtbl; + object->IMFShutdown_iface.lpVtbl = &presentclockshutdownvtbl; + object->refcount = 1; + InitializeCriticalSection(&object->cs); + + *clock = &object->IMFPresentationClock_iface; + + return S_OK; +} diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2d005547b7..9fa0bda839 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -735,6 +735,68 @@ static void test_MFShutdownObject(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_presentation_clock(void) +{ + IMFPresentationTimeSource *time_source; + IMFRateControl *rate_control; + IMFPresentationClock *clock; + MFCLOCK_PROPERTIES props; + IMFShutdown *shutdown; + LONGLONG clock_time; + MFCLOCK_STATE state; + IMFTimer *timer; + MFTIME systime; + DWORD value; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + + hr = IMFPresentationClock_GetTimeSource(clock, &time_source); + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + value = 1; + hr = IMFPresentationClock_GetContinuityKey(clock, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 0, "Unexpected value %u.\n", value); + + hr = IMFPresentationClock_GetProperties(clock, &props); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFPresentationClock_GetCorrelatedTime(clock, 0, &clock_time, &systime); +todo_wine + ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); + ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + IMFRateControl_Release(rate_control); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFTimer, (void **)&timer); + ok(hr == S_OK, "Failed to get timer interface, hr %#x.\n", hr); + IMFTimer_Release(timer); + + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Failed to get shutdown interface, hr %#x.\n", hr); + IMFShutdown_Release(shutdown); + + IMFPresentationClock_Release(clock); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mf) { test_topology(); @@ -743,4 +805,5 @@ START_TEST(mf) test_MFCreateSequencerSource(); test_media_session(); test_MFShutdownObject(); + test_presentation_clock(); } diff --git a/include/mferror.h b/include/mferror.h index 54f09fefdc..be35e6e20f 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -82,4 +82,6 @@ #define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) #define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) +#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) + #endif /* __WINE_MFERROR_H */ diff --git a/include/mfidl.idl b/include/mfidl.idl index be8795c854..48d7c8e501 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -70,6 +70,37 @@ interface IMFClock : IUnknown HRESULT GetProperties([out] MFCLOCK_PROPERTIES *props); } +[ + object, + uuid(88ddcd21-03c3-4275-91ed-55ee3929328f) +] +interface IMFRateControl : IUnknown +{ + HRESULT SetRate( + [in] BOOL thin, + [in] float rate); + HRESULT GetRate( + [in, out, unique] BOOL *thin, + [in, out, unique] float *rate); +} + +[ + object, + uuid(e56e4cbd-8f70-49d8-a0f8-edb3d6ab9bf2), + local +] +interface IMFTimer : IUnknown +{ + HRESULT SetTimer( + [in] DWORD flags, + [in] LONGLONG time, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state, + [out] IUnknown **key); + HRESULT CancelTimer( + [in] IUnknown *key); +} + [ object, uuid(83cf873a-f6da-4bc8-823f-bacfd55dc430), @@ -319,6 +350,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") +cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") @@ -360,7 +392,31 @@ interface IMFMediaSource : IMFMediaEventGenerator } interface IMFStreamSink; -interface IMFPresentationClock; + +[ + object, + uuid(7ff12cce-f76f-41c2-863b-1666c8e5e139) +] +interface IMFPresentationTimeSource : IMFClock +{ + HRESULT GetUnderlyingClock([out] IMFClock **clock); +} + +[ + object, + uuid(868ce85c-8ea9-4f55-ab82-b009a910a805) +] +interface IMFPresentationClock : IMFClock +{ + HRESULT SetTimeSource([in] IMFPresentationTimeSource *time_source); + HRESULT GetTimeSource([out] IMFPresentationTimeSource **time_source); + HRESULT GetTime([out] MFTIME *time); + HRESULT AddClockStateSink([in] IMFClockStateSink *state_sink); + HRESULT RemoveClockStateSink([in] IMFClockStateSink *state_sink); + HRESULT Start([in] LONGLONG start_offset); + HRESULT Stop(); + HRESULT Pause(); +} [ object, -- 2.20.1

2 6

[PATCH 1/8] include/commctrl: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions
by Gabriel Ivăncescu 05 Mar '19

05 Mar '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 73bb9fa..9b86bdb 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -216,11 +216,13 @@ typedef struct tagNMCHAR #define CDRF_DODEFAULT 0x0 #define CDRF_NEWFONT 0x00000002 #define CDRF_SKIPDEFAULT 0x00000004 +#define CDRF_DOERASE 0x00000008 #define CDRF_NOTIFYPOSTPAINT 0x00000010 #define CDRF_NOTIFYITEMDRAW 0x00000020 #define CDRF_NOTIFYSUBITEMDRAW 0x00000020 #define CDRF_NOTIFYPOSTERASE 0x00000040 #define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ +#define CDRF_SKIPPOSTPAINT 0x00000100 /* drawstage flags */ -- 2.20.1

2 14

[PATCH 1/2] kernel32/tests: Length of sort keys must be equal with and without dest.
by Brendan McGrath 05 Mar '19

05 Mar '19

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernel32/tests/locale.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2627fc5de84..e11fe1beb01 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2362,6 +2362,13 @@ static void test_LCMapStringA(void) ok(ret == ret2, "lengths of sort keys must be equal\n"); ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); + /* test we get the same length when no dest buffer is provided */ + ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, + upper_case, lstrlenA(upper_case), NULL, 0); + ok(ret2, "LCMapStringA must succeed\n"); + todo_wine + ok(ret == ret2, "lengths of sort keys must be equal (%d vs %d)\n", ret, ret2); + /* test LCMAP_SORTKEY | NORM_IGNORECASE */ ret = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY | NORM_IGNORECASE, upper_case, -1, buf, sizeof(buf)); -- 2.17.1

2 4

[PATCH 1/5] quartz/waveparser: Fix source pin name.
by Zebediah Figura 05 Mar '19

05 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/waveparser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 609f192820..2ea3dc0427 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; +static const WCHAR outputW[] = {'o','u','t','p','u','t',0}; typedef struct WAVEParserImpl { @@ -256,7 +256,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; - lstrcpynW(piOutput.achName, wcsOutputPinName, ARRAY_SIZE(piOutput.achName)); + lstrcpynW(piOutput.achName, outputW, ARRAY_SIZE(piOutput.achName)); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list); -- 2.20.1

2 5

Wine staging 4.3 release
by Alistair Leslie-Hughes 05 Mar '19

05 Mar '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.3 (790 patches are applied to wine vanilla) NOTE: All FAudio patches has been reverted due to the lack of official package support. This will allow games that require XAudio2 support to still run. Upstreamed (Either directly from staging or fixed with a similar patch). * server: Improve handling of cursor position clipping for empty rectangle. * user32/tests: Add tests for GetWindowPlacement() and SetWindowPlacement(). * user32/tests: Add tests for maximizing and minimizing owned windows. * user32/tests: Add tests for maximizing and minimizing child windows. * user32/tests: Add tests for maximizing and minimizing MDI child windows. * user32/tests: Add tests for ArrangeIconicWindows(). * windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter. * windowscodecs: Fix 32bppRGB to 32bppRGBA conversion. * oleaut32: Support VT_DECIMAL in VarRound. * user32: SetWindowPos() shouldn't change the client rect of a minimized window. * user32: Correctly calculate the client size of a minimized window. * user32: Use the C[XY]MINIMIZED rather than C[XY]ICON size for minimized windows. * user32: AdjustWindowRect() shouldn't ignore WS_MINIMIZE. * user32: Reimplement ArrangeIconicWindows() using minimized metrics. * user32: Correctly place minimized windows. * user32: Paint title bars for minimized windows. * user32: Allow clicking the restore and maximize boxes for on minimized windows. * user32: Get rid of icon titles. * mf: Implement MFCreateSequencerSource * user32: Move iconic windows as their border instead of their icon. * windowscodecs/tests: Add a test for 8bpp indexed TIFF format. * windowscodecs/tests: Make the test for 8bpp indexed TIFF format run under XP. * windowscodecs: Fix the SupportsTransparency flag value for various pixel formats. * windowscodecs: Fail earlier in TIFF decoder's Initialize method for unsupported pixel formats. * windowscodecs: Avoid redundant checks when reading a TIFF tile. * windowscodecs: Add support for CMYK to BGR conversion. * server: Add type Token. * server: Add type Process. * server: Add type Thread. * windowscodecs: Move JPEG frame image data initialization from Frame::CopyPixels to Decoder::Initialize. Added: * [35841] wmvcore: Implement WMCreateSyncReader. * [45667] League of Legends 8.15+ fails due to missing implementation of NtQueryVirtualMemory(MemoryWorkingSetExInformation). * [45819] Symantec Eraser Control Driver 'eeCtrl64.sys' (Norton 360) fails in driver entry point due to 'ntoskrnl.exe.ExInitializeResourceLite' stub (needs STATUS_SUCCESS) * [8051] wined3d: Sims 2 demo exits prematurely * [35815] dinput: Allow remapping of joystick buttons. * [34297] dinput: Allow reconnecting to disconnected joysticks. * [14750] comctl32: Fixed rebar behaviour when there's capture and no drag. Updated: * httpapi-HttpCreateServerSession * wined3d-Indexed_Vertex_Blending Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

4 5

[PATCH] vbscript: Handle carriage return in more places.
by Zebediah Figura 04 Mar '19

04 Mar '19

This fixes a regression introduced by 5800c9ed23a5c720843445d91c8547925493df8a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/vbscript/lex.c | 9 ++++++--- dlls/vbscript/tests/run.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index fa467f04dc..739f3acd18 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) int len = 0; while(ctx->ptr < ctx->end) { - if(*ctx->ptr == '\n') { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { FIXME("newline inside string literal\n"); return 0; } @@ -497,11 +497,14 @@ int parser_lex(void *lval, parser_ctx_t *ctx) ret = parse_next_token(lval, ctx); if(ret == '_') { skip_spaces(ctx); - if(*ctx->ptr != '\n') { + if(*ctx->ptr != '\n' && *ctx->ptr != '\r') { FIXME("'_' not followed by newline\n"); return 0; } - ctx->ptr++; + if(*ctx->ptr == '\r') + ctx->ptr++; + if(*ctx->ptr == '\n') + ctx->ptr++; continue; } if(ret != tNL || ctx->last_token != tNL) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 191f5a79a0..e3439e0df7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2397,6 +2397,9 @@ static void run_tests(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); parse_script_a("' comment\r" + "x = _\r3\r" + "x = _\n3\r" + "x = _\r\n3\r" "Sub testsub(arg)\r" "If arg = 1 Then\r\r" "Call reportSuccess()\n\n" -- 2.20.1

2 1

[PATCH] wmvcore: add stub WMCreateBackupRestorer functions
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37325 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/wmvcore.spec | 4 ++-- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 66e5f20e0b..65e0807b61 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,10 +1,10 @@ @ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) -@ stub WMCreateBackupRestorerPrivate +@ stdcall WMCreateBackupRestorerPrivate(ptr ptr) WMCreateBackupRestorer @ stub WMIsAvailableOffline @ stub WMValidateData @ stdcall -private DllRegisterServer() -@ stub WMCreateBackupRestorer +@ stdcall WMCreateBackupRestorer(ptr ptr) @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index d7eb1ebb5f..10ed18afa1 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -74,6 +74,18 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } +HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **licBackup) +{ + FIXME("(%p %p): stub\n", callback, licBackup); + + if (!callback) + return E_INVALIDARG; + + *licBackup = NULL; + + return E_NOTIMPL; +} + typedef struct { IWMProfileManager IWMProfileManager_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 8798f2256e..4ee166a9d4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1893,6 +1893,10 @@ cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") +cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") +cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") -- 2.21.0

1 0

[PATCH v3 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 04 Mar '19

04 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - remove non working file flags reset. dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..dd84557238 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,28 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

2 14

wine-mono 4.8.0 build
by Michael Cronenworth 04 Mar '19

04 Mar '19

Hi, The 4.8.0 wine-mono release cannot be built from source on Fedora. There seems to be something missing from the build root or not compiling during the build and I cannot see what it is. Can I borrow another set of eyes to look at the build output? Build log: https://kojipkgs.fedoraproject.org//work/tasks/7904/33137904/build.log Koji task: https://koji.fedoraproject.org/koji/taskinfo?taskID=33137904 Thanks, Michael

2 5

[PATCH v4 5/5] Add tests in kernel32 for new NtAllocateVirtualMemory ZeroBits behavior
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 4/5] Fix handling of ZeroBits argument in NtAllocateVirtualMemory and friends
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 3/5] Don't use ZeroBits argument in NtAllocateVirtualMemory as alignment
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

2 1

[PATCH v4 2/5] Add comment explaining what ZeroBits argument of NtMapViewOfSection is for
by Las＠protonmail.ch 04 Mar '19

04 Mar '19

Empty Message

1 0

[PATCH 3/7] d3dx9: Merge the d3dx_effect_GetParameter() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22f098ead6..41636ed286 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!parameter) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (param && !param->element_count && index < param->member_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *semantic) { @@ -3436,10 +3409,30 @@ static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); + if (!parameter) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

3 4

[PATCH 5/7] d3dx9: Merge the d3dx_effect_GetParameterElement() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4af6f7f1b9..1703afa067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (index < param->element_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) { if (index >= base->technique_count) @@ -3463,10 +3436,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); + if (!param) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (index < param->element_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index) -- 2.20.1

3 4

[PATCH 7/7] d3dx9: Remove an unneeded forward declaration
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e2cd4c6e9..0a43fe1bdb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -210,8 +210,6 @@ struct ID3DXEffectCompilerImpl LONG ref; }; -static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, - unsigned int count, struct d3dx_parameter *parameters, const char *name); static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); -- 2.20.1

3 2

[PATCH 2/7] d3dx9: Merge the d3dx_effect_GetParameterByName() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 39281b9d44..22f098ead6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,25 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *name) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - D3DXHANDLE handle; - - if (!name) - { - handle = get_parameter_handle(param); - TRACE("Returning parameter %p.\n", handle); - return handle; - } - - handle = get_parameter_handle(get_parameter_by_name(base, param, name)); - TRACE("Returning parameter %p.\n", handle); - - return handle; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *semantic) { @@ -3465,10 +3446,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + D3DXHANDLE handle; TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); - return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); + if (!name) + { + handle = get_parameter_handle(param); + TRACE("Returning parameter %p.\n", handle); + return handle; + } + + handle = get_parameter_handle(get_parameter_by_name(&effect->base_effect, param, name)); + TRACE("Returning parameter %p.\n", handle); + + return handle; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

3 2

[PATCH 1/7] d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 75 ++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bdc96e7972..39281b9d44 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -212,7 +212,7 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, unsigned int count, struct d3dx_parameter *parameters, const char *name); -static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); @@ -5165,7 +5165,7 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; -static HRESULT d3dx9_parse_sampler(struct d3dx9_base_effect *base, struct d3dx_sampler *sampler, +static HRESULT d3dx_parse_sampler(struct d3dx_effect *effect, struct d3dx_sampler *sampler, const char *data, const char **ptr, struct d3dx_object *objects) { HRESULT hr; @@ -5183,7 +5183,7 @@ static HRESULT d3dx9_parse_sampler(struct d3dx9_base_effect *base, struct d3dx_s for (i = 0; i < sampler->state_count; ++i) { - hr = d3dx9_parse_state(base, &sampler->states[i], data, ptr, objects); + hr = d3dx_parse_state(effect, &sampler->states[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse state %u\n", i); @@ -5205,7 +5205,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_value(struct d3dx_effect *effect, struct d3dx_parameter *param, void *value, const char *data, const char **ptr, struct d3dx_object *objects) { unsigned int i; @@ -5220,7 +5220,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par { struct d3dx_parameter *member = &param->members[i]; - hr = d3dx9_parse_value(base, member, value ? (char *)value + old_size : NULL, data, ptr, objects); + hr = d3dx_parse_value(effect, member, value ? (char *)value + old_size : NULL, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value %u\n", i); @@ -5249,7 +5249,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par { struct d3dx_parameter *member = &param->members[i]; - hr = d3dx9_parse_value(base, member, (char *)value + old_size, data, ptr, objects); + hr = d3dx_parse_value(effect, member, (char *)value + old_size, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value %u\n", i); @@ -5289,7 +5289,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par if (!sampler) return E_OUTOFMEMORY; - hr = d3dx9_parse_sampler(base, sampler, data, ptr, objects); + hr = d3dx_parse_sampler(effect, sampler, data, ptr, objects); if (hr != D3D_OK) { HeapFree(GetProcessHeap(), 0, sampler); @@ -5315,7 +5315,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par return D3D_OK; } -static HRESULT d3dx9_parse_init_value(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_init_value(struct d3dx_effect *effect, struct d3dx_parameter *param, const char *data, const char *ptr, struct d3dx_object *objects) { UINT size = param->bytes; @@ -5353,7 +5353,7 @@ static HRESULT d3dx9_parse_init_value(struct d3dx9_base_effect *base, struct d3d } } - hr = d3dx9_parse_value(base, param, value, data, &ptr, objects); + hr = d3dx_parse_value(effect, param, value, data, &ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5507,7 +5507,7 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame add_param_to_tree(base, &param->members[i], param, '.', 0); } -static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { DWORD offset; @@ -5641,7 +5641,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct *ptr = save_ptr; param_set_magic_number(&param->members[i]); - hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, param, flags); + hr = d3dx_parse_effect_typedef(effect, &param->members[i], data, ptr, param, flags); if (hr != D3D_OK) { WARN("Failed to parse member %u\n", i); @@ -5666,7 +5666,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct for (i = 0; i < param->member_count; ++i) { param_set_magic_number(&param->members[i]); - hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, NULL, flags); + hr = d3dx_parse_effect_typedef(effect, &param->members[i], data, ptr, NULL, flags); if (hr != D3D_OK) { WARN("Failed to parse member %u\n", i); @@ -5701,7 +5701,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, struct d3dx_parameter *anno, +static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d3dx_parameter *anno, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5713,7 +5713,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(base, anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION); + hr = d3dx_parse_effect_typedef(effect, anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5722,7 +5722,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(base, anno, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, anno, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5732,7 +5732,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str return D3D_OK; } -static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5750,7 +5750,7 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(base, &state->parameter, data, &ptr2, NULL, 0); + hr = d3dx_parse_effect_typedef(effect, &state->parameter, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5759,7 +5759,7 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(base, &state->parameter, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, &state->parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5775,7 +5775,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, struct d3dx_top_level_parameter *param, +static HRESULT d3dx_parse_effect_parameter(struct d3dx_effect *effect, struct d3dx_top_level_parameter *param, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5796,14 +5796,14 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru read_dword(ptr, &param->annotation_count); TRACE("Annotation count: %u.\n", param->annotation_count); - hr = d3dx9_parse_effect_typedef(base, &param->param, data, &ptr2, NULL, param->param.flags); + hr = d3dx_parse_effect_typedef(effect, &param->param, data, &ptr2, NULL, param->param.flags); if (hr != D3D_OK) { WARN("Failed to parse type definition.\n"); return hr; } - hr = d3dx9_parse_init_value(base, &param->param, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, &param->param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value.\n"); @@ -5824,7 +5824,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru for (i = 0; i < param->annotation_count; ++i) { param_set_magic_number(&param->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &param->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &param->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation.\n"); @@ -5848,7 +5848,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3dx_pass *pass, +static HRESULT d3dx_parse_effect_pass(struct d3dx_effect *effect, struct d3dx_pass *pass, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5886,7 +5886,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->annotation_count; ++i) { param_set_magic_number(&pass->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &pass->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &pass->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -5907,7 +5907,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->state_count; ++i) { - hr = d3dx9_parse_state(base, &states[i], data, ptr, objects); + hr = d3dx_parse_state(effect, &states[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -5945,7 +5945,7 @@ err_out: return hr; } -static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, struct d3dx_technique *technique, +static HRESULT d3dx_parse_effect_technique(struct d3dx_effect *effect, struct d3dx_technique *technique, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5982,7 +5982,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->annotation_count; ++i) { param_set_magic_number(&technique->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &technique->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &technique->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -6004,7 +6004,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->pass_count; ++i) { - hr = d3dx9_parse_effect_pass(base, &technique->passes[i], data, ptr, objects); + hr = d3dx_parse_effect_pass(effect, &technique->passes[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse pass %u\n", i); @@ -6082,9 +6082,10 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o return D3D_OK; } -static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx_state *state, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD string_size; struct d3dx_parameter *param = &state->parameter; struct d3dx_object *object = &base->objects[param->object_id]; @@ -6139,9 +6140,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct return ret; } -static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr, +static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, const char **ptr, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD technique_index; DWORD index, state_index, usage, element_index; struct d3dx_state *state; @@ -6308,7 +6310,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state->type = ST_ARRAY_SELECTOR; if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; - hr = d3dx9_parse_array_selector(base, state, skip_constants, skip_constants_count); + hr = d3dx_parse_array_selector(effect, state, skip_constants, skip_constants_count); break; default: @@ -6325,9 +6327,10 @@ static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_paramet return FALSE; } -static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, +static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, UINT data_size, DWORD start, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; const char *ptr = data + start; UINT stringcount, resourcecount; HRESULT hr; @@ -6367,7 +6370,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); - hr = d3dx9_parse_effect_parameter(base, &base->parameters[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); @@ -6393,7 +6396,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); - hr = d3dx9_parse_effect_technique(base, &base->techniques[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, base->objects); if (hr != D3D_OK) { WARN("Failed to parse technique %u.\n", i); @@ -6429,7 +6432,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da { TRACE("parse resource %u.\n", i); - hr = d3dx9_parse_resource(base, data, &ptr, skip_constants, skip_constants_count); + hr = d3dx_parse_resource(effect, data, &ptr, skip_constants, skip_constants_count); if (hr != D3D_OK) { WARN("Failed to parse resource %u.\n", i); @@ -6638,7 +6641,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, read_dword(&ptr, &offset); TRACE("Offset: %x\n", offset); - hr = d3dx9_parse_effect(base, ptr, data_size, offset, skip_constants, skip_constants_count); + hr = d3dx_parse_effect(effect, ptr, data_size, offset, skip_constants, skip_constants_count); if (bytecode) ID3D10Blob_Release(bytecode); if (hr != D3D_OK) -- 2.20.1

3 2

[PATCH] d3dx9/tests: Remove useless cast to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0c3e001702..1b9e120f8d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2026,7 +2026,7 @@ static void D3DXVector2Test(void) D3DXVec2TransformCoord(&gotvec, &u, &mat); expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; - D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + D3DXVec2TransformCoord(&gotvec, &gotvec, &mat); expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ -- 2.20.1

2 1

[PATCH] d3d8: Improve ValidatePixelShader().
by Henri Verbeet 04 Mar '19

04 Mar '19

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 159574. dlls/d3d8/d3d8_main.c | 72 +++++++++++++++++++++------------------ dlls/d3d8/tests/device.c | 87 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 102 insertions(+), 57 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c90894..62e8d31749e 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,49 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, caps %p, return_error %#x, errors %p.\n", + ps_code, caps, return_error, errors); + + if (!ps_code) + return E_FAIL; + + switch (*ps_code) + { + case D3DPS_VERSION(1, 4): + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + if (caps && *ps_code > caps->PixelShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a64736913da..51dd3aef579 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,43 +4506,80 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_1_1_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ - 0x00000042, 0xb00f0000, /* tex t0 */ - 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ - 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ - 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ - 0x0000ffff, /* end */ + 0x00000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x00000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); + hr = ValidatePixelShader(NULL, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.PixelShaderVersion = D3DPS_VERSION(1, 1); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 2); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.PixelShaderVersion = D3DPS_VERSION(8, 8); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + *ps_1_1_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); + *ps_1_1_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_2_0_code, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + *ps_1_1_code = D3DPS_VERSION(1, 5); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void) -- 2.11.0

2 1

[PATCH v2] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Based on patch from Andrey Turkin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 26 ++++++++++++++++++++++---- dlls/ieframe/webbrowser.c | 20 ++++++++++++++++++-- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9cf..a7d752f34c21 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -166,7 +166,7 @@ static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; -static const char *current_url; +static const char *current_url, *current_title; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ @@ -267,6 +267,22 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *unk, const char *exname) +{ + BSTR name = (void*)0xdeadbeef; + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + if (SUCCEEDED(hres)) + { + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + } +} + #define test_ready_state(ex) _test_ready_state(__LINE__,ex) static void _test_ready_state(unsigned line, READYSTATE exstate) { @@ -2744,14 +2760,15 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); + test_LocationName(webbrowser, is_first_load ? "" : current_title); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE); is_http = !memcmp(nav_url, "http:", 5); V_VT(&url) = VT_BSTR; - V_BSTR(&url) = a2bstr(current_url = nav_url); + V_BSTR(&url) = a2bstr(current_title = current_url = nav_url); if((is_file = !strncasecmp(nav_url, "file://", 7))) - current_url = nav_url + 7; + current_title = current_url = nav_url + 7; if(is_first_load) { SET_EXPECT(Invoke_AMBIENT_USERMODE); @@ -3182,7 +3199,7 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - str = a2bstr(current_url = url); + str = a2bstr(current_title = current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3728,6 +3745,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ClassInfo(webbrowser); test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, ""); + test_LocationName(webbrowser, ""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 03acf3886989..9e34cab51bdb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -503,8 +503,24 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + hres = get_location_url(&This->doc_host, LocationName); + if (This->doc_host.document) + { + IHTMLDocument2 *doc = NULL; + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc); + if (SUCCEEDED(hres)) + { + IHTMLDocument2_get_title(doc, LocationName); + if (SysStringLen(*LocationName) == 0) + hres = get_location_url(&This->doc_host, LocationName); + IHTMLDocument2_Release(doc); + } + } + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.17.0

3 3

Fwd: [PATCH v2] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Hi Jacek, Can you send the tests with todo block? The tests looks good to me. If the url doesn't implement IHTMLDocument2, It should return the url. Hence I was calling get_location_url at the start to cover the empty string case, which is causing a leak. eg:"about:blank" The same holds true for null/empty string as input. Meanwhile, I will see how I can improve the implementation. Thanks, Vijay On Mon, Mar 4, 2019 at 5:56 PM Jacek Caban <jacek(a)codeweavers.com> wrote: > > Hi Vijay, > > On 3/1/19 2:58 AM, Vijay Kiran Kamuju wrote: > > > +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) > +static void _test_LocationName(unsigned line, IWebBrowser2 *unk, const char *exname) > +{ > + BSTR name = (void*)0xdeadbeef; > + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; > + HRESULT hres; > + > + hres = IWebBrowser2_get_LocationName(wb, &name); > + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); > + if (SUCCEEDED(hres)) > + { > + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); > > > This || here makes the test pass even if you'd always simply return URL. See the attached patch for how it could be improved. > > > diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c > index 03acf3886989..9e34cab51bdb 100644 > --- a/dlls/ieframe/webbrowser.c > +++ b/dlls/ieframe/webbrowser.c > @@ -503,8 +503,24 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) > static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) > { > WebBrowser *This = impl_from_IWebBrowser2(iface); > - FIXME("(%p)->(%p)\n", This, LocationName); > - return E_NOTIMPL; > + HRESULT hres; > + > + TRACE("(%p)->(%p)\n", This, LocationName); > + > + hres = get_location_url(&This->doc_host, LocationName); > + if (This->doc_host.document) > + { > + IHTMLDocument2 *doc = NULL; > + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc); > + if (SUCCEEDED(hres)) > + { > + IHTMLDocument2_get_title(doc, LocationName); > + if (SysStringLen(*LocationName) == 0) > > > You leak LocationName in this case (even an empty string is allocated). > > > + hres = get_location_url(&This->doc_host, LocationName); > > > What happens if have a document that doesn't implement IHTMLDocument2? I guess it should just return URL here, but it will fail with your patch. > > > Thanks, > > Jacek

1 0

[PATCH 2/2] mshtml: Add IHTMLDOMImplementation2 stub implementation.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 108 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)

1 0

[PATCH 1/2] mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 15 +++++++ include/mshtml.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+)

1 0

[PATCH 8/8] wined3d: Rename state entry structures.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 49d06455f74e..aab047cc023f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6673,7 +6673,7 @@ static void textransform(struct wined3d_context *context, const struct wined3d_s fragment_prog_arbfp(context, state, state_id); } -static const struct StateEntryTemplate arbfp_fragmentstate_template[] = +static const struct wined3d_state_entry_template arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index ff2f711f4e8f..05ec44a0cf3b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1099,7 +1099,8 @@ static void atifs_srgbwriteenable(struct wined3d_context *context, const struct WARN("sRGB writes are not supported by this fragment pipe.\n"); } -static const struct StateEntryTemplate atifs_fragmentstate_template[] = { +static const struct wined3d_state_entry_template atifs_fragmentstate_template[] = +{ {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), atifs_tfactor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37264a08ef06..267238dafa42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3945,7 +3945,7 @@ static void context_load_stream_output_buffers(struct wined3d_context *context, static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct StateEntry *state_table = context->state_table; + const struct wined3d_state_entry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; @@ -4059,7 +4059,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct StateEntry *state_table = context->state_table; + const struct wined3d_state_entry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int state_id, i; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4613d78f94c2..fa6e302a4b9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12001,7 +12001,7 @@ static void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_VS_CLIP_PLANES; } -static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = +static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, @@ -12370,7 +12370,7 @@ static void glsl_fragment_pipe_shademode(struct wined3d_context *context, context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } -static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = +static const struct wined3d_state_entry_template glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_fragment_pipe_vs }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 14cb73f2c3b4..323484ab43b4 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -768,7 +768,7 @@ static BOOL nvts_color_fixup_supported(struct color_fixup_desc fixup) return is_identity_fixup(fixup); } -static const struct StateEntryTemplate nvrc_fragmentstate_template[] = +static const struct wined3d_state_entry_template nvrc_fragmentstate_template[] = { { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9dc98047cfde..f071f30b5759 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4488,7 +4488,7 @@ static void state_so_warn(struct wined3d_context *context, const struct wined3d_ WARN("Transform feedback not supported.\n"); } -const struct StateEntryTemplate misc_state_template[] = +const struct wined3d_state_entry_template misc_state_template[] = { { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, @@ -4707,7 +4707,7 @@ const struct StateEntryTemplate misc_state_template[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -static const struct StateEntryTemplate vp_ffp_states[] = +static const struct wined3d_state_entry_template vp_ffp_states[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, @@ -5082,7 +5082,7 @@ static const struct StateEntryTemplate vp_ffp_states[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -static const struct StateEntryTemplate ffp_fragmentstate_template[] = { +static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), tex_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -5386,7 +5386,7 @@ static void multistate_apply_3(struct wined3d_context *context, const struct win context->device->multistate_funcs[state_id][2](context, state, state_id); } -static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_d3d_info *d3d_info) +static void prune_invalid_states(struct wined3d_state_entry *state_table, const struct wined3d_d3d_info *d3d_info) { unsigned int start, last, i; @@ -5415,7 +5415,7 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi } } -static void validate_state_table(struct StateEntry *state_table) +static void validate_state_table(struct wined3d_state_entry *state_table) { static const struct { @@ -5519,13 +5519,13 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct wined3d_state_entry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, - const struct StateEntryTemplate *misc) + const struct wined3d_state_entry_template *misc) { APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; - const struct StateEntryTemplate *cur; + const struct wined3d_state_entry_template *cur; unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8fe331065768..6907c7b2e926 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1873,7 +1873,7 @@ struct wined3d_context { const struct wined3d_gl_info *gl_info; const struct wined3d_d3d_info *d3d_info; - const struct StateEntry *state_table; + const struct wined3d_state_entry *state_table; /* State dirtification * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices * 0...numDirtyEntries - 1. isStateDirty is a redundant copy of the dirtyArray. Technically only one of them would be needed, @@ -2027,16 +2027,16 @@ struct wined3d_fb_state typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); -struct StateEntry +struct wined3d_state_entry { - DWORD representative; + unsigned int representative; APPLYSTATEFUNC apply; }; -struct StateEntryTemplate +struct wined3d_state_entry_template { DWORD state; - struct StateEntry content; + struct wined3d_state_entry content; unsigned int extension; }; @@ -2066,7 +2066,7 @@ struct fragment_pipeline BOOL (*allocate_context_data)(struct wined3d_context *context); void (*free_context_data)(struct wined3d_context *context); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); - const struct StateEntryTemplate *states; + const struct wined3d_state_entry_template *states; }; struct wined3d_vertex_caps @@ -2090,10 +2090,10 @@ struct wined3d_vertex_pipe_ops DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device); - const struct StateEntryTemplate *vp_states; + const struct wined3d_state_entry_template *vp_states; }; -extern const struct StateEntryTemplate misc_state_template[] DECLSPEC_HIDDEN; +extern const struct wined3d_state_entry_template misc_state_template[] DECLSPEC_HIDDEN; extern const struct fragment_pipeline none_fragment_pipe DECLSPEC_HIDDEN; extern const struct fragment_pipeline ffp_fragment_pipeline DECLSPEC_HIDDEN; extern const struct fragment_pipeline atifs_fragment_pipeline DECLSPEC_HIDDEN; @@ -2107,10 +2107,10 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct wined3d_state_entry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, - const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; + const struct wined3d_state_entry_template *misc) DECLSPEC_HIDDEN; enum wined3d_blit_op { @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry state_table[STATE_HIGHEST + 1]; + struct wined3d_state_entry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter; @@ -4597,8 +4597,8 @@ static inline BOOL use_ps(const struct wined3d_state *state) static inline void context_apply_state(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct StateEntry *state_table = context->state_table; - DWORD rep = state_table[state_id].representative; + const struct wined3d_state_entry *state_table = context->state_table; + unsigned int rep = state_table[state_id].representative; state_table[rep].apply(context, state, rep); } -- 2.19.2

2 1

[PATCH 7/8] wined3d: Rename StateTable.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 10 +++---- dlls/wined3d/state.c | 49 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 122ed709610c..37264a08ef06 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1953,7 +1953,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->StateTable; + context->state_table = device->state_table; /* Mark all states dirty to force a proper initialization of the states on * the first use of the context. Compute states do not need initialization. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61896a254f85..79a5b68c6f77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wine_rb_init(&device->samplers, wined3d_sampler_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states - && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { @@ -5396,11 +5396,9 @@ err: void device_invalidate_state(const struct wined3d_device *device, DWORD state) { - DWORD rep = device->StateTable[state].representative; + DWORD rep = device->state_table[state].representative; struct wined3d_context *context; - DWORD idx; - BYTE shift; - UINT i; + unsigned int i, idx, shift; wined3d_from_cs(device->cs); @@ -5414,7 +5412,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; - if(isStateDirty(context, rep)) continue; + if (isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969dfc2e12a4..9dc98047cfde 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5519,39 +5519,43 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { - unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; + unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; memset(multistate_funcs, 0, sizeof(multistate_funcs)); - for(i = 0; i < STATE_HIGHEST + 1; i++) { - StateTable[i].representative = 0; - StateTable[i].apply = state_undefined; + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; } - for(type = 0; type < 3; type++) { + for (type = 0; type < 3; ++type) + { /* This switch decides the order in which the states are applied */ - switch(type) { + switch (type) + { case 0: cur = misc; break; case 1: cur = fragment->states; break; case 2: cur = vertex->vp_states; break; default: cur = NULL; /* Stupid compiler */ } - if(!cur) continue; + if (!cur) continue; /* GL extension filtering should not prevent multiple handlers being applied from different * pipeline parts */ memset(set, 0, sizeof(set)); - for(i = 0; cur[i].state; i++) { + for (i = 0; cur[i].state; ++i) + { APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. @@ -5561,7 +5565,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * * if GL_XYZ_fancy is supported, ignore the 2nd line */ - if(set[cur[i].state]) continue; + if (set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; @@ -5576,12 +5580,13 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply; - switch(handlers) { + switch (handlers) + { case 0: - StateTable[cur[i].state].apply = cur[i].content.apply; + state_table[cur[i].state].apply = cur[i].content.apply; break; case 1: - StateTable[cur[i].state].apply = multistate_apply_2; + state_table[cur[i].state].apply = multistate_apply_2; if (!(dev_multistate_funcs[cur[i].state] = heap_calloc(2, sizeof(**dev_multistate_funcs)))) goto out_of_mem; @@ -5589,7 +5594,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: - StateTable[cur[i].state].apply = multistate_apply_3; + state_table[cur[i].state].apply = multistate_apply_3; if (!(funcs_array = heap_realloc(dev_multistate_funcs[cur[i].state], sizeof(**dev_multistate_funcs) * 3))) goto out_of_mem; @@ -5598,22 +5603,22 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: - ERR("Unexpected amount of state handlers for state %u: %u\n", - cur[i].state, handlers + 1); + ERR("Unexpected amount of state handlers for state %u: %u.\n", + cur[i].state, handlers + 1); } - if (StateTable[cur[i].state].representative - && StateTable[cur[i].state].representative != cur[i].content.representative) + if (state_table[cur[i].state].representative + && state_table[cur[i].state].representative != cur[i].content.representative) { FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", debug_d3dstate(cur[i].state), cur[i].state); } - StateTable[cur[i].state].representative = cur[i].content.representative; + state_table[cur[i].state].representative = cur[i].content.representative; } } - prune_invalid_states(StateTable, d3d_info); - validate_state_table(StateTable); + prune_invalid_states(state_table, d3d_info); + validate_state_table(state_table); return WINED3D_OK; @@ -5623,7 +5628,7 @@ out_of_mem: heap_free(dev_multistate_funcs[i]); } - memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1) * sizeof(*dev_multistate_funcs)); return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51b86a7646b0..8fe331065768 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry StateTable[STATE_HIGHEST + 1]; + struct StateEntry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter; -- 2.19.2

2 1

[PATCH 6/8] wined3d: Avoid passing gl_info to compile_state_table().
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4caa1e8c451a..61896a254f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5358,7 +5358,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, - &adapter->gl_info, &adapter->d3d_info, vertex_pipeline, + &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { ERR("Failed to compile state table, hr %#x.\n", hr); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 79525790b8a5..969dfc2e12a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5520,7 +5520,7 @@ static void validate_state_table(struct StateEntry *state_table) } HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { @@ -5563,7 +5563,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ */ if(set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ - if (!gl_info->supported[cur[i].extension]) continue; + if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; /* In some cases having an extension means that nothing has to be * done for a state, e.g. if GL_ARB_texture_non_power_of_two is diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d51a90e1b94..51b86a7646b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2037,7 +2037,7 @@ struct StateEntryTemplate { DWORD state; struct StateEntry content; - enum wined3d_gl_extension extension; + unsigned int extension; }; #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 @@ -2108,7 +2108,7 @@ extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH 5/8] wined3d: Avoid passing gl_info to prune_invalid_states().
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f049ad9ebfae..79525790b8a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5386,8 +5386,7 @@ static void multistate_apply_3(struct wined3d_context *context, const struct win context->device->multistate_funcs[state_id][2](context, state, state_id); } -static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) +static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_d3d_info *d3d_info) { unsigned int start, last, i; @@ -5613,7 +5612,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ } } - prune_invalid_states(StateTable, gl_info, d3d_info); + prune_invalid_states(StateTable, d3d_info); validate_state_table(StateTable); return WINED3D_OK; -- 2.19.2

2 1

[PATCH 4/8] wined3d: Introduce general helper function to get sample count for resource.
by Józef Kucia 04 Mar '19

04 Mar '19

For Vulkan backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/resource.c | 32 ++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 36 ++-------------------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ba71df1e323d..2897ab143c1f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -509,3 +509,35 @@ const struct wined3d_format *wined3d_resource_get_decompress_format(const struct return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->bind_flags); return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, resource->bind_flags); } + +unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) +{ + const struct wined3d_format *format = resource->format; + + /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) + * feature through type == MULTISAMPLE_XX and quality != 0. This could + * be mapped to GL_NV_framebuffer_multisample_coverage. + * + * AMD have a similar feature called Enhanced Quality Anti-Aliasing + * (EQAA), but it does not have an equivalent OpenGL extension. */ + + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality + * levels as the count of advertised multisample types for the texture + * format. */ + if (resource->multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + { + unsigned int i, count = 0; + + for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) + { + if (format->multisample_types & 1u << i) + { + if (resource->multisample_quality == count++) + break; + } + } + return i + 1; + } + + return resource->multisample_type; +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cb9ac2aa4ffb..55c9543f30b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -530,38 +530,6 @@ static void gltexture_delete(struct wined3d_device *device, const struct wined3d tex->name = 0; } -static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_texture *texture) -{ - const struct wined3d_format *format = texture->resource.format; - - /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) - * feature through type == MULTISAMPLE_XX and quality != 0. This could - * be mapped to GL_NV_framebuffer_multisample_coverage. - * - * AMD have a similar feature called Enhanced Quality Anti-Aliasing - * (EQAA), but it does not have an equivalent OpenGL extension. */ - - /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality - * levels as the count of advertised multisample types for the texture - * format. */ - if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - { - unsigned int i, count = 0; - - for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) - { - if (format->multisample_types & 1u << i) - { - if (texture->resource.multisample_quality == count++) - break; - } - } - return i + 1; - } - - return texture->resource.multisample_type; -} - /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_gl *texture_gl, @@ -624,7 +592,7 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture_gl *texture_gl, GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) { - unsigned int samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); + unsigned int samples = wined3d_resource_get_sample_count(&texture_gl->t.resource); GLsizei height = wined3d_texture_get_level_pow2_height(&texture_gl->t, 0); GLsizei width = wined3d_texture_get_level_pow2_width(&texture_gl->t, 0); GLboolean standard_pattern = texture_gl->t.resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE @@ -1813,7 +1781,7 @@ static void wined3d_texture_gl_prepare_rb(struct wined3d_texture_gl *texture_gl, if (texture_gl->rb_multisample) return; - samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); + samples = wined3d_resource_get_sample_count(&texture_gl->t.resource); gl_info->fbo_ops.glGenRenderbuffers(1, &texture_gl->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture_gl->rb_multisample); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc5902a8e75c..3d51a90e1b94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3227,6 +3227,7 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPE void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; +unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH 3/8] wined3d: Store multisample draw location in struct wined3d_d3d_info.
by Józef Kucia 04 Mar '19

04 Mar '19

We may want to introduce a separate structure for backend options if we have more of those. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 5 +++++ dlls/wined3d/resource.c | 8 +++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 086d0469551f..492d7f952305 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3738,6 +3738,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; + else + d3d_info->multisample_draw_location = WINED3D_LOCATION_RB_MULTISAMPLE; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); if (!d3d_info->shader_color_key) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 90025e9648b2..ba71df1e323d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -481,17 +481,15 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) { + const struct wined3d_d3d_info *d3d_info = &resource->device->adapter->d3d_info; + if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) { resource->draw_binding = WINED3D_LOCATION_DRAWABLE; } else if (resource->multisample_type) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; - else - resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + resource->draw_binding = d3d_info->multisample_draw_location; } else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25a74dce0018..cc5902a8e75c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -207,6 +207,8 @@ struct wined3d_d3d_info unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; enum wined3d_feature_level feature_level; + + DWORD multisample_draw_location; }; static const struct color_fixup_desc COLOR_FIXUP_IDENTITY = -- 2.19.2

2 1

[PATCH 2/8] wined3d: Store base vertex draw capabilities in struct wined3d_d3d_info.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 538e0c1bb0c2..086d0469551f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3736,6 +3736,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); if (!d3d_info->shader_color_key) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3de29d5f9485..47b23de62fde 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -842,7 +842,6 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; @@ -855,14 +854,14 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_direct_draw_parameters *direct = &op->parameters.u.direct; - if (op->parameters.indexed && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (op->parameters.indexed && d3d_info->draw_base_vertex_offset) base_vertex_idx = direct->base_vertex_idx; else if (!op->parameters.indexed) base_vertex_idx = direct->start_idx; } /* ARB_draw_indirect always supports a base vertex offset. */ - if (!op->parameters.indirect && !gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (!op->parameters.indirect && !d3d_info->draw_base_vertex_offset) load_base_vertex_idx = op->parameters.u.direct.base_vertex_idx; else load_base_vertex_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 125efebacf2a..25a74dce0018 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; + unsigned int draw_base_vertex_offset : 1; enum wined3d_feature_level feature_level; }; -- 2.19.2

2 1

[PATCH 1/8] wined3d: Get rid of valid_rt_mask.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 4 ---- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 803ebda37556..538e0c1bb0c2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3738,10 +3738,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); - d3d_info->valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - d3d_info->valid_rt_mask |= (1u << i); - if (!d3d_info->shader_color_key) { /* We do not want to deal with re-creating immutable texture storage diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 393b336c53e5..122ed709610c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3147,11 +3147,12 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win return TRUE; } -static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - DWORD rt_mask, mask; + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -3160,7 +3161,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= context->d3d_info->valid_rt_mask; + rt_mask &= (1u << gl_info->limits.buffers) - 1; mask = rt_mask; while (mask) @@ -3176,7 +3177,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD rt_mask = find_draw_buffers_mask(context, state); + unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b705824a89b..125efebacf2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -195,7 +195,6 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - DWORD valid_rt_mask; DWORD wined3d_creation_flags; unsigned int xyzrhw : 1; unsigned int emulated_flatshading : 1; -- 2.19.2

2 1

[v2 PATCH 1/9] mfplat: Implement periodic callbacks.
by Nikolay Sivov 04 Mar '19

04 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: test inconsistently crashing on XP removed for now. dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 194 +++++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 48 +++++++++ include/mfapi.h | 4 + 4 files changed, 242 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c6234b006e..116ec61289 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -15,7 +15,7 @@ @ stub GetAMSubtypeFromD3DFormat @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool -@ stub MFAddPeriodicCallback +@ stdcall MFAddPeriodicCallback(ptr ptr ptr) @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) @ stub MFAppendCollection @@ -100,7 +100,7 @@ @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader @ stdcall MFGetSystemTime() -@ stub MFGetTimerPeriodicity +@ stdcall MFGetTimerPeriodicity(ptr) @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId @@ -125,7 +125,7 @@ @ stdcall MFPutWorkItem(long ptr ptr) @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError -@ stub MFRemovePeriodicCallback +@ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) @ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index f470cb44b5..e3b0687711 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -39,9 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static LONG next_item_key; +static MFWORKITEM_KEY get_item_key(DWORD mask, DWORD key) +{ + return ((MFWORKITEM_KEY)mask << 32) | key; +} + static MFWORKITEM_KEY generate_item_key(DWORD mask) { - return ((MFWORKITEM_KEY)mask << 32) | InterlockedIncrement(&next_item_key); + return get_item_key(mask, InterlockedIncrement(&next_item_key)); } struct work_item @@ -315,9 +320,10 @@ void shutdown_system_queues(void) LeaveCriticalSection(&queues_section); } -static void grab_work_item(struct work_item *item) +static struct work_item *grab_work_item(struct work_item *item) { InterlockedIncrement(&item->refcount); + return item; } static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) @@ -442,6 +448,15 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in release_work_item(item); } +static void CALLBACK periodic_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = grab_work_item(context); + + invoke_async_callback(item->result); + + release_work_item(item); +} + static void queue_mark_item_pending(DWORD mask, struct work_item *item, MFWORKITEM_KEY *key) { *key = generate_item_key(mask); @@ -478,7 +493,8 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit return S_OK; } -static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, DWORD period, + MFWORKITEM_KEY *key) { PTP_TIMER_CALLBACK callback; struct work_item *item; @@ -491,17 +507,19 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I if (key) { queue_mark_item_pending(SCHEDULED_ITEM_KEY_MASK, item, key); - callback = scheduled_item_cancelable_callback; } + + if (period) + callback = periodic_item_callback; else - callback = scheduled_item_callback; + callback = key ? scheduled_item_cancelable_callback : scheduled_item_callback; t.QuadPart = timeout * 1000 * 10; filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); - SetThreadpoolTimer(item->u.timer_object, &filetime, 0, 0); + SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); @@ -842,7 +860,7 @@ static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKI TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - hr = queue_submit_timer(queue, result, timeout, key); + hr = queue_submit_timer(queue, result, timeout, 0, key); return hr; } @@ -912,3 +930,165 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) return hr; } + +static DWORD get_timer_period(void) +{ + return 10; +} + +/*********************************************************************** + * MFGetTimerPeriodicity (mfplat.@) + */ +HRESULT WINAPI MFGetTimerPeriodicity(DWORD *period) +{ + TRACE("%p.\n", period); + + *period = get_timer_period(); + + return S_OK; +} + +struct periodic_callback +{ + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + MFPERIODICCALLBACK callback; +}; + +static struct periodic_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct periodic_callback, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI periodic_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI periodic_callback_AddRef(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedIncrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI periodic_callback_Release(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedDecrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + heap_free(callback); + + return refcount; +} + +static HRESULT WINAPI periodic_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI periodic_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + IUnknown *context = NULL; + + IMFAsyncResult_GetObject(result, &context); + + callback->callback(context); + + if (context) + IUnknown_Release(context); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl periodic_callback_vtbl = +{ + periodic_callback_QueryInterface, + periodic_callback_AddRef, + periodic_callback_Release, + periodic_callback_GetParameters, + periodic_callback_Invoke, +}; + +static HRESULT create_periodic_callback_obj(MFPERIODICCALLBACK callback, IMFAsyncCallback **out) +{ + struct periodic_callback *object; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl; + object->refcount = 1; + object->callback = callback; + + *out = &object->IMFAsyncCallback_iface; + + return S_OK; +} + +/*********************************************************************** + * MFAddPeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key) +{ + IMFAsyncCallback *periodic_callback; + MFWORKITEM_KEY workitem_key; + IMFAsyncResult *result; + struct queue *queue; + HRESULT hr; + + TRACE("%p, %p, %p.\n", callback, context, key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + if (FAILED(hr = create_periodic_callback_obj(callback, &periodic_callback))) + return hr; + + hr = create_async_result(context, periodic_callback, NULL, &result); + IMFAsyncCallback_Release(periodic_callback); + if (FAILED(hr)) + return hr; + + hr = queue_submit_timer(queue, result, 0, get_timer_period(), key ? &workitem_key : NULL); + + IMFAsyncResult_Release(result); + + if (key) + *key = workitem_key; + + return S_OK; +} + +/*********************************************************************** + * MFRemovePeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key) +{ + struct queue *queue; + HRESULT hr; + + TRACE("%#x.\n", key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + return queue_cancel_item(queue, get_item_key(SCHEDULED_ITEM_KEY_MASK, key)); +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2a2189b4d3..e413d61dfa 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -45,6 +45,8 @@ static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); +static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); +static HRESULT (WINAPI *pMFRemovePeriodicCallback)(DWORD key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -314,6 +316,7 @@ static void init_functions(void) HMODULE mod = GetModuleHandleA("mfplat.dll"); #define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); X(MFCreateSourceResolver); @@ -322,6 +325,7 @@ static void init_functions(void) X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); + X(MFRemovePeriodicCallback); #undef X } @@ -1199,6 +1203,49 @@ static void test_serial_queue(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static LONG periodic_counter; +static void CALLBACK periodic_callback(IUnknown *context) +{ + InterlockedIncrement(&periodic_counter); +} + +static void test_periodic_callback(void) +{ + DWORD period, key; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + period = 0; + hr = MFGetTimerPeriodicity(&period); + ok(hr == S_OK, "Failed to get timer perdiod, hr %#x.\n", hr); + ok(period == 10, "Unexpected period %u.\n", period); + + if (!pMFAddPeriodicCallback) + { + win_skip("Periodic callbacks are not supported.\n"); + MFShutdown(); + return; + } + + ok(periodic_counter == 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = pMFAddPeriodicCallback(periodic_callback, NULL, &key); + ok(hr == S_OK, "Failed to add periodic callback, hr %#x.\n", hr); + ok(key != 0, "Unexpected key %#x.\n", key); + + Sleep(10 * period); + + hr = pMFRemovePeriodicCallback(key); + ok(hr == S_OK, "Failed to remove callback, hr %#x.\n", hr); + + ok(periodic_counter > 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1222,6 +1269,7 @@ START_TEST(mfplat) test_MFHeapAlloc(); test_scheduled_items(); test_serial_queue(); + test_periodic_callback(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index ee5cf4c069..129a19c883 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -95,6 +95,9 @@ typedef enum MF_MULTITHREADED_WORKQUEUE, } MFASYNC_WORKQUEUE_TYPE; +typedef void (*CALLBACK MFPERIODICCALLBACK)(IUnknown *context); + +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -131,6 +134,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 2.20.1

2 9

Re: wine-mono 4.8.0 build
by Hin-Tak Leung 04 Mar '19

04 Mar '19

It is trying to fetch stuff from mono's web site with wget, and not finding wget, nor getting an internet connection... I think the get-monolite-latest dependency is what tries to fetch stuff from online. -------------------------------------------- On Mon, 4/3/19, Michael Cronenworth <mike(a)cchtml.com> wrote: Subject: wine-mono 4.8.0 build To: wine-devel(a)winehq.org Date: Monday, 4 March, 2019, 4:52 Hi, The 4.8.0 wine-mono release cannot be built from source on Fedora. There seems to be something missing from the build root or not compiling during the build and I cannot see what it is. Can I borrow another set of eyes to look at the build output? Build log: https://kojipkgs.fedoraproject.org//work/tasks/7904/33137904/build.log Koji task: https://koji.fedoraproject.org/koji/taskinfo?taskID=33137904 Thanks, Michael

2 1

[PATCH v2 vkd3d 8/8] tests: Skip DXGI_FORMAT_R24G8_TYPELESS tests on radv.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Allows running all tests cleanly on radv. We have to implement formats emulation in vkd3d to fix the test. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac58565a45fa..0e32f4067244 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16162,6 +16162,13 @@ static void test_depth_stencil_sampling(void) { vkd3d_test_set_context("Test %u", i); + /* FIXME: Implement format substitution. */ + if (tests[i].typeless_format == DXGI_FORMAT_R24G8_TYPELESS && is_radv_device(device)) + { + skip("radv doesn't support VK_FORMAT_D24_UNORM_S8_UINT.\n"); + continue; + } + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, -- 2.19.2

2 1

[PATCH vkd3d 7/8] tests: Mark driver-specific test failures as bugs.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Allows running all tests cleanly on Intel and Nvidia. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 57 +++++++++++++++++++++++++++++------- tests/d3d12.c | 35 ++++++++++++++++------ tests/d3d12_crosstest.h | 38 ++++++++++++++++++++++-- 3 files changed, 109 insertions(+), 21 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index ccc5350a2acb..d7593e2649ff 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -57,7 +57,7 @@ static void vkd3d_test_end_todo(void); unsigned int vkd3d_line = line; \ VKD3D_TEST_TODO -# define VKD3D_TEST_TODO(args...) \ +#define VKD3D_TEST_TODO(args...) \ vkd3d_test_todo(vkd3d_line, args); } while (0) #define skip_(line) \ @@ -79,6 +79,9 @@ static void vkd3d_test_end_todo(void); #define todo_if(is_todo) \ for (vkd3d_test_start_todo(is_todo); vkd3d_test_loop_todo(); vkd3d_test_end_todo()) +#define bug_if(is_bug) \ + for (vkd3d_test_start_bug(is_bug); vkd3d_test_loop_bug(); vkd3d_test_end_bug()) + #define todo todo_if(true) static struct @@ -88,12 +91,16 @@ static struct LONG skip_count; LONG todo_count; LONG todo_success_count; + LONG bug_count; unsigned int debug_level; unsigned int todo_level; bool todo_do_loop; + unsigned int bug_level; + bool bug_do_loop; + char context[1024]; } vkd3d_test_state; @@ -113,33 +120,44 @@ static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); + bool is_bug = vkd3d_test_state.bug_level && !vkd3d_test_platform_is_windows(); - if (is_todo) + if (is_bug) + { + InterlockedIncrement(&vkd3d_test_state.bug_count); + if (is_todo) + result = !result; + if (result) + printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + else + printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + vprintf(fmt, args); + } + else if (is_todo) { if (result) { - printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); - vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); + printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); } else { - printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); - vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); + printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); } + vprintf(fmt, args); } else if (result) { + InterlockedIncrement(&vkd3d_test_state.success_count); if (vkd3d_test_state.debug_level > 1) printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); - InterlockedIncrement(&vkd3d_test_state.success_count); } else { + InterlockedIncrement(&vkd3d_test_state.failure_count); printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); - InterlockedIncrement(&vkd3d_test_state.failure_count); } } @@ -217,7 +235,7 @@ int main(int argc, char **argv) vkd3d_test_main(argc, argv); - printf("%s: %lu tests executed (%lu failures, %lu skipped, %lu todo).\n", + printf("%s: %lu tests executed (%lu failures, %lu skipped, %lu todo, %lu bugs).\n", vkd3d_test_name, (unsigned long)(vkd3d_test_state.success_count + vkd3d_test_state.failure_count + vkd3d_test_state.todo_count @@ -225,7 +243,8 @@ int main(int argc, char **argv) (unsigned long)(vkd3d_test_state.failure_count + vkd3d_test_state.todo_success_count), (unsigned long)vkd3d_test_state.skip_count, - (unsigned long)vkd3d_test_state.todo_count); + (unsigned long)vkd3d_test_state.todo_count, + (unsigned long)vkd3d_test_state.bug_count); if (test_platform) free(test_platform); @@ -306,6 +325,24 @@ static inline void vkd3d_test_end_todo(void) vkd3d_test_state.todo_level >>= 1; } +static inline void vkd3d_test_start_bug(bool is_bug) +{ + vkd3d_test_state.bug_level = (vkd3d_test_state.bug_level << 1) | is_bug; + vkd3d_test_state.bug_do_loop = true; +} + +static inline int vkd3d_test_loop_bug(void) +{ + bool do_loop = vkd3d_test_state.bug_do_loop; + vkd3d_test_state.bug_do_loop = false; + return do_loop; +} + +static inline void vkd3d_test_end_bug(void) +{ + vkd3d_test_state.bug_level >>= 1; +} + static inline void vkd3d_test_set_context(const char *fmt, ...) { va_list args; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5393072f203a..ac58565a45fa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5569,6 +5569,7 @@ static void test_draw_uav_only(void) D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_ROOT_PARAMETER root_parameter; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -5650,7 +5651,10 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) + check_readback_data_uint(&rb, NULL, 500, 0); + release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); ID3D12DescriptorHeap_Release(descriptor_heap); @@ -7865,6 +7869,7 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; + bool skip_on_mesa; } tests[] = { @@ -7904,25 +7909,26 @@ static void test_shader_instructions(void) {&ps_if, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_if, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + /* FIXME: Ordered/unordered comparisons are broken on Mesa. */ {&ps_if_return, {{0.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, + {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}, false, true}, {&ps_if_return, {{3.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, + {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, {&ps_if_return, {{4.0f, 3.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, + {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, {&ps_if_return, {{4.0f, 4.0f, 3.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 4.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 5.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, + {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 2.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 3.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 4.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_if_return, {{5.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, + {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, {&ps_nested_if, {{0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_nested_if, {{0.0f, 0.0f, 1.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, @@ -8628,6 +8634,12 @@ static void test_shader_instructions(void) continue; } + if (tests[i].skip_on_mesa && is_mesa_device(context.device)) + { + skip("Skipping shader '%s' test on Mesa.\n", tests[i].ps->name); + continue; + } + if (current_ps != tests[i].ps) { if (context.pipeline_state) @@ -16214,7 +16226,7 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); continue; } - if (is_amd_device(device)) + if (is_amd_windows_device(device)) { skip("Reads from depth/stencil shader resource views return stale values on some AMD drivers.\n"); destroy_depth_stencil(&ds); @@ -18511,6 +18523,7 @@ static void test_atomic_instructions(void) ID3D12CommandQueue *queue; ID3D12Device *device; unsigned int i, j; + bool is_todo; HRESULT hr; static const DWORD ps_atomics_code[] = @@ -18721,8 +18734,11 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - todo_if(test->i.x < 0 - && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"))) + is_todo = test->i.x < 0 + && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin")); + + bug_if(is_todo && is_nvidia_device(device)) + todo_if(is_todo) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, instructions[j], @@ -18741,6 +18757,7 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; + bug_if(test->i.x < 0 && todo_instruction && is_nvidia_device(device)) todo_if(test->i.x < 0 && todo_instruction) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index d0019dc85042..be6076a45950 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -296,7 +296,7 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } -static inline bool is_amd_device(ID3D12Device *device) +static inline bool is_amd_windows_device(ID3D12Device *device) { DXGI_ADAPTER_DESC desc = {0}; IDXGIFactory4 *factory; @@ -324,8 +324,24 @@ static inline bool is_amd_device(ID3D12Device *device) return desc.VendorId == 0x1002; } + +static inline bool is_mesa_device(ID3D12Device *device) +{ + return false; +} + +static inline bool is_nvidia_device(ID3D12Device *device) +{ + return false; +} + +static inline bool is_radv_device(ID3D12Device *device) +{ + return false; +} #else static bool have_VK_KHR_driver_properties; +static VkDriverIdKHR vk_driver_id; static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) { @@ -484,16 +500,34 @@ static void init_adapter_info(void) trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + vk_driver_id = driver_properties.driverID; + ID3D12Device_Release(device); done: vkd3d_instance_decref(instance); } -static inline bool is_amd_device(ID3D12Device *device) +static inline bool is_amd_windows_device(ID3D12Device *device) { return false; } + +static inline bool is_mesa_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR + || vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; +} + +static inline bool is_nvidia_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; +} + +static inline bool is_radv_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR; +} #endif static ID3D12Device *create_device(void) -- 2.19.2

2 1

[PATCH v2 vkd3d 6/8] tests: Print driver info from VK_KHR_driver_properties.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for the next commit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 3 +- tests/d3d12_crosstest.h | 161 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d854a5b7971b..0bd788974ac5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,8 @@ AM_DEFAULT_SOURCE_EXT = .c if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) -tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ +tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ +tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la endif diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6357d48fe7ea..d0019dc85042 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -55,6 +55,7 @@ typedef int HRESULT; # include "vkd3d_dxgi1_4.h" #else # include <pthread.h> +# include "vkd3d.h" # include "vkd3d_utils.h" #endif @@ -324,12 +325,170 @@ static inline bool is_amd_device(ID3D12Device *device) return desc.VendorId == 0x1002; } #else +static bool have_VK_KHR_driver_properties; + +static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) +{ + struct vkd3d_optional_instance_extensions_info optional_extensions_info; + struct vkd3d_instance_create_info instance_create_info; + + static const char * const optional_instance_extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + }; + + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + + memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = &optional_extensions_info; + instance_create_info.pfn_signal_event = vkd3d_signal_event; + instance_create_info.wchar_size = sizeof(WCHAR); + + return vkd3d_create_instance(&instance_create_info, instance); +} + +static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_device_create_info device_create_info; + + static const char * const device_extensions[] = + { + VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, + }; + + memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.minimum_feature_level = minimum_feature_level; + device_create_info.instance = instance; + if (have_VK_KHR_driver_properties) + { + device_create_info.device_extensions = device_extensions; + device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + } + + return vkd3d_create_device(&device_create_info, iid, device); +} + +static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) +{ + VkExtensionProperties *properties; + bool ret = false; + unsigned int i; + uint32_t count; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return false; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = true; + break; + } + } + + free(properties); + return ret; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_instance *instance; + HRESULT hr; + + if (SUCCEEDED(hr = create_vkd3d_instance(&instance))) + { + hr = create_vkd3d_device(instance, minimum_feature_level, iid, device); + vkd3d_instance_decref(instance); + } + + return hr; +} + static IUnknown *create_adapter(void) { return NULL; } -static void init_adapter_info(void) {} +static void init_adapter_info(void) +{ + PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties2 device_properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + struct vkd3d_instance *instance; + VkInstance vk_instance; + ID3D12Device *device; + uint32_t count, i; + VkResult vr; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + have_VK_KHR_driver_properties = true; + for (i = 0; i < count; ++i) + { + if (!check_device_extension(vk_physical_devices[i],VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) + { + have_VK_KHR_driver_properties = false; + break; + } + } + + free(vk_physical_devices); + + if (!have_VK_KHR_driver_properties) + goto done; + + if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + goto done; + + vk_physical_device = vkd3d_get_vk_physical_device(device); + + pfn_vkGetPhysicalDeviceProperties2KHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); + + memset(&device_properties2, 0, sizeof(device_properties2)); + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &driver_properties; + memset(&driver_properties, 0, sizeof(driver_properties)); + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + + ID3D12Device_Release(device); + +done: + vkd3d_instance_decref(instance); +} static inline bool is_amd_device(ID3D12Device *device) { -- 2.19.2

2 1

[PATCH vkd3d 5/8] vkd3d: Set Vulkan object names for NULL CBV resources.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 9 +++++++++ libs/vkd3d/utils.c | 26 ++++++++++++++++++-------- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index df3ab5d7953c..f197c93faaa3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2895,6 +2895,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, { D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC buffer_desc; + VkResult vr; HRESULT hr; memset(null_resources, 0, sizeof(*null_resources)); @@ -2918,10 +2919,18 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &buffer_desc, &null_resources->vk_uniform_buffer))) goto fail; + if ((vr = vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL CBV buffer")) < 0) + WARN("Failed to set object name, vr %d.\n", vr); + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_uniform_buffer, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_uniform_buffer_memory))) goto fail; + if ((vr = vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL CBV memory")) < 0) + WARN("Failed to set object name, vr %d.\n", vr); + return S_OK; fail: diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 27333f29415b..666319e46d90 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -643,11 +643,26 @@ HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, return hr; } -HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const char *name) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDebugMarkerObjectNameInfoEXT info; + + if (!device->vk_info.EXT_debug_marker) + return VK_SUCCESS; + + info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; + info.pNext = NULL; + info.objectType = vk_object_type; + info.object = vk_object; + info.pObjectName = name; + return VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); +} + +HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) +{ char *name_utf8; VkResult vr; @@ -660,12 +675,7 @@ HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object if (!(name_utf8 = vkd3d_strdup_w_utf8(name, device->wchar_size))) return E_OUTOFMEMORY; - info.sType = VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT; - info.pNext = NULL; - info.objectType = vk_object_type; - info.object = vk_object; - info.pObjectName = name_utf8; - vr = VK_CALL(vkDebugMarkerSetObjectNameEXT(device->vk_device, &info)); + vr = vkd3d_set_vk_object_name_utf8(device, vk_object, vk_object_type, name_utf8); vkd3d_free(name_utf8); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9ddc50e9a25f..fa2c4609600c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1043,6 +1043,8 @@ static inline void vkd3d_set_thread_name(const char *name) #endif } +VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, + VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 4/8] tests: Accumulate coverage mask from all fragments.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Clipping may divide the triangle and produce multiple fragments per pixel. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 160 +++++++++++++++++++-------------------- tests/d3d12_test_utils.h | 8 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 44e128a910d8..5393072f203a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -24965,74 +24965,60 @@ static void test_sample_mask(void) static void test_coverage(void) { - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; ID3D12GraphicsCommandList *command_list; - D3D12_CPU_DESCRIPTOR_HANDLE ms_rtv; - ID3D12Resource *ms_render_target; - ID3D12PipelineState *pso_resolve; + D3D12_ROOT_PARAMETER root_parameters[1]; struct test_context_desc desc; struct test_context context; - ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; + ID3D12Resource *texture; unsigned int i; HRESULT hr; + static const float black[4]; + static const unsigned int zero[4]; static const DWORD ps_code[] = { #if 0 - uint4 main(uint coverage : SV_Coverage) : SV_Target - { - return coverage; - } -#endif - 0x43425844, 0x0d652986, 0x6144c247, 0x743bacfa, 0x95068994, 0x00000001, 0x000000ac, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000034, 0x00000050, 0x0000000d, - 0x0100086a, 0x0200005f, 0x00023001, 0x03000065, 0x001020f2, 0x00000000, 0x04000036, 0x001020f2, - 0x00000000, 0x00023006, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; - static const DWORD ps_resolve_code[] = - { -#if 0 - Texture2DMS<uint> t; + RWTexture2D<uint> u; - uint4 main(float4 position : SV_Position) : SV_Target + float4 main(float4 position : SV_Position, uint coverage : SV_Coverage) : SV_Target { - return t.Load((int2)position.xy, 0); + InterlockedOr(u[uint2(position.x, position.y)], coverage); + return float4(0.0, 1.0, 0.0, 1.0); } #endif - 0x43425844, 0x280a495f, 0x88543834, 0x1fd0597d, 0xe7ed74ac, 0x00000001, 0x00000154, 0x00000003, + 0x43425844, 0x53236006, 0x68a61a42, 0x5d0a06e7, 0x05a9405b, 0x00000001, 0x00000134, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000b8, 0x00000050, - 0x0000002e, 0x0100086a, 0x04002058, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, - 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001b, - 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8b00002e, 0x80000102, 0x00111103, 0x00100012, - 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x00004001, 0x00000000, 0x05000036, - 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000098, 0x00000050, + 0x00000026, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x0200005f, 0x00023001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0500001c, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x060000aa, 0x0011e000, + 0x00000001, 0x00100046, 0x00000000, 0x0002300a, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_resolve = {ps_resolve_code, sizeof(ps_resolve_code)}; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; static const struct { unsigned int sample_mask; - unsigned int expected_result; + unsigned int expected_color; } tests[] = { - {0x01, 0x1}, - {0x03, 0x3}, - {0x07, 0x7}, - {0x09, 0x9}, - {0x0d, 0xd}, - {0x0f, 0xf}, - {0xff, 0xf}, - { ~0u, 0xf}, + {0x01, 0x40004000}, + {0x03, 0x7f007f00}, + {0x07, 0xbf00bf00}, + {0x09, 0x7f007f00}, + {0x0d, 0xbf00bf00}, + {0x0f, 0xff00ff00}, + {0xff, 0xff00ff00}, + { ~0u, 0xff00ff00}, }; if (use_warp_device) @@ -25043,27 +25029,41 @@ static void test_coverage(void) memset(&desc, 0, sizeof(desc)); desc.rt_width = desc.rt_height = 32; - desc.rt_format = DXGI_FORMAT_R32_UINT; - desc.rt_descriptor_count = 2; + desc.sample_desc.Count = 4; desc.no_root_signature = true; if (!init_test_context(&context, &desc)) return; command_list = context.list; queue = context.queue; - context.root_signature = create_texture_root_signature(context.device, - D3D12_SHADER_VISIBILITY_PIXEL, 1, 0); - - ms_rtv = get_cpu_rtv_handle(&context, context.rtv_heap, 1); - desc.sample_desc.Count = 4; - create_render_target(&context, &desc, &ms_render_target, &ms_rtv); + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 1; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = ARRAY_SIZE(descriptor_ranges); + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); - heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); - ID3D12Device_CreateShaderResourceView(context.device, ms_render_target, NULL, - get_cpu_descriptor_handle(&context, heap, 0)); + texture = create_default_texture(context.device, desc.rt_width, desc.rt_height, DXGI_FORMAT_R32_UINT, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - pso_resolve = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, NULL, &ps_resolve, NULL); + cpu_heap = create_cpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + ID3D12Device_CreateUnorderedAccessView(context.device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + ID3D12Device_CopyDescriptorsSimple(context.device, 1, + get_cpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -25075,50 +25075,50 @@ static void test_coverage(void) init_pipeline_state_desc(&pso_desc, context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); pso_desc.SampleMask = tests[i].sample_mask; - pso_desc.SampleDesc.Count = 4; + pso_desc.SampleDesc.Count = desc.sample_desc.Count; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, ms_rtv, white, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &ms_rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + texture, zero, 0, NULL); - transition_resource_state(command_list, ms_render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + uav_barrier(command_list, texture); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_resolve); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, - get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, gpu_heap, 0)); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - transition_resource_state(command_list, ms_render_target, - D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_result, 0); + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_RESOLVE_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 2); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(texture, 0, queue, command_list, tests[i].sample_mask & 0xf, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); } vkd3d_test_set_context(NULL); - ID3D12DescriptorHeap_Release(heap); - ID3D12PipelineState_Release(pso_resolve); - ID3D12Resource_Release(ms_render_target); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + ID3D12Resource_Release(texture); destroy_test_context(&context); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 6ccbc64981b9..1b2aec5959f0 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -315,14 +315,14 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &resource_desc, D3D12_RESOURCE_STATE_RESOLVE_DEST, NULL, &IID_ID3D12Resource, (void **)&src_resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); ID3D12GraphicsCommandList_ResolveSubresource(command_list, src_resource, 0, texture, sub_resource, resource_desc.Format); transition_resource_state(command_list, src_resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); sub_resource = 0; } @@ -637,7 +637,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex resource_desc.MipLevels = 1; resource_desc.Format = desc && desc->rt_format ? desc->rt_format : DXGI_FORMAT_R8G8B8A8_UNORM; resource_desc.SampleDesc.Count = desc && desc->sample_desc.Count ? desc->sample_desc.Count : 1; - resource_desc.SampleDesc.Quality = desc ? desc->sample_desc.Quality : 0; + resource_desc.SampleDesc.Quality = desc && desc->sample_desc.Count ? desc->sample_desc.Quality : 0; resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; clear_value.Format = resource_desc.Format; @@ -649,7 +649,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)render_target); - ok_(line)(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); context->render_target_desc = resource_desc; -- 2.19.2

2 1

[PATCH vkd3d 3/8] vkd3d: Prefer cached memory for readback heaps.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Reading uncached memory is slow. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 06e7c7dcb52c..df3ab5d7953c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -24,21 +24,26 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; - VkMemoryPropertyFlags required_flags; - unsigned int i; + VkMemoryPropertyFlags flags[2]; + unsigned int i, j, count = 0; switch (heap_properties->Type) { case D3D12_HEAP_TYPE_DEFAULT: - required_flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + break; + + case D3D12_HEAP_TYPE_UPLOAD: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); /* fall-through */ - case D3D12_HEAP_TYPE_UPLOAD: case D3D12_HEAP_TYPE_READBACK: - required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; default: @@ -46,12 +51,17 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 return ~0u; } - for (i = 0; i < memory_info->memoryTypeCount; ++i) + for (j = 0; j < count; ++j) { - if (!(memory_type_mask & (1u << i))) - continue; - if ((memory_info->memoryTypes[i].propertyFlags & required_flags) == required_flags) - return i; + VkMemoryPropertyFlags preferred_flags = flags[j]; + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & preferred_flags) == preferred_flags) + return i; + } } return ~0u; -- 2.19.2

2 1

[PATCH vkd3d 2/8] tests: Add basic test for NULL CBV descriptors.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 2 + tests/d3d12.c | 116 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 231123bd672f..a1f87b22e87e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,8 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; +const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_MIP_LEVELS = 15; const UINT D3D12_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION = 2048; const UINT D3D12_REQ_TEXTURE1D_U_DIMENSION = 16384; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5ae8511fc74a..44e128a910d8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15387,7 +15387,7 @@ static void test_descriptors_visibility(void) destroy_test_context(&context); } -static void test_null_descriptors(void) +static void test_create_null_descriptors(void) { D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; @@ -15456,6 +15456,117 @@ static void test_null_descriptors(void) destroy_test_context(&context); } +static void test_null_cbv(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + D3D12_DESCRIPTOR_RANGE descriptor_range; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int index; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + uint index; + + cbuffer null_cb + { + float4 data[1024]; + }; + + float4 main() : SV_Target + { + return data[index]; + } +#endif + 0x43425844, 0xa69026e2, 0xccf934be, 0x11f0a922, 0x95e9ab51, 0x00000001, 0x000000f0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000078, 0x00000050, 0x0000001e, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, 0x00000001, + 0x00000400, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000036, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x04208e46, + 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + device = context.device; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 1; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 1; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + + cbv_desc.BufferLocation = 0; + cbv_desc.SizeInBytes = 0; /* Size doesn't appear to matter for NULL CBV. */ + ID3D12Device_CreateConstantBufferView(device, &cbv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (index = 0; index < 1200; index += 100) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &index, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(context.render_target, 0, queue, command_list, 0x00000000, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, @@ -25371,7 +25482,8 @@ START_TEST(d3d12) run_test(test_copy_descriptors); run_test(test_copy_descriptors_range_sizes); run_test(test_descriptors_visibility); - run_test(test_null_descriptors); + run_test(test_create_null_descriptors); + run_test(test_null_cbv); run_test(test_get_copyable_footprints); run_test(test_depth_stencil_sampling); run_test(test_depth_load); -- 2.19.2

2 1

[PATCH vkd3d 1/8] vkd3d: Emulate NULL CBV descriptors.
by Józef Kucia 04 Mar '19

04 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 6 +++ libs/vkd3d/resource.c | 83 +++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 14 +++++++ 3 files changed, 89 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3d9b8c9aae8d..c1de98f4a2ba 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1536,6 +1536,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_private_store_destroy(&device->private_store); + vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); @@ -2704,6 +2705,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) goto out_free_private_store; + if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + goto out_stop_fence_worker; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) @@ -2711,6 +2715,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return S_OK; +out_stop_fence_worker: + vkd3d_fence_worker_stop(&device->fence_worker, device); out_free_private_store: vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1176538f5c54..06e7c7dcb52c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,10 +18,12 @@ #include "vkd3d_private.h" +#define VKD3D_NULL_CBV_BUFFER_SIZE 4 + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { - VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; + const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; VkMemoryPropertyFlags required_flags; unsigned int i; @@ -517,10 +519,10 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, if ((vr = VK_CALL(vkCreateBuffer(device->vk_device, &buffer_info, NULL, vk_buffer))) < 0) { WARN("Failed to create Vulkan buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); + *vk_buffer = VK_NULL_HANDLE; } - return S_OK; + return hresult_from_vk_result(vr); } static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) @@ -670,10 +672,9 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu WARN("Failed to bind memory, vr %d.\n", vr); VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); *vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); } - return S_OK; + return hresult_from_vk_result(vr); } static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, @@ -1753,17 +1754,21 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, return; } - if (!desc->BufferLocation) + buffer_info = &descriptor->u.vk_cbv_info; + if (desc->BufferLocation) { - FIXME("NULL CBV not implemented.\n"); - return; + resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); + buffer_info->buffer = resource->u.vk_buffer; + buffer_info->offset = desc->BufferLocation - resource->gpu_address; + buffer_info->range = min(desc->SizeInBytes, resource->desc.Width - buffer_info->offset); + } + else + { + /* NULL descriptor */ + buffer_info->buffer = device->null_resources.vk_uniform_buffer; + buffer_info->offset = 0; + buffer_info->range = VKD3D_NULL_CBV_BUFFER_SIZE; } - - resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, desc->BufferLocation); - buffer_info = &descriptor->u.vk_cbv_info; - buffer_info->buffer = resource->u.vk_buffer; - buffer_info->offset = desc->BufferLocation - resource->gpu_address; - buffer_info->range = min(desc->SizeInBytes, resource->desc.Width - buffer_info->offset); descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; @@ -2874,3 +2879,53 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return S_OK; } + +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) +{ + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC buffer_desc; + HRESULT hr; + + memset(null_resources, 0, sizeof(*null_resources)); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + buffer_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + buffer_desc.Alignment = 0; + buffer_desc.Width = VKD3D_NULL_CBV_BUFFER_SIZE; + buffer_desc.Height = 1; + buffer_desc.DepthOrArraySize = 1; + buffer_desc.MipLevels = 1; + buffer_desc.Format = DXGI_FORMAT_UNKNOWN; + buffer_desc.SampleDesc.Count = 1; + buffer_desc.SampleDesc.Quality = 0; + buffer_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + buffer_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; + + if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &buffer_desc, &null_resources->vk_uniform_buffer))) + goto fail; + + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_uniform_buffer, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_uniform_buffer_memory))) + goto fail; + + return S_OK; + +fail: + ERR("Failed to initialize NULL resources, hr %#x.\n", hr); + vkd3d_destroy_null_resources(null_resources, device); + return hr; +} + +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_uniform_buffer, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_uniform_buffer_memory, NULL)); + memset(null_resources, 0, sizeof(*null_resources)); +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b2fbaf4abe0..9ddc50e9a25f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -868,6 +868,18 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ struct d3d12_command_signature **signature) DECLSPEC_HIDDEN; struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN; +/* NULL resources */ +struct vkd3d_null_resources +{ + VkBuffer vk_uniform_buffer; + VkDeviceMemory vk_uniform_buffer_memory; +}; + +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, + struct d3d12_device *device) DECLSPEC_HIDDEN; + /* ID3D12Device */ struct d3d12_device { @@ -910,6 +922,8 @@ struct d3d12_device struct vkd3d_private_store private_store; HRESULT removed_reason; + + struct vkd3d_null_resources null_resources; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, -- 2.19.2

2 1

[PATCH] dsound: Remove useless casts to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/primary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9f41a2b47f..852ec51b7f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -576,7 +576,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LO for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i){ - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); @@ -932,7 +932,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG for (i = 0; i < DS_MAX_CHANNELS; i++) { if (device->pwfx->nChannels > i) { - fvol = (float)((DWORD)(device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); + fvol = (float)((device->volpan.dwTotalAmpFactor[i] & 0xFFFF) / (float)0xFFFF); hr = IAudioStreamVolume_SetChannelVolume(device->volume, i, fvol); if (FAILED(hr)){ LeaveCriticalSection(&device->mixlock); -- 2.20.1

3 6

[PATCH] winmm: Remove useless casts to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 959773cae4..afdf9d392f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3124,9 +3124,9 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) return MMSYSERR_ERROR; } - vols[0] = (float)((DWORD)(in & 0xFFFF) / (float)0xFFFF); + vols[0] = (float)((in & 0xFFFF) / (float)0xFFFF); if(channels > 1) - vols[1] = (float)((DWORD)(in >> 16) / (float)0xFFFF); + vols[1] = (float)((in >> 16) / (float)0xFFFF); hr = IAudioStreamVolume_SetAllVolumes(device->volume, channels, vols); if(FAILED(hr)){ -- 2.20.1

2 1

[PATCH v2 1/2] ntdll/tests: Add test for preserving x87 fpu state when capturing context.
by Paul Gofman 04 Mar '19

04 Mar '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - simplify test. dlls/ntdll/tests/exception.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b8bd186632..f1a59f1dac 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1509,9 +1509,12 @@ static void test_thread_context(void) struct expected { DWORD Eax, Ebx, Ecx, Edx, Esi, Edi, Ebp, Esp, Eip, - SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame; + SegCs, SegDs, SegEs, SegFs, SegGs, SegSs, EFlags, prev_frame, + x87_control; } expect; - NTSTATUS (*func_ptr)( struct expected *res, void *func, void *arg1, void *arg2 ) = (void *)code_mem; + NTSTATUS (*func_ptr)( struct expected *res, void *func, void *arg1, void *arg2, + DWORD *new_x87_control ) = (void *)code_mem; + DWORD new_x87_control; static const BYTE call_func[] = { @@ -1542,10 +1545,20 @@ static void test_thread_context(void) 0x8f, 0x40, 0x3c, /* popl 0x3c(%eax) */ 0xff, 0x75, 0x00, /* pushl 0x0(%ebp) ; previous stack frame */ 0x8f, 0x40, 0x40, /* popl 0x40(%eax) */ + /* pushl $0x47f */ + 0x68, 0x7f, 0x04, 0x00, 0x00, + 0x8f, 0x40, 0x44, /* popl 0x44(%eax) */ + 0xd9, 0x68, 0x44, /* fldcw 0x44(%eax) */ + 0x8b, 0x00, /* mov (%eax),%eax */ 0xff, 0x75, 0x14, /* pushl 0x14(%ebp) */ 0xff, 0x75, 0x10, /* pushl 0x10(%ebp) */ 0xff, 0x55, 0x0c, /* call *0xc(%ebp) */ + + 0x8b, 0x55, 0x18, /* mov 0x18(%ebp),%edx */ + 0x9b, 0xd9, 0x3a, /* fstcw (%edx) */ + 0xdb, 0xe3, /* fninit */ + 0xc9, /* leave */ 0xc3, /* ret */ }; @@ -1557,7 +1570,7 @@ static void test_thread_context(void) memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); - func_ptr( &expect, pRtlCaptureContext, &context, 0 ); + func_ptr( &expect, pRtlCaptureContext, &context, 0, &new_x87_control ); trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", expect.Eax, expect.Ebx, expect.Ecx, expect.Edx, expect.Esi, expect.Edi, @@ -1593,8 +1606,9 @@ static void test_thread_context(void) memset( &context, 0xcc, sizeof(context) ); memset( &expect, 0xcc, sizeof(expect) ); - context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; - status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context ); + context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT; + + status = func_ptr( &expect, pNtGetContextThread, (void *)GetCurrentThread(), &context, &new_x87_control ); ok( status == STATUS_SUCCESS, "NtGetContextThread failed %08x\n", status ); trace( "expect: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x ebp=%08x esp=%08x " "eip=%08x cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", @@ -1625,6 +1639,13 @@ static void test_thread_context(void) ok( context.SegFs == LOWORD(expect.SegFs), "wrong SegFs %08x/%08x\n", context.SegFs, expect.SegFs ); ok( context.SegGs == LOWORD(expect.SegGs), "wrong SegGs %08x/%08x\n", context.SegGs, expect.SegGs ); ok( context.SegSs == LOWORD(expect.SegSs), "wrong SegSs %08x/%08x\n", context.SegSs, expect.SegGs ); + + ok( LOWORD(context.FloatSave.ControlWord) == LOWORD(expect.x87_control), + "wrong x87 control word %#x/%#x.\n", context.FloatSave.ControlWord, expect.x87_control ); + todo_wine ok( LOWORD(expect.x87_control) == LOWORD(new_x87_control), + "x87 control word changed in NtGetContextThread() %#x/%#x.\n", + LOWORD(expect.x87_control), LOWORD(new_x87_control) ); + #undef COMPARE } -- 2.20.1

1 1

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series implements a way for ntoskrnl to reflect server objects in its address space. The mapping as well as life time management is done on server side, which informs client when it's safe its client side struct. Client side has a way to notify server that it needs to keep a reference, providing a way to hold server reference. Client may also get a handle from its object and use it to perform an implementation using already existing mechanisms. The last patch of this series uses then new infrastructure to implement event object. It's pretty straightforward. I have patches for more object as well moving existing device_file and device objects to use the new infrastructure in a queue. server/device.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- server/object.c | 2 ++ server/object.h | 2 ++ 3 files changed, 47 insertions(+), 3 deletions(-)

1 1

[PATCH] wshom.ocx: Fix string length returned from Check returned BSTR length.
by Nikolay Sivov 04 Mar '19

04 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46754 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 14 ++++++++------ dlls/wshom.ocx/tests/wshom.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index ca4f7ff899..57f17464be 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -455,14 +455,16 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return E_POINTER; len = GetEnvironmentVariableW(name, NULL, 0); - *value = SysAllocStringLen(NULL, len); - if (!*value) - return E_OUTOFMEMORY; - if (len) - GetEnvironmentVariableW(name, *value, len+1); + { + *value = SysAllocStringLen(NULL, len - 1); + if (*value) + GetEnvironmentVariableW(name, *value, len); + } + else + *value = SysAllocStringLen(NULL, 0); - return S_OK; + return *value ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c1f9519ff8..c00f7abfa8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -56,6 +56,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ITypeInfo_Release(ti); } +#define CHECK_BSTR_LENGTH(str) check_bstr_length(str, __LINE__) +static void check_bstr_length(BSTR str, int line) +{ + ok_(__FILE__, line)(SysStringLen(str) == lstrlenW(str), "Unexpected string length %u vs %u.\n", + SysStringLen(str), lstrlenW(str)); +} + static void test_wshshell(void) { static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; @@ -156,6 +163,7 @@ static void test_wshshell(void) hr = IWshCollection_Item(coll, &arg, &res); EXPECT_HR(hr, S_OK); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + CHECK_BSTR_LENGTH(V_BSTR(&res)); SysFreeString(str); VariantClear(&res); @@ -211,6 +219,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -219,6 +228,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -304,6 +314,7 @@ static void test_wshshell(void) hr = IWshShell3_get_CurrentDirectory(sh3, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); @@ -440,6 +451,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -452,6 +464,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -528,6 +541,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + CHECK_BSTR_LENGTH(V_BSTR(&v)); VariantClear(&v); VariantClear(&value); -- 2.20.1

1 0

[PATCH 1/9] mfplat: Implement periodic callbacks.
by Nikolay Sivov 04 Mar '19

04 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 194 +++++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 48 +++++++++ include/mfapi.h | 4 + 4 files changed, 242 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c6234b006e..116ec61289 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -15,7 +15,7 @@ @ stub GetAMSubtypeFromD3DFormat @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool -@ stub MFAddPeriodicCallback +@ stdcall MFAddPeriodicCallback(ptr ptr ptr) @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) @ stub MFAppendCollection @@ -100,7 +100,7 @@ @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader @ stdcall MFGetSystemTime() -@ stub MFGetTimerPeriodicity +@ stdcall MFGetTimerPeriodicity(ptr) @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId @@ -125,7 +125,7 @@ @ stdcall MFPutWorkItem(long ptr ptr) @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError -@ stub MFRemovePeriodicCallback +@ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) @ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index f470cb44b5..e3b0687711 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -39,9 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static LONG next_item_key; +static MFWORKITEM_KEY get_item_key(DWORD mask, DWORD key) +{ + return ((MFWORKITEM_KEY)mask << 32) | key; +} + static MFWORKITEM_KEY generate_item_key(DWORD mask) { - return ((MFWORKITEM_KEY)mask << 32) | InterlockedIncrement(&next_item_key); + return get_item_key(mask, InterlockedIncrement(&next_item_key)); } struct work_item @@ -315,9 +320,10 @@ void shutdown_system_queues(void) LeaveCriticalSection(&queues_section); } -static void grab_work_item(struct work_item *item) +static struct work_item *grab_work_item(struct work_item *item) { InterlockedIncrement(&item->refcount); + return item; } static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) @@ -442,6 +448,15 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in release_work_item(item); } +static void CALLBACK periodic_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = grab_work_item(context); + + invoke_async_callback(item->result); + + release_work_item(item); +} + static void queue_mark_item_pending(DWORD mask, struct work_item *item, MFWORKITEM_KEY *key) { *key = generate_item_key(mask); @@ -478,7 +493,8 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit return S_OK; } -static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, DWORD period, + MFWORKITEM_KEY *key) { PTP_TIMER_CALLBACK callback; struct work_item *item; @@ -491,17 +507,19 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I if (key) { queue_mark_item_pending(SCHEDULED_ITEM_KEY_MASK, item, key); - callback = scheduled_item_cancelable_callback; } + + if (period) + callback = periodic_item_callback; else - callback = scheduled_item_callback; + callback = key ? scheduled_item_cancelable_callback : scheduled_item_callback; t.QuadPart = timeout * 1000 * 10; filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); - SetThreadpoolTimer(item->u.timer_object, &filetime, 0, 0); + SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); @@ -842,7 +860,7 @@ static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKI TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - hr = queue_submit_timer(queue, result, timeout, key); + hr = queue_submit_timer(queue, result, timeout, 0, key); return hr; } @@ -912,3 +930,165 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) return hr; } + +static DWORD get_timer_period(void) +{ + return 10; +} + +/*********************************************************************** + * MFGetTimerPeriodicity (mfplat.@) + */ +HRESULT WINAPI MFGetTimerPeriodicity(DWORD *period) +{ + TRACE("%p.\n", period); + + *period = get_timer_period(); + + return S_OK; +} + +struct periodic_callback +{ + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + MFPERIODICCALLBACK callback; +}; + +static struct periodic_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct periodic_callback, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI periodic_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI periodic_callback_AddRef(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedIncrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI periodic_callback_Release(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedDecrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + heap_free(callback); + + return refcount; +} + +static HRESULT WINAPI periodic_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI periodic_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + IUnknown *context = NULL; + + IMFAsyncResult_GetObject(result, &context); + + callback->callback(context); + + if (context) + IUnknown_Release(context); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl periodic_callback_vtbl = +{ + periodic_callback_QueryInterface, + periodic_callback_AddRef, + periodic_callback_Release, + periodic_callback_GetParameters, + periodic_callback_Invoke, +}; + +static HRESULT create_periodic_callback_obj(MFPERIODICCALLBACK callback, IMFAsyncCallback **out) +{ + struct periodic_callback *object; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl; + object->refcount = 1; + object->callback = callback; + + *out = &object->IMFAsyncCallback_iface; + + return S_OK; +} + +/*********************************************************************** + * MFAddPeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key) +{ + IMFAsyncCallback *periodic_callback; + MFWORKITEM_KEY workitem_key; + IMFAsyncResult *result; + struct queue *queue; + HRESULT hr; + + TRACE("%p, %p, %p.\n", callback, context, key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + if (FAILED(hr = create_periodic_callback_obj(callback, &periodic_callback))) + return hr; + + hr = create_async_result(context, periodic_callback, NULL, &result); + IMFAsyncCallback_Release(periodic_callback); + if (FAILED(hr)) + return hr; + + hr = queue_submit_timer(queue, result, 0, get_timer_period(), key ? &workitem_key : NULL); + + IMFAsyncResult_Release(result); + + if (key) + *key = workitem_key; + + return S_OK; +} + +/*********************************************************************** + * MFRemovePeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key) +{ + struct queue *queue; + HRESULT hr; + + TRACE("%#x.\n", key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + return queue_cancel_item(queue, get_item_key(SCHEDULED_ITEM_KEY_MASK, key)); +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2a2189b4d3..e413d61dfa 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -45,6 +45,8 @@ static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); +static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); +static HRESULT (WINAPI *pMFRemovePeriodicCallback)(DWORD key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -314,6 +316,7 @@ static void init_functions(void) HMODULE mod = GetModuleHandleA("mfplat.dll"); #define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); X(MFCreateSourceResolver); @@ -322,6 +325,7 @@ static void init_functions(void) X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); + X(MFRemovePeriodicCallback); #undef X } @@ -1199,6 +1203,49 @@ static void test_serial_queue(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static LONG periodic_counter; +static void CALLBACK periodic_callback(IUnknown *context) +{ + InterlockedIncrement(&periodic_counter); +} + +static void test_periodic_callback(void) +{ + DWORD period, key; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + period = 0; + hr = MFGetTimerPeriodicity(&period); + ok(hr == S_OK, "Failed to get timer perdiod, hr %#x.\n", hr); + ok(period == 10, "Unexpected period %u.\n", period); + + if (!pMFAddPeriodicCallback) + { + win_skip("Periodic callbacks are not supported.\n"); + MFShutdown(); + return; + } + + ok(periodic_counter == 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = pMFAddPeriodicCallback(periodic_callback, NULL, &key); + ok(hr == S_OK, "Failed to add periodic callback, hr %#x.\n", hr); + ok(key != 0, "Unexpected key %#x.\n", key); + + Sleep(10 * period); + + hr = pMFRemovePeriodicCallback(key); + ok(hr == S_OK, "Failed to remove callback, hr %#x.\n", hr); + + ok(periodic_counter > 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1222,6 +1269,7 @@ START_TEST(mfplat) test_MFHeapAlloc(); test_scheduled_items(); test_serial_queue(); + test_periodic_callback(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index ee5cf4c069..129a19c883 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -95,6 +95,9 @@ typedef enum MF_MULTITHREADED_WORKQUEUE, } MFASYNC_WORKQUEUE_TYPE; +typedef void (*CALLBACK MFPERIODICCALLBACK)(IUnknown *context); + +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -131,6 +134,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 2.20.1

2 11

[PATCH] secur32: Stop memory leak (Coverity).
by Alistair Leslie-Hughes 04 Mar '19

04 Mar '19

CID 1442946 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7c6bb96..8ac5bee 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -668,6 +668,7 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) heap_free(path); return NULL; } + heap_free(path); if (!RegQueryValueExW(hkey, keyexchangeW, 0, &type, NULL, &len)) spec = AT_KEYEXCHANGE; else if (!RegQueryValueExW(hkey, signatureW, 0, &type, NULL, &len)) spec = AT_SIGNATURE; @@ -699,7 +700,6 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) else heap_free(buf); RegCloseKey(hkey); - heap_free(path); return ret; } -- 1.9.1

2 1

[PATCH 1/5] quartz/tests/mpegsplit: Add some tests for media types.
by Zebediah Figura 04 Mar '19

04 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 294 ++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 9a63636337..fc47c50e0a 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "mmreg.h" #include "wine/test.h" static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; @@ -27,6 +28,8 @@ static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static const WCHAR inputW[] = {'I','n','p','u','t',0}; static const WCHAR audioW[] = {'A','u','d','i','o',0}; +static const GUID MEDIASUBTYPE_mp3 = {0x00000055,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; + static IBaseFilter *create_mpeg_splitter(void) { IBaseFilter *filter = NULL; @@ -425,6 +428,296 @@ static void test_pin_info(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + MPEG1WAVEFORMAT expect_wfx = + { + {WAVE_FORMAT_MPEG, 1, 48000, 8000, 192, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + ACM_MPEG_LAYER3, 64000, ACM_MPEG_SINGLECHANNEL, 0, 1, ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 + }; + static const MPEGLAYER3WAVEFORMAT expect_mp3_wfx = + { + {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 8000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + MPEGLAYER3_ID_MPEG, 0, 192, 1, 0 + }; + + const WCHAR *filename = load_resource(mp3file); + AM_MEDIA_TYPE mt = {0}, *pmt, expect_mt = {0}; + IBaseFilter *filter = create_mpeg_splitter(); + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, inputW, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + expect_mt.majortype = MEDIATYPE_Stream; + expect_mt.bFixedSizeSamples = TRUE; + expect_mt.bTemporalCompression = TRUE; + expect_mt.lSampleSize = 1; + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1System; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1Video; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1Audio; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1System; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Payload; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Audio; + mt.subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Stream; + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph = connect_input(filter, filename); + + /* Connecting input doesn't change the reported media types. */ + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1System; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, audioW, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + todo_wine ok(pmt->cbFormat == sizeof(MPEG1WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + if (pmt->cbFormat == sizeof(MPEG1WAVEFORMAT)) + { + /* Native will sometimes leave junk in the joint stereo flags. */ + expect_wfx.fwHeadModeExt = ((MPEG1WAVEFORMAT *)pmt->pbFormat)->fwHeadModeExt; + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(MPEG1WAVEFORMAT)), "Format blocks didn't match.\n"); + } + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + + pmt->subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; + + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_WaveFormatEx; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + goto done; + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_MPEG1Payload), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(MPEG1WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + /* Native will sometimes leave junk in the joint stereo flags. */ + expect_wfx.fwHeadModeExt = ((MPEG1WAVEFORMAT *)pmt->pbFormat)->fwHeadModeExt; + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(MPEG1WAVEFORMAT)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_mp3), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(MPEGLAYER3WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_mp3_wfx, sizeof(MPEGLAYER3WAVEFORMAT)), + "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + + pmt->subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; + + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_WaveFormatEx; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + +done: + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(mpegsplit) { CoInitialize(NULL); @@ -433,6 +726,7 @@ START_TEST(mpegsplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); } -- 2.20.1

1 4

Attn Packagers: Dependency addition for XAudio2 support
by Ethan Lee 03 Mar '19

03 Mar '19

The new XAudio2 implementation that was just merged into master adds a new dependency, called FAudio. The source is available here: https://github.com/FNA-XNA/FAudio <https://github.com/FNA-XNA/FAudio> The README goes into detail, but the short version: It's a C99 library that builds with CMake and depends only on SDL2 (ideally 2.0.9). There are special build options available but the default is recommended for general use. One minor note for distributions with CMake versions older than 3.1.3 _and_ a compiler that defaults to pre-C99: You will need to set CMAKE_C_FLAGS="-std=c99" manually. If you have CMake 3.1.3+ _or_ a compiler that defaults to C99+, no extra flags should be necessary. XAudio2 is used by a large percentage of games made after the release of the Xbox 360, and Wine's built-in implementation is especially important because of bugs that ship in the official DirectX redistributable version for 64-bit: https://bugs.winehq.org/show_bug.cgi?id=38668#c58 <https://bugs.winehq.org/show_bug.cgi?id=38668#c58> Thanks everyone! -Ethan

5 6

Ubuntu disco Wine packages available for testing
by Rosanne DiMesio 03 Mar '19

03 Mar '19

In preparation for the upcoming release of Ubuntu 19.04, I have enabled builds of the WineHQ development and staging branch packages on the OBS. The packages won't be distributed from the WineHQ download server until 19.04 is actually released in April, but anyone who wants to help with testing can get them directly from our OBS repository. The OBS repository key can be downloaded from https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Ubuntu_N…. After adding the release key, add the OBS repository with: sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Ubuntu_N… ./' Hopefully we'll be able to catch any problems before the official release. -- Rosanne DiMesio dimesio(a)earthlink.net

1 0

[PATCH] kernel32: Fix several values in Sinhala NLS file.
by Isira Seneviratne 03 Mar '19

03 Mar '19

1 0

[PATCH] oleaut32: Add missing return value checks (Coverity).
by Alistair Leslie-Hughes 03 Mar '19

03 Mar '19

CID 1442938: Error handling issues (CHECKED_RETURN) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/variant.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fcbef53..77e48c0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5138,7 +5138,9 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) { double dbl; - VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + hRet = VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + if (FAILED(hRet)) + break; if (dbl>0.0f) dbl = floor(dbl*pow(10,deci)+0.5); @@ -5146,7 +5148,7 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) dbl = ceil(dbl*pow(10,deci)-0.5); V_VT(pVarOut)=VT_DECIMAL; - VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); + hRet = VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); break; } /* cases we don't know yet */ -- 1.9.1

1 0

[PATCH 6/7] d3dx9: Move parameter_count out of struct d3dx9_base_effect
by Michael Stefaniuc 03 Mar '19

03 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1703afa067..6e2cd4c6e9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - UINT parameter_count; UINT technique_count; UINT object_count; @@ -176,6 +175,7 @@ struct d3dx_effect LONG ref; struct d3dx9_base_effect base_effect; + UINT parameter_count; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -691,7 +691,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < base->effect->parameter_count; ++i) free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -3277,7 +3277,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d /* TODO: add creator and function count. */ desc->Creator = NULL; desc->Functions = 0; - desc->Parameters = effect->base_effect.parameter_count; + desc->Parameters = effect->parameter_count; desc->Techniques = effect->base_effect.technique_count; return D3D_OK; @@ -3329,7 +3329,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE if (!parameter) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -3383,7 +3383,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, if (!parameter) { - for (i = 0; i < effect->base_effect.parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { temp_param = &effect->base_effect.parameters[i].param; @@ -3442,7 +3442,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D if (!param) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -4363,7 +4363,7 @@ static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) TRACE("iface %p.\n", iface); - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); return D3D_OK; @@ -6143,9 +6143,9 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_parameter *parameter; struct d3dx_sampler *sampler; - if (index >= base->parameter_count) + if (index >= effect->parameter_count) { - FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, base->parameter_count); + FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, effect->parameter_count); return E_FAIL; } @@ -6308,8 +6308,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U HRESULT hr; UINT i; - read_dword(&ptr, &base->parameter_count); - TRACE("Parameter count: %u.\n", base->parameter_count); + read_dword(&ptr, &effect->parameter_count); + TRACE("Parameter count: %u.\n", effect->parameter_count); read_dword(&ptr, &base->technique_count); TRACE("Technique count: %u.\n", base->technique_count); @@ -6328,10 +6328,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } wine_rb_init(&base->param_tree, param_rb_compare); - if (base->parameter_count) + if (effect->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->parameters) * base->parameter_count); + sizeof(*base->parameters) * effect->parameter_count); if (!base->parameters) { ERR("Out of memory.\n"); @@ -6339,7 +6339,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); @@ -6412,7 +6412,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) goto err_out; @@ -6435,7 +6435,7 @@ err_out: if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { free_top_level_parameter(&base->parameters[i]); } -- 2.20.1

2 1

[PATCH 4/7] d3dx9: Merge the d3dx_effect_GetParameterBySemantic() helper
by Michael Stefaniuc 03 Mar '19

03 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 113 +++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 41636ed286..4af6f7f1b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,65 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *semantic) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - struct d3dx_parameter *temp_param; - UINT i; - - if (!parameter) - { - for (i = 0; i < base->parameter_count; ++i) - { - temp_param = &base->parameters[i].param; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - else if (param) - { - for (i = 0; i < param->member_count; ++i) - { - temp_param = &param->members[i]; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -3461,10 +3402,62 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, const char *semantic) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *temp_param; + UINT i; TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); - return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); + if (!parameter) + { + for (i = 0; i < effect->base_effect.parameter_count; ++i) + { + temp_param = &effect->base_effect.parameters[i].param; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + else if (param) + { + for (i = 0; i < param->member_count; ++i) + { + temp_param = &param->members[i]; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) -- 2.20.1

2 1

[PATCH] opencl: Add OpenCL 1.1 implementation.
by Khral Steelforge 03 Mar '19

03 Mar '19

Signed-off-by: Nakarin Khankham <garuda2550(a)gmail.com> --- dlls/opencl/opencl.c | 188 ++++++++++++++++++++++++++++++++++++++++ dlls/opencl/opencl.spec | 10 +++ 2 files changed, 198 insertions(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..ec046a669e 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -295,6 +295,21 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t return ret; } +cl_mem WINAPI wine_clCreateSubBuffer(cl_mem buffer, cl_mem_flags flags, + cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret) +{ +#ifdef CL_VERSION_1_1 + cl_mem ret; + TRACE("\n"); + ret = clCreateSubBuffer(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret); + return ret; +#else + FIXME("stub\n"); + *errcode_ret = CL_SUCCESS; + return NULL; +#endif +} + cl_mem WINAPI wine_clCreateImage2D(cl_context context, cl_mem_flags flags, cl_image_format * image_format, size_t image_width, size_t image_height, size_t image_row_pitch, void * host_ptr, cl_int * errcode_ret) { @@ -357,6 +372,51 @@ cl_int WINAPI wine_clGetImageInfo(cl_mem image, cl_image_info param_name, size_t return ret; } +#ifdef CL_VERSION_1_1 +typedef struct +{ + void WINAPI (*pfn_notify)(cl_mem memobj, void* user_data); + void *user_data; +} MEM_CALLBACK; + +static void mem_fn_notify(cl_mem memobj, void* user_data) +{ + MEM_CALLBACK *pcb; + FIXME("(%p, %p)\n", memobj, user_data); + pcb = (MEM_CALLBACK *) user_data; + if(pcb->pfn_notify) pcb->pfn_notify(memobj, pcb->user_data); + FIXME("Callback COMPLETED\n"); +} +#endif + +cl_int WINAPI wine_clSetMemObjectDestructorCallback(cl_mem memobj, void WINAPI(*pfn_notify)(cl_mem, void*), void *user_data) +{ +#ifdef CL_VERSION_1_1 + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %p, %p)\n", memobj, pfn_notify, user_data); + if(pfn_notify) + { + /* When pfn_notify is provided, clSetMemObjectDestructorCallback is asynchronous */ + MEM_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(MEM_CALLBACK)); + pcb->pfn_notify = pfn_notify; + pcb->user_data = user_data; + ret = clSetMemObjectDestructorCallback(memobj, mem_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetMemObjectDestructorCallback is synchronous */ + ret = clSetMemObjectDestructorCallback(memobj, NULL, user_data); + } + FIXME("(%p, %p, %p)=%d\n", memobj, pfn_notify, user_data, ret); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + /*---------------------------------------------------------------*/ /* Sampler APIs */ @@ -602,6 +662,79 @@ cl_int WINAPI wine_clReleaseEvent(cl_event event) return ret; } +cl_event WINAPI wine_clCreateUserEvent(cl_context context, cl_int * errcode_ret) +{ +#ifdef CL_VERSION_1_1 + cl_event ret; + TRACE("\n"); + ret = clCreateUserEvent(context, errcode_ret); + return ret; +#else + FIXME("stub\n"); + *errcode_ret = CL_SUCCESS; + return NULL; +#endif +} + +#ifdef CL_VERSION_1_1 +typedef struct +{ + void WINAPI (*pfn_notify)(cl_event event, cl_int num, void* user_data); + void *user_data; +} EVENT_CALLBACK; + +static void event_fn_notify(cl_event event, cl_int num, void* user_data) +{ + EVENT_CALLBACK *ecb; + FIXME("(%p, %d, %p)\n", event, num, user_data); + ecb = (EVENT_CALLBACK *) user_data; + if(ecb->pfn_notify) ecb->pfn_notify(event, num, ecb->user_data); + FIXME("Callback COMPLETED\n"); +} +#endif + +cl_int WINAPI wine_clSetEventCallback(cl_event event, cl_int command_exec_callback_type, + void WINAPI (*pfn_notify)(cl_event, cl_int, void *), void *user_data) +{ +#ifdef CL_VERSION_1_1 + /* FIXME: Based on PROGRAM_CALLBACK/program_fn_notify function. I'm not sure about this. */ + cl_int ret; + FIXME("(%p, %d, %p, %p)\n", event, command_exec_callback_type, pfn_notify, user_data); + if(pfn_notify) + { + /* When pfn_notify is provided, clSetEventCallback is asynchronous */ + EVENT_CALLBACK *ecb; + ecb = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENT_CALLBACK)); + ecb->pfn_notify = pfn_notify; + ecb->user_data = user_data; + ret = clSetEventCallback(event, command_exec_callback_type, event_fn_notify, user_data); + } + else + { + /* When pfn_notify is NULL, clSetEventCallback is synchronous */ + ret = clSetEventCallback(event, command_exec_callback_type, NULL, user_data); + } + FIXME("(%p, %d, %p, %p)=%d\n", event, command_exec_callback_type, pfn_notify, user_data, ret); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + +cl_int WINAPI wine_clSetUserEventStatus(cl_event event, cl_int execution_status) +{ +#ifdef CL_VERSION_1_1 + cl_int ret; + TRACE("\n"); + ret = clSetUserEventStatus(event, execution_status); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + /*---------------------------------------------------------------*/ /* Profiling APIs */ @@ -651,6 +784,25 @@ cl_int WINAPI wine_clEnqueueReadBuffer(cl_command_queue command_queue, cl_mem bu return ret; } +cl_int WINAPI wine_clEnqueueReadBufferRect(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ +#ifdef CL_VERSION_1_1 + cl_int ret; + TRACE("\n"); + ret = clEnqueueReadBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t cb, const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -661,6 +813,25 @@ cl_int WINAPI wine_clEnqueueWriteBuffer(cl_command_queue command_queue, cl_mem b return ret; } +cl_int WINAPI wine_clEnqueueWriteBufferRect( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t * buffer_origin, const size_t * host_origin, const size_t * region, + size_t buffer_row_pitch, size_t buffer_slice_pitch, size_t host_row_pitch, size_t host_slice_pitch, + const void * ptr, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ +#ifdef CL_VERSION_1_1 + cl_int ret; + TRACE("\n"); + ret = clEnqueueWriteBufferRect(command_queue, buffer, blocking_read, + buffer_origin, host_origin, region, + buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, + ptr, num_events_in_wait_list, event_wait_list, event); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) @@ -671,6 +842,23 @@ cl_int WINAPI wine_clEnqueueCopyBuffer(cl_command_queue command_queue, cl_mem sr return ret; } +cl_int WINAPI wine_clEnqueueCopyBufferRect(cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t * src_origin, const size_t * dst_origin, const size_t * region, + size_t src_row_pitch, size_t src_slice_pitch, + size_t dst_row_pitch, size_t dst_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event * event_wait_list, cl_event * event) +{ +#ifdef CL_VERSION_1_1 + cl_int ret; + TRACE("\n"); + ret = clEnqueueCopyBufferRect(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, region, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events_in_wait_list, event_wait_list, event); + return ret; +#else + FIXME("stub\n"); + return CL_SUCCESS; +#endif +} + cl_int WINAPI wine_clEnqueueReadImage(cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t * origin, const size_t * region, SIZE_T row_pitch, SIZE_T slice_pitch, void * ptr, diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index ba8ce6e7cd..4782653f3d 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -94,3 +94,13 @@ # @ stdcall clGetGLTextureInfo( long long long ptr ptr ) wine_clGetGLTextureInfo # @ stdcall clEnqueueAcquireGLObjects( long long ptr long ptr ptr ) wine_clEnqueueAcquireGLObjects # @ stdcall clEnqueueReleaseGLObjects( long long ptr long ptr ptr ) wine_clEnqueueReleaseGLObjects + +# OpenCL 1.1 +@ stdcall clCreateSubBuffer( long long long ptr ptr ) wine_clCreateSubBuffer +@ stdcall clCreateUserEvent( long ptr ) wine_clCreateUserEvent +@ stdcall clEnqueueCopyBufferRect( long long long ptr ptr ptr long long long long long ptr ptr ) wine_clEnqueueCopyBufferRect +@ stdcall clEnqueueReadBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueReadBufferRect +@ stdcall clEnqueueWriteBufferRect( long long long ptr ptr ptr long long long long ptr long ptr ptr ) wine_clEnqueueWriteBufferRect +@ stdcall clSetEventCallback( long long ptr ptr ) wine_clSetEventCallback +@ stdcall clSetMemObjectDestructorCallback( long ptr ptr ) wine_clSetMemObjectDestructorCallback +@ stdcall clSetUserEventStatus( long long ) wine_clSetUserEventStatus -- 2.17.1

5 6

[PATCH v2 1/5] Don't use ZeroBits argument of NtAllocateVirtualMemory in COMMDLG file dialogs
by Las＠protonmail.ch 02 Mar '19

02 Mar '19

Empty Message

2 1

[PATCH] include: add IWMLicenseBackup related interface definitions
by Vijay Kiran Kamuju 02 Mar '19

02 Mar '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/wmsdkidl.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 1a0b3e4a29..8798f2256e 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1858,6 +1858,36 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +[ + object, + uuid(05e5ac9f-3fb6-4508-bb43-a4067ba1ebe8), + pointer_default(unique), + local +] +interface IWMLicenseBackup : IUnknown +{ + HRESULT BackupLicenses( + [in] DWORD dwFlags, + [in] IWMStatusCallback *pCallback); + + HRESULT CancelLicenseBackup(); +} + +[ + object, + uuid(c70b6334-a22e-4efb-a245-15e65a004a13), + pointer_default(unique), + local +] +interface IWMLicenseRestore : IUnknown +{ + HRESULT RestoreLicenses( + [in] DWORD dwFlags, + [in] IWMStatusCallback *pCallback); + + HRESULT CancelLicenseRestore(); +} + cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") -- 2.21.0

1 0

[PATCH v2 5/5] Add tests in kernel32 for new NtAllocateVirtualMemory ZeroBits behavior
by Las＠protonmail.ch 02 Mar '19

02 Mar '19

Empty Message

2 1

[PATCH v2 4/5] Fix handling of ZeroBits argument in NtAllocateVirtualMemory and friends
by Las＠protonmail.ch 02 Mar '19

02 Mar '19

Empty Message

2 1

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-devel