wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Fix a few more thread information access rights.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 64731a8e9fce07a7c34374dc0a6bb6ed8b5f6183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64731a8e9fce07a7c34374dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 10:02:22 2020 +0200 ntdll: Fix a few more thread information access rights. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 3 --- dlls/ntdll/unix/thread.c | 2 ++ server/thread.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b91d279e32..b476e44cfc 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2215,12 +2215,9 @@ static void test_thread_info(void) #endif case ThreadTimes: -todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; - case ThreadAffinityMask: - case ThreadQuerySetWin32StartAddress: case ThreadIsIoPending: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index cee288b3e1..5f6841b0e8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -895,6 +895,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_START_REQ( get_thread_info ) { req->handle = wine_server_obj_handle( handle ); + req->access = THREAD_QUERY_INFORMATION; if (!(status = wine_server_call( req ))) affinity = reply->affinity & affinity_mask; } SERVER_END_REQ; @@ -973,6 +974,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_START_REQ( get_thread_info ) { req->handle = wine_server_obj_handle( handle ); + req->access = THREAD_QUERY_INFORMATION; status = wine_server_call( req ); if (status == STATUS_SUCCESS) { diff --git a/server/thread.c b/server/thread.c index b656cd37a1..d55af204bd 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1553,7 +1553,7 @@ DECL_HANDLER(get_thread_times) { struct thread *thread; - if ((thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION ))) + if ((thread = get_thread_from_handle( req->handle, THREAD_QUERY_LIMITED_INFORMATION ))) { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time;

1 0

Rémi Bernon : ntdll: Correctly implement ThreadHideFromDebugger.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: e1e34cdc375baf2d1d5a2266ae0faa885987ab37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e34cdc375baf2d1d5a2266… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 26 11:27:29 2020 +0200 ntdll: Correctly implement ThreadHideFromDebugger. At least, store the thread information, instead of pretending and failing to correctly validate handles and access rights. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 3 --- dlls/ntdll/unix/thread.c | 27 ++++++++++++++++----------- include/wine/server_protocol.h | 7 ++++--- server/protocol.def | 4 +++- server/request.h | 5 +++-- server/thread.c | 11 +++++++---- server/thread.h | 1 + server/trace.c | 3 ++- 8 files changed, 36 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1e34cdc375baf2d1d5a…

1 0

Rémi Bernon : ntdll/tests: Add more HideFromDebugger tests.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: eef527723f02abcdb301b02cae059b123f277d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eef527723f02abcdb301b02c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 26 11:27:28 2020 +0200 ntdll/tests: Add more HideFromDebugger tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4de562b994..5ac57536b2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,7 +2346,6 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; - ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2451,6 +2450,20 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); +} + +static DWORD WINAPI hide_from_debugger_thread(void *arg) +{ + HANDLE stop_event = arg; + WaitForSingleObject( stop_event, INFINITE ); + return 0; +} + +static void test_HideFromDebugger(void) +{ + NTSTATUS status; + HANDLE thread, stop_event; + ULONG dummy; dummy = 0; status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); @@ -2477,6 +2490,34 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); } + + stop_event = CreateEventA( NULL, FALSE, FALSE, NULL ); + ok( stop_event != NULL, "CreateEvent failed\n" ); + thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL ); + ok( thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError() ); + + dummy = 0; + status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, + "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy ); + + status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 ); + todo_wine + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS, + "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + + SetEvent( stop_event ); + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( stop_event ); } static void test_NtGetCurrentProcessorNumber(void) @@ -2847,6 +2888,9 @@ START_TEST(info) trace("Starting test_affinity()\n"); test_affinity(); + trace("Starting test_HideFromDebugger()\n"); + test_HideFromDebugger(); + trace("Starting test_NtGetCurrentProcessorNumber()\n"); test_NtGetCurrentProcessorNumber();

1 0

Dmitry Timoshkov : kernel32: Implement IsWow64Process2.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: c70a303cd44e3463772ab9ecd2c6f4e73df676cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70a303cd44e3463772ab9ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 26 12:42:47 2020 +0800 kernel32: Implement IsWow64Process2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-wow64-l1-1-1.spec | 1 + dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/process.c | 100 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 68 ++++++++++++++ include/winbase.h | 1 + 6 files changed, 172 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec index 08fa02c3fc..99ba713409 100644 --- a/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec +++ b/dlls/api-ms-win-core-wow64-l1-1-1/api-ms-win-core-wow64-l1-1-1.spec @@ -1,5 +1,6 @@ @ stdcall GetSystemWow64DirectoryA(ptr long) kernel32.GetSystemWow64DirectoryA @ stdcall GetSystemWow64DirectoryW(ptr long) kernel32.GetSystemWow64DirectoryW @ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall IsWow64Process2(ptr ptr ptr) kernel32.IsWow64Process2 @ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 17322bcd90..e7a7f162b7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -999,6 +999,7 @@ @ stdcall -import IsValidNLSVersion(long wstr ptr) # @ stub IsValidUILanguage @ stdcall -import IsWow64Process(ptr ptr) +@ stdcall -import IsWow64Process2(ptr ptr ptr) @ stdcall -import K32EmptyWorkingSet(long) @ stdcall -import K32EnumDeviceDrivers(ptr long ptr) @ stdcall -import K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 82a5bdd85d..eaa5da2e95 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -66,6 +66,7 @@ static HINSTANCE hkernel32, hntdll; static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pGetSystemRegistryQuota)(PDWORD, PDWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pIsWow64Process2)(HANDLE, USHORT *, USHORT *); static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); @@ -249,6 +250,7 @@ static BOOL init(void) pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); + pIsWow64Process2 = (void *) GetProcAddress(hkernel32, "IsWow64Process2"); pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); @@ -2166,6 +2168,103 @@ static void test_IsWow64Process(void) } } +static void test_IsWow64Process2(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si; + BOOL ret, is_wow64; + USHORT machine, native_machine; + static char cmdline[] = "C:\\Program Files\\Internet Explorer\\iexplore.exe"; + static char cmdline_wow64[] = "C:\\Program Files (x86)\\Internet Explorer\\iexplore.exe"; +#ifdef __i386__ + USHORT expect_native = IMAGE_FILE_MACHINE_I386; +#elif defined __x86_64__ + USHORT expect_native = IMAGE_FILE_MACHINE_AMD64; +#elif defined __arm__ + USHORT expect_native = IMAGE_FILE_MACHINE_ARM; +#elif defined __aarch64__ + USHORT expect_native = IMAGE_FILE_MACHINE_ARM; +#else + USHORT expect_native = 0; +#endif + + if (!pIsWow64Process2) + { + skip("IsWow64Process2 is not available\n"); + return; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcessA(cmdline_wow64, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + if (ret) + { + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + +#if defined(__i386__) || defined(__x86_64__) + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + expect_native = IMAGE_FILE_MACHINE_AMD64; +#else + skip("not supported architecture\n"); +#endif + ok(native_machine == expect_native, "got %#x\n", native_machine); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcessA(cmdline, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pIsWow64Process(pi.hProcess, &is_wow64); + ok(ret, "IsWow64Process error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(pi.hProcess, &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); + ok(native_machine == expect_native, "got %#x\n", native_machine); + + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess error\n"); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + SetLastError(0xdeadbeef); + ret = pIsWow64Process(GetCurrentProcess(), &is_wow64); + ok(ret, "IsWow64Process error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + machine = native_machine = 0xdead; + ret = pIsWow64Process2(GetCurrentProcess(), &machine, &native_machine); + ok(ret, "IsWow64Process2 error %u\n", GetLastError()); + + if (is_wow64) + { + ok(machine == IMAGE_FILE_MACHINE_I386, "got %#x\n", machine); + ok(native_machine == expect_native, "got %#x\n", native_machine); + } + else + { + ok(machine == IMAGE_FILE_MACHINE_UNKNOWN, "got %#x\n", machine); + ok(native_machine == expect_native, "got %#x\n", native_machine); + } +} + static void test_SystemInfo(void) { SYSTEM_INFO si, nsi; @@ -4065,6 +4164,7 @@ START_TEST(process) test_QueryFullProcessImageNameW(); test_Handles(); test_IsWow64Process(); + test_IsWow64Process2(); test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5e177a4932..a05bf223e8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -884,7 +884,7 @@ @ stdcall IsValidSid(ptr) @ stdcall IsWellKnownSid(ptr long) @ stdcall IsWow64Process(ptr ptr) -# @ stub IsWow64Process2 +@ stdcall IsWow64Process2(ptr ptr ptr) @ stdcall K32EmptyWorkingSet(long) @ stdcall K32EnumDeviceDrivers(ptr long ptr) @ stdcall K32EnumPageFilesA(ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a3b168543f..58fba52415 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -24,6 +24,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -882,6 +883,73 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsProcessorFeaturePresent ( DWORD feature ) } +/********************************************************************** + * IsWow64Process2 (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, USHORT *native_machine ) +{ + BOOL wow64; + SYSTEM_INFO si; + + TRACE( "(%p,%p,%p)\n", process, machine, native_machine ); + + if (!IsWow64Process( process, &wow64 )) + return FALSE; + + if (wow64) + { + GetNativeSystemInfo( &si ); + + if (process != GetCurrentProcess()) + { +#if defined(__i386__) || defined(__x86_64__) + *machine = IMAGE_FILE_MACHINE_I386; +#else + FIXME("not implemented for other process\n"); + *machine = IMAGE_FILE_MACHINE_UNKNOWN; +#endif + } + else + { + IMAGE_NT_HEADERS *nt; + nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + *machine = nt->FileHeader.Machine; + } + } + else + { +#ifdef _WIN64 + GetSystemInfo( &si ); +#else + GetNativeSystemInfo( &si ); +#endif + *machine = IMAGE_FILE_MACHINE_UNKNOWN; + } + + switch (si.u.s.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + *native_machine = IMAGE_FILE_MACHINE_I386; + break; + case PROCESSOR_ARCHITECTURE_ARM: + *native_machine = IMAGE_FILE_MACHINE_ARM; + break; + case PROCESSOR_ARCHITECTURE_AMD64: + *native_machine = IMAGE_FILE_MACHINE_AMD64; + break; + case PROCESSOR_ARCHITECTURE_ARM64: + *native_machine = IMAGE_FILE_MACHINE_ARM64; + break; + default: + FIXME("unknown architecture %u\n", si.u.s.wProcessorArchitecture); + *native_machine = IMAGE_FILE_MACHINE_UNKNOWN; + break; + } + + return TRUE; +} + + /********************************************************************** * IsWow64Process (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 39a4a9c9ac..981d4ea76a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2406,6 +2406,7 @@ WINADVAPI BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR); WINADVAPI BOOL WINAPI IsValidSid(PSID); WINADVAPI BOOL WINAPI IsWellKnownSid(PSID,WELL_KNOWN_SID_TYPE); WINBASEAPI BOOL WINAPI IsWow64Process(HANDLE,PBOOL); +WINBASEAPI BOOL WINAPI IsWow64Process2(HANDLE,USHORT*,USHORT*); WINADVAPI BOOL WINAPI ImpersonateLoggedOnUser(HANDLE); WINADVAPI BOOL WINAPI ImpersonateNamedPipeClient(HANDLE); WINADVAPI BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);

1 0

Dmitry Timoshkov : kernel32/tests: Fix compilation with PSDK.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 51ff9aa7cceda8cc4a3af9b79362b91560a1a8d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ff9aa7cceda8cc4a3af9b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 26 12:42:38 2020 +0800 kernel32/tests: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8454e64265..82a5bdd85d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3828,7 +3828,7 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } else { - status = NtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &pbi_size); + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), &pbi_size); ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); parent_id = pbi.InheritedFromUniqueProcessId;

1 0

Brendan Shanks : winevulkan: Don't initialize the Vulkan driver in DllMain().
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: aec196878875e92d0b404a6f982cea6667768696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec196878875e92d0b404a6f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 26 16:21:54 2020 -0700 winevulkan: Don't initialize the Vulkan driver in DllMain(). Fixes an issue where winevulkan would not be registered if no Vulkan driver was present during prefix creation (such as in a build VM). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index eb22e72ae3..d2da92cfa2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -306,7 +306,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) heap_free(device); } -static BOOL wine_vk_init(void) +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { HDC hdc; @@ -314,16 +314,20 @@ static BOOL wine_vk_init(void) vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); ReleaseDC(0, hdc); if (!vk_funcs) - { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + else + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); return TRUE; } +static void wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. @@ -653,6 +657,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -779,6 +787,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_ERROR_LAYER_NOT_PRESENT; } + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -847,6 +859,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); + wine_vk_init_once(); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); @@ -1367,13 +1381,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) case DLL_PROCESS_ATTACH: hinstance = hinst; DisableThreadLibraryCalls(hinst); - return wine_vk_init(); + break; } return TRUE; } static const struct vulkan_func vk_global_dispatch_table[] = { + /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties},

1 0

Zebediah Figura : winegstreamer: Don't store DirectShow caps.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 7be64a8d3eec3c52dc58a20a178d33dd25de56d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be64a8d3eec3c52dc58a20a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 20:14:06 2020 -0500 winegstreamer: Don't store DirectShow caps. Primarily so that we can connect using video caps that can't be translated into DirectShow caps. They will later be converted into translatable caps once the DirectShow source pin is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47642 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 162 ++++++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7be64a8d3eec3c52dc58…

1 0

Zebediah Figura : msvcrt: Print assertion failure messages to stderr.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: wine Branch: master Commit: 3533605293e8083dae19c5fbd41e2077faf5adc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3533605293e8083dae19c5fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 15:12:22 2020 -0500 msvcrt: Print assertion failure messages to stderr. This matches Windows behaviour. In particular, redirecting stderr with freopen() followed by assert(0) will print the failure message to the relevant file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/scanf.c | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index f631d4d727..cb38b35de9 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -305,7 +305,7 @@ void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file DoMessageBoxW(assertion_failed, text); } else - _cwprintf(format_console, str, file, line); + MSVCRT_fwprintf(MSVCRT_stderr, format_console, str, file, line); MSVCRT_raise(MSVCRT_SIGABRT); MSVCRT__exit(3); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3ffc785d06..dc89c6af23 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -447,6 +447,8 @@ struct MSVCRT__iobuf { typedef struct MSVCRT__iobuf MSVCRT_FILE; +extern MSVCRT_FILE MSVCRT__iob[]; + struct MSVCRT_lconv { char* decimal_point; char* thousands_sep; @@ -1107,6 +1109,7 @@ MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*); MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); +int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 04f87077e1..4b2ac2ed4a 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -extern MSVCRT_FILE MSVCRT__iob[]; - /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. */

1 0

Henri Verbeet : vkd3d: Require VKD3D_API_VERSION_1_2 for version 1.1 root signatures.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: vkd3d Branch: master Commit: 24eaeb2cdf2a7df998673792a5d092bf0062468c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=24eaeb2cdf2a7df99867379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 15:20:05 2020 +0430 vkd3d: Require VKD3D_API_VERSION_1_2 for version 1.1 root signatures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 2 ++ tests/vkd3d_api.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c53856a..d88fde9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2766,6 +2766,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * TRACE("Root signature requested %#x.\n", data->HighestVersion); data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); + if (device->vkd3d_instance->api_version < VKD3D_API_VERSION_1_2) + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_0); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 13fa3d6..8195c06 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -1073,12 +1073,28 @@ static void test_formats(void) static void test_application_info(void) { + D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; struct vkd3d_instance_create_info create_info; + struct vkd3d_device_create_info device_info; struct vkd3d_application_info app_info; struct vkd3d_instance *instance; + ID3D12Device *device; + unsigned int i; ULONG refcount; HRESULT hr; + static const struct + { + enum vkd3d_api_version api_version; + D3D_ROOT_SIGNATURE_VERSION rs_version; + } + root_signature_versions[] = + { + {VKD3D_API_VERSION_1_0, D3D_ROOT_SIGNATURE_VERSION_1_0}, + {VKD3D_API_VERSION_1_1, D3D_ROOT_SIGNATURE_VERSION_1_0}, + {VKD3D_API_VERSION_1_2, D3D_ROOT_SIGNATURE_VERSION_1_1}, + }; + app_info.type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO; app_info.next = NULL; app_info.engine_name = NULL; @@ -1113,6 +1129,44 @@ static void test_application_info(void) ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); refcount = vkd3d_instance_decref(instance); ok(!refcount, "Instance has %u references left.\n", refcount); + + device_info = device_default_create_info; + device_info.instance_create_info = &create_info; + for (i = 0; i < ARRAY_SIZE(root_signature_versions); ++i) + { + app_info.api_version = root_signature_versions[i].api_version; + hr = vkd3d_create_device(&device_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == root_signature_versions[i].rs_version, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + ID3D12Device_Release(device); + } + + create_info.next = NULL; + hr = vkd3d_create_device(&device_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + ID3D12Device_Release(device); } static bool have_d3d12_device(void)

1 0

Henri Verbeet : vkd3d: Introduce API versions.
by Alexandre Julliard 30 Jun '20

30 Jun '20

Module: vkd3d Branch: master Commit: 3777eb4e5c02a3a165520642fae4f38341f4e28c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3777eb4e5c02a3a16552064… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 30 15:20:04 2020 +0430 vkd3d: Introduce API versions. For backwards compatibility. Newer vkd3d versions may report more capabilities, but some of those may also require newer vkd3d APIs in order to use them. That's an issue for a vkd3d user like Wine, where reporting more capabilities may cause the application to try to use APIs that are not implemented in that version of Wine. Note that using ELF symbol versioning would have solved the issue for existing binaries compiled against older versions of vkd3d, but not for older source compiled against newer versions of vkd3d. Users of vkd3d-utils should define VKD3D_UTILS_API_VERSION to the vkd3d API version they wish to target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_xcb.h | 1 + include/vkd3d.h | 9 +++++++++ include/vkd3d_utils.h | 8 +++++++- libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 21 +++++++++++++++++---- libs/vkd3d/device.c | 8 +++++++- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12_crosstest.h | 1 + tests/vkd3d_api.c | 8 ++++++++ 9 files changed, 52 insertions(+), 6 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 6fae790..6ce02ed 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -18,6 +18,7 @@ */ #define VK_USE_PLATFORM_XCB_KHR +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index e2d9ec8..0ef8105 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -51,6 +51,13 @@ enum vkd3d_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; +enum vkd3d_api_version +{ + VKD3D_API_VERSION_1_0, + VKD3D_API_VERSION_1_1, + VKD3D_API_VERSION_1_2, +}; + typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); typedef void * (*PFN_vkd3d_thread)(void *data); @@ -98,6 +105,8 @@ struct vkd3d_application_info const char *engine_name; /* "vkd3d" if NULL */ uint32_t engine_version; /* vkd3d version if engine_name is NULL */ + + enum vkd3d_api_version api_version; }; struct vkd3d_device_create_info diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 4a5ee5d..02687ed 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -21,6 +21,10 @@ #include <vkd3d.h> +#ifndef VKD3D_UTILS_API_VERSION +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_0 +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -36,13 +40,15 @@ HRESULT vkd3d_signal_event(HANDLE event); unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); void vkd3d_destroy_event(HANDLE event); -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device); +#define D3D12CreateDevice(a, b, c, d) D3D12CreateDeviceVKD3D(a, b, c, d, VKD3D_UTILS_API_VERSION) HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.2 */ +HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, + REFIID iid, void **device, enum vkd3d_api_version api_version); HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 9d95a84..fb39124 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: D3D12CreateDevice; + D3D12CreateDeviceVKD3D; D3D12CreateRootSignatureDeserializer; D3D12CreateVersionedRootSignatureDeserializer; D3D12GetDebugInterface; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index d06a750..c19fe7f 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -17,6 +17,7 @@ */ #include "vkd3d_utils_private.h" +#undef D3D12CreateDevice VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); @@ -27,8 +28,8 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return E_NOTIMPL; } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, - D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device, enum vkd3d_api_version api_version) { struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; @@ -47,15 +48,21 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, { VK_KHR_SWAPCHAIN_EXTENSION_NAME, }; + struct vkd3d_application_info application_info = + { + .type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + .api_version = api_version, + }; - TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", - adapter, minimum_feature_level, debugstr_guid(iid), device); + TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p, api_version %#x.\n", + adapter, minimum_feature_level, debugstr_guid(iid), device, api_version); if (adapter) FIXME("Ignoring adapter %p.\n", adapter); memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.next = &application_info; optional_extensions_info.extensions = optional_instance_extensions; optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); @@ -78,6 +85,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, return vkd3d_create_device(&device_create_info, iid, device); } +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0); +} + HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 437454d..c53856a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -506,16 +506,21 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.pEngineName = PACKAGE_NAME; application_info.engineVersion = vkd3d_get_vk_version(); application_info.apiVersion = VK_API_VERSION_1_0; + instance->api_version = VKD3D_API_VERSION_1_0; if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO))) { - application_info.pApplicationName = vkd3d_application_info->application_name; + if (vkd3d_application_info->application_name) + application_info.pApplicationName = vkd3d_application_info->application_name; + else if (vkd3d_get_program_name(application_name)) + application_info.pApplicationName = application_name; application_info.applicationVersion = vkd3d_application_info->application_version; if (vkd3d_application_info->engine_name) { application_info.pEngineName = vkd3d_application_info->engine_name; application_info.engineVersion = vkd3d_application_info->engine_version; } + instance->api_version = vkd3d_application_info->api_version; } else if (vkd3d_get_program_name(application_name)) { @@ -523,6 +528,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, } TRACE("Application: %s.\n", debugstr_a(application_info.pApplicationName)); + TRACE("vkd3d API version: %u.\n", instance->api_version); if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 97cae22..1c36b24 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,6 +147,7 @@ struct vkd3d_instance void *libvulkan; uint64_t config_flags; + enum vkd3d_api_version api_version; VkDebugReportCallbackEXT vk_debug_callback; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 7b59471..7ff835a 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -55,6 +55,7 @@ typedef int HRESULT; #ifdef _WIN32 # include "vkd3d_dxgi1_4.h" #else +# define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_2 # include <pthread.h> # include "vkd3d.h" # include "vkd3d_utils.h" diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index d4fe79a..13fa3d6 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -58,9 +58,16 @@ static HRESULT signal_event(HANDLE event) return S_OK; } +static const struct vkd3d_application_info instance_default_application_info = +{ + .type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, + .api_version = VKD3D_API_VERSION_1_2, +}; + static const struct vkd3d_instance_create_info instance_default_create_info = { .type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + .next = &instance_default_application_info, .wchar_size = sizeof(WCHAR), .pfn_signal_event = signal_event, }; @@ -1078,6 +1085,7 @@ static void test_application_info(void) app_info.engine_version = 0; app_info.application_name = NULL; app_info.application_version = 0; + app_info.api_version = VKD3D_API_VERSION_1_0; create_info = instance_default_create_info; create_info.next = &app_info;

1 0

← Newer
1
2
3
4
5
6
7
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020