September 2020 - Wine-devel

[PATCH] winemac.drv: Don't fail GPU detection if some IOKit properties are missing.
by Brendan Shanks 09 Sep '20

09 Sep '20

Fixes GPU detection when running in VMware Fusion, where the GPU entry lacks a "model" property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49774 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 9d95eee99a9..e769772feaa 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -215,18 +215,15 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en if (IORegistryEntryGetRegistryEntryID(gpu_entry, &gpu->id) != kIOReturnSuccess) goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id)) - goto done; - if (get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name))) - goto done; ret = 0; + + get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id); + get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id); + get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id); + get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id); + get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name)); + done: if (gpu_entry != entry) IOObjectRelease(gpu_entry); -- 2.26.2

2 1

[PATCH] mountmgr: Avoid operating on a null CFStringRef, which would crash.
by Ken Thomases 09 Sep '20

09 Sep '20

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/mountmgr.sys/diskarb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 3d531b95ee5..12da89d7688 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -298,7 +298,7 @@ static CFStringRef find_service_id( const WCHAR *adapter ) service = CFArrayGetValueAtIndex( services, i ); name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); - if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + if (name && CFStringGetLength( name ) < ARRAY_SIZE( buf )) { CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service ))) -- 2.27.0

1 0

[PATCH] dbghelp: Avoid asserting on egregiously long stabs symbol names.
by Ken Thomases 09 Sep '20

09 Sep '20

Some Mac libraries have symbols which are many thousands of characters long. (Thank you, C++ templates!) It doesn't seem worth it to accommodate those by dynamically allocating the symbol name buffer, but we definitely don't want to assert. Just log an ERR. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/dbghelp/stabs.c | 58 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b1b4a6ef1c5..517299897c4 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #define N_EXCL 0xc2 #define N_RBRAC 0xe0 -static void stab_strcpy(char* dest, int sz, const char* source) +static BOOL stab_strcpy(char* dest, int sz, const char* source) { char* ptr = dest; /* @@ -115,7 +115,7 @@ static void stab_strcpy(char* dest, int sz, const char* source) while (ptr > dest && isdigit(*ptr)) ptr--; if (*ptr == '.') *ptr = '\0'; } - assert(sz > 0); + return (sz > 0); } typedef struct @@ -1134,8 +1134,12 @@ static inline void pending_add_var(struct pending_list* pending, const char* nam { pending_make_room(pending); pending->objs[pending->num].tag = PENDING_VAR; - stab_strcpy(pending->objs[pending->num].u.var.name, - sizeof(pending->objs[pending->num].u.var.name), name); + if (!stab_strcpy(pending->objs[pending->num].u.var.name, + sizeof(pending->objs[pending->num].u.var.name), name)) + { + ERR("symbol too long %s\n", debugstr_a(name)); + return; + } pending->objs[pending->num].u.var.type = stabs_parse_type(name); pending->objs[pending->num].u.var.kind = dt; pending->objs[pending->num].u.var.loc = *loc; @@ -1327,8 +1331,8 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, stabbuf_append(&stabbuff, &stabbufflen, ptr); ptr = stabbuff; } - stab_strcpy(symname, sizeof(symname), ptr); - if (!stabs_parse_typedef(module, ptr, symname)) + if (!stab_strcpy(symname, sizeof(symname), ptr) || + !stabs_parse_typedef(module, ptr, symname)) { /* skip this definition */ stabbuff[0] = '\0'; @@ -1348,7 +1352,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * * With a.out or mingw, they actually do make some amount of sense. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1358,7 +1367,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, case N_LCSYM: case N_STSYM: /* These are static symbols and BSS symbols. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_absolute; loc.reg = 0; loc.offset = load_offset + n_value; @@ -1383,7 +1397,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, if (curr_func != NULL) { struct symt* param_type = stabs_parse_type(ptr); - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } loc.kind = loc_regrel; loc.reg = dbghelp_current_cpu->frame_regno; loc.offset = n_value; @@ -1442,7 +1461,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, loc.reg = CV_REG_NONE; break; } - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (ptr[strlen(symname) + 1] == 'P') { struct symt* param_type = stabs_parse_type(ptr); @@ -1494,7 +1518,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, * all of the pages related to the stabs, and that * sucks up swap space like crazy. */ - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } if (*symname) { struct symt_function_signature* func_type; @@ -1620,7 +1649,12 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, } if (*ptr == '_') ptr++; - stab_strcpy(symname, sizeof(symname), ptr); + if (!stab_strcpy(symname, sizeof(symname), ptr)) + { + ERR("symbol too long: %s\n", debugstr_a(ptr)); + stabbuff[0] = '\0'; + continue; + } callback(module, load_offset, symname, n_value, is_public, is_global, stab_ptr->n_other, compiland, user); -- 2.27.0

1 0

[PATCH] winemac.drv: Print error when no GPUs are detected.
by Brendan Shanks 09 Sep '20

09 Sep '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a96a7b2c5f6..078cb55ab8a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1790,6 +1790,8 @@ void macdrv_init_display_devices(BOOL force) if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); + if (!gpu_count) + ERR("No GPUs detected\n"); for (gpu = 0; gpu < gpu_count; gpu++) { -- 2.26.2

2 1

[PATCH] kernelbase: Also pass CreateFile2 dwFileFlags to CreateFileW.
by Rémi Bernon 09 Sep '20

09 Sep '20

Instead of just attributes. Otherwise we may miss important flags like FILE_FLAG_OVERLAPPED and open the file for synchronous I/O, causing a deadlock in Flight Simulator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 48 +++++++++++++++++++++++++++++++------- dlls/kernelbase/file.c | 30 ++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0f2c00d75ad..ec0e923706c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1675,14 +1675,14 @@ static void test_CreateFileW(void) static void test_CreateFile2(void) { - HANDLE hFile; + HANDLE hFile, iocp; WCHAR temp_path[MAX_PATH]; WCHAR filename[MAX_PATH]; CREATEFILE2_EXTENDED_PARAMETERS exparams; static const WCHAR emptyW[]={'\0'}; static const WCHAR prefix[] = {'p','f','x',0}; static const WCHAR bogus[] = { '\\', '\\', '.', '\\', 'B', 'O', 'G', 'U', 'S', 0 }; - DWORD ret; + DWORD i, ret; if (!pCreateFile2) { @@ -1699,8 +1699,8 @@ static void test_CreateFile2(void) SetLastError(0xdeadbeef); exparams.dwSize = sizeof(exparams); - exparams.dwFileAttributes = FILE_FLAG_RANDOM_ACCESS; - exparams.dwFileFlags = 0; + exparams.dwFileAttributes = 0; + exparams.dwFileFlags = FILE_FLAG_RANDOM_ACCESS; exparams.dwSecurityQosFlags = 0; exparams.lpSecurityAttributes = NULL; exparams.hTemplateFile = 0; @@ -1744,14 +1744,46 @@ static void test_CreateFile2(void) ret = CreateDirectoryW(filename, NULL); ok(ret == TRUE, "couldn't create temporary directory\n"); - exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS; + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS; + SetLastError(0xdeadbeef); hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, 0, OPEN_ALWAYS, &exparams); - todo_wine - ok(hFile == INVALID_HANDLE_VALUE, - "expected CreateFile2 to fail on existing directory, error: %d\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFile2 failed with FILE_FLAG_BACKUP_SEMANTICS on existing directory, error: %d\n", GetLastError()); CloseHandle(hFile); ret = RemoveDirectoryW(filename); ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + for (i = 0; i < 2; ++i) + { + memset(&exparams, 0, sizeof(exparams)); + exparams.dwSize = sizeof(exparams); + if (i == 0) + { + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + else + { + exparams.dwFileFlags = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileAttributes = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: hFile %p, last error %u\n", i, hFile, GetLastError()); + + iocp = CreateIoCompletionPort(hFile, NULL, 0, 2); + if (i == 1) ok(iocp == NULL && GetLastError() == ERROR_INVALID_PARAMETER, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + else ok(iocp != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + + CloseHandle(iocp); + CloseHandle(hFile); + + ret = DeleteFileW(filename); + if (i == 1) ok(ret, "%d: unexpected DeleteFileW failure, error %u\n", i, GetLastError()); + else ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "%d: unexpected DeleteFileW result, ret %d error %u\n", i, ret, GetLastError()); + } } static void test_GetTempFileNameA(void) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index d9b34408692..b265866ac54 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -655,13 +655,39 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryExW( LPCWSTR template, LPCWSTR path HANDLE WINAPI DECLSPEC_HOTPATCH CreateFile2( LPCWSTR name, DWORD access, DWORD sharing, DWORD creation, CREATEFILE2_EXTENDED_PARAMETERS *params ) { + static const DWORD attributes_mask = FILE_ATTRIBUTE_READONLY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_NORMAL | + FILE_ATTRIBUTE_TEMPORARY | + FILE_ATTRIBUTE_OFFLINE | + FILE_ATTRIBUTE_ENCRYPTED | + FILE_ATTRIBUTE_INTEGRITY_STREAM; + static const DWORD flags_mask = FILE_FLAG_BACKUP_SEMANTICS | + FILE_FLAG_DELETE_ON_CLOSE | + FILE_FLAG_NO_BUFFERING | + FILE_FLAG_OPEN_NO_RECALL | + FILE_FLAG_OPEN_REPARSE_POINT | + FILE_FLAG_OVERLAPPED | + FILE_FLAG_POSIX_SEMANTICS | + FILE_FLAG_RANDOM_ACCESS | + FILE_FLAG_SEQUENTIAL_SCAN | + FILE_FLAG_WRITE_THROUGH; + LPSECURITY_ATTRIBUTES sa = params ? params->lpSecurityAttributes : NULL; - DWORD attributes = params ? params->dwFileAttributes : 0; HANDLE template = params ? params->hTemplateFile : NULL; + DWORD attributes = params ? params->dwFileAttributes : 0; + DWORD flags = params ? params->dwFileFlags : 0; FIXME( "(%s %x %x %x %p), partial stub\n", debugstr_w(name), access, sharing, creation, params ); - return CreateFileW( name, access, sharing, sa, creation, attributes, template ); + if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#x\n", attributes ); + if (flags & ~flags_mask) FIXME( "unsupported flags %#x\n", flags ); + attributes &= attributes_mask; + flags &= flags_mask; + + return CreateFileW( name, access, sharing, sa, creation, flags | attributes, template ); } -- 2.28.0

1 0

[PATCH resend 1/3] ntoskrnl.exe: Store current thread object at right offset from GS.
by Derek Lesho 09 Sep '20

09 Sep '20

In kernel mode, GS base is not set to a TEB, but fortunately the offset for the current thread object, which EasyAntiCheat.sys relies on, doesn't conflict with anything in the TEB. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 37 +++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e94feabc826..a0f45b4135c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -870,7 +870,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) for (;;) { - NtCurrentTeb()->Reserved5[1] = NULL; + NtCurrentTeb()->SystemReserved1[15] = NULL; if (!context.in_buff && !(context.in_buff = HeapAlloc( GetProcessHeap(), 0, context.in_size ))) { ERR( "failed to allocate buffer\n" ); @@ -891,7 +891,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) context.params = reply->params; context.in_size = reply->in_size; client_tid = reply->client_tid; - NtCurrentTeb()->Reserved5[1] = wine_server_get_ptr( reply->client_thread ); + NtCurrentTeb()->SystemReserved1[15] = wine_server_get_ptr( reply->client_thread ); } else { @@ -2338,7 +2338,7 @@ POBJECT_TYPE PsThreadType = &thread_type; */ PRKTHREAD WINAPI KeGetCurrentThread(void) { - struct _KTHREAD *thread = NtCurrentTeb()->Reserved5[1]; + struct _KTHREAD *thread = NtCurrentTeb()->SystemReserved1[15]; if (!thread) { @@ -2351,7 +2351,11 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle ); - NtCurrentTeb()->Reserved5[1] = thread; + /* In kernel mode, GS base is not set to a TEB, but fortunately the offset + for the current thread object, which EasyAntiCheat.sys relies on, + doesn't conflict with anything in the TEB. */ + + NtCurrentTeb()->SystemReserved1[15] = thread; } return thread; @@ -2912,6 +2916,22 @@ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) } +struct system_thread_ctx +{ + PKSTART_ROUTINE start; + PVOID context; +}; + +static void WINAPI init_system_thread(PVOID context) +{ + struct system_thread_ctx info = *(struct system_thread_ctx *)context; + HeapFree( GetProcessHeap(), 0, context ); + + NtCurrentTeb()->SystemReserved1[15] = KeGetCurrentThread(); + + info.start(info.context); +} + /*********************************************************************** * PsCreateSystemThread (NTOSKRNL.EXE.@) */ @@ -2920,9 +2940,16 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, HANDLE ProcessHandle, PCLIENT_ID ClientId, PKSTART_ROUTINE StartRoutine, PVOID StartContext) { + struct system_thread_ctx *info; + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + + info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) ); + info->start = StartRoutine; + info->context = StartContext; + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, - 0, StartRoutine, StartContext, + 0, init_system_thread, info, ThreadHandle, ClientId); } -- 2.28.0

1 2

[PATCH v3 2/2] windowscodecs: Correctly set output frame size for WriteSource().
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Use IWICBitmapFrameEncode_SetSize() to set frame size. dlls/windowscodecs/main.c | 23 +++++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-)

2 1

[PATCH v3 1/2] windowscodecs/tests: Add tests for calling WriteSource() without calling SetSize() prior to it.
by Ziqing Hui 09 Sep '20

09 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/converter.c | 48 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 18 deletions(-)

2 1

[PATCH 1/2] server: Use GENERIC_READ | GENERIC_WRITE in inherit_console().
by Zebediah Figura 09 Sep '20

09 Sep '20

The inherited console must have at least FILE_READ_DATA | FILE_WRITE_DATA. This also matches the access rights in AllocConsole(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 3ea8a0fe531..6a4a0b60d5f 100644 --- a/server/console.c +++ b/server/console.c @@ -784,7 +784,7 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, process->console = console; console->num_proc++; return alloc_handle( process, process->console, - SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); + SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); } struct thread *console_get_renderer( struct console_input *console ) -- 2.28.0

2 3

[PATCH 3/3] dxgi/tests: Fix output ownership test failures on Win10 1909.
by Zhiyi Zhang 09 Sep '20

09 Sep '20

All DXGI output ownership calls on Win10 1909 return S_OK. It doesn't grab VidPN output exclusive ownership for full screen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 78 +++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index acbcadda354..ce1aee5ee3b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -548,9 +548,12 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, "Got unexpected state %#x, expected %#x.\n", state, expected); } -#define wait_vidpn_exclusive_ownership(a, b, c) wait_vidpn_exclusive_ownership_(__LINE__, a, b, c) -static void wait_vidpn_exclusive_ownership_(unsigned int line, - const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected, BOOL todo) +/* VidPN exclusive ownership doesn't change immediately. + * This helper is used to wait for the expected status */ +#define get_expected_vidpn_exclusive_ownership(a, b) \ + get_expected_vidpn_exclusive_ownership_(__LINE__, a, b) +static NTSTATUS get_expected_vidpn_exclusive_ownership_(unsigned int line, + const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected) { static const unsigned int wait_timeout = 2000; static const unsigned int wait_step = 100; @@ -565,8 +568,7 @@ static void wait_vidpn_exclusive_ownership_(unsigned int line, Sleep(wait_step); total_time += wait_step; } - todo_wine_if(todo) ok_(__FILE__, line)(status == expected, - "Got unexpected status %#x, expected %#x.\n", status, expected); + return status; } static HWND create_window(void) @@ -6315,7 +6317,9 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -6349,20 +6353,41 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(fullscreen, "Got unexpected fullscreen state.\n"); + /* Win10 1909 doesn't seem to grab output exclusive ownership. + * And all output ownership calls return S_OK on D3D10 and D3D12 with 1909. */ if (is_d3d12) - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); + } else - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + todo_wine ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + } hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + if (is_d3d12) + todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); /* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests * finished. */ @@ -6370,16 +6395,21 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -6389,16 +6419,24 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!fullscreen, "Unexpected fullscreen state.\n"); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); done: IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); -- 2.25.1

3 2