April 2021 - Wine-Devel - list.winehq.org

[tools] winetest: Split the Windows 10 page by version.
by Francois Gouget April 14, 2021

April 14, 2021

There are many Windows 10 versions and mixing them all together makes for a very large page, with more and more differences between the oldest and newest versions. So create multiple Windows 10 pages. Add a new group every couple of years; put the results for the latest Windows 10 in the Win10 group; and the locale tests in the Win10L one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The grouping can be adjusted if desired. With the proposed split we should have: Win1507+ -> 8 runs Win1709+ -> 11 runs Win1909+ -> 5 runs (will go up as new Windows versions come out) Win10 -> 10 runs Win10L -> 11 runs (mostly locales) Rather than being tied to a specific Windows 10 version, Win10 and Win10L would be reserved for the two VMs where most test configurations are run: locales, dual-screen, test signing, etc. Also any past test result will remain in the Win10 group (unless the directories are manually renamed from win10_ to the appropriate winXXX_ prefix). Here is some information on the number of test results we normally have for each Windows 10 version. These may change if we decide to run more tests in some old Windows versions, like running both the 32- and 64-bit tests on 1909, or adjusting the set of locales to test: 1507 -> ~6 runs cw-gtx560-1507-32 cw-gtx560-1507-64 cw-rx460-1507-32 cw-rx460-1507-64 newtb-w1064v1507-32 newtb-w1064v1507-64 1607 -> ~2 run netwtb-w1064v1607-32 netwtb-w1064v1607-64 1709 -> ~5 runs cw-gtx560-1709-32 cw-gtx560-1709-64 cw-rx460-1709-32 cw-rx460-1709-64 newtb-w1064v1709-64 1809 -> ~6 runs cw-gtx560-1809-32 cw-gtx560-1809-64 cw-rx460-1809-32 cw-rx460-1809-64 newtb-w1064v1809-32 newtb-w1064v1809-64 1909 -> ~5 runs cw-gtx560-1909-32 cw-gtx560-1909-64 cw-rx460-1909-32 cw-rx460-1909-64 newtb-w1064v1909-64 2004 -> ~11 (locale) runs My current plan is to run the locales tests in the latest spring release. newtb-w10pro64-32 newtb-w10pro64-64 newtb-w10pro64-ar-64 newtb-w10pro64-fr-64 newtb-w10pro64-he-64 newtb-w10pro64-hi-64 newtb-w10pro64-ja-64 newtb-w10pro64-ko-64 newtb-w10pro64-pt-BR-64 newtb-w10pro64-ru-64 newtb-w10pro64-zh-CN-64 2009 -> ~10 runs And to add the fall releases to the VM that tests all the Windows 10 versions. That means ignoring old spring releases. fgtb-w10pro64-32 fgtb-w10pro64-64 fgtb-w10pro64-rx550-64 newtb-w1064-32 newtb-w1064-64 newtb-w1064-1qxl-64 newtb-w1064-2qxl-64 newtb-w1064-adm-64 newtb-w1064-tsign-32 newtb-w1064-tsign-64 --- winetest/build-index | 11 +++++++++-- winetest/gather | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 01533c4d4..2d25f2cb3 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -94,7 +94,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -103,7 +107,10 @@ my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, +my @groups = (\%w95, \%w98, \%me, + \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); @@ -384,7 +391,7 @@ foreach my $build (@builds) { while (<TOTAL>) { - if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) + if (/^([A-Za-z0-9+]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) { my ($name, $runs, $tests, $errors, $todos, $successes) = ($1, $2, $3, $4, $5, $6); $versions{$name}++; diff --git a/winetest/gather b/winetest/gather index 750f0eed4..a0a6d378f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -139,7 +139,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -150,7 +154,8 @@ my %wine = (name => "Wine"); # Define the order of version groups in the summary my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, \%win10, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes @@ -160,11 +165,12 @@ my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, vista => \%vista, 2008 => \%w2k8, win7 => \%win7, win8 => \%win8, win81 => \%win8, - win1507 => \%win10, win1511 => \%win10, - win1607 => \%win10, win1703 => \%win10, - win1709 => \%win10, win1803 => \%win10, - win1809 => \%win10, win1903 => \%win10, - win1909 => \%win10, win2004 => \%win10, + win1507 => \%win1507, win1511 => \%win1507, + win1607 => \%win1507, win1703 => \%win1507, + win1709 => \%win1709, win1803 => \%win1709, + win1809 => \%win1709, win1903 => \%win1709, + win1909 => \%win1909, + win2004 => \%win10l, win2009 => \%win10, win10 => \%win10, # for backward compatibility unknown => \%unknown, -- 2.20.1

2 2

[PATCH] ntdll: Add NtCreateThread stub.
by Gijs Vermeulen April 14, 2021

April 14, 2021

From: David Torok <dt(a)zeroitlab.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50952 Signed-off-by: David Torok <dt(a)zeroitlab.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/thread.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 881b57eb80a..a93fa08c406 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -183,7 +183,7 @@ @ stdcall -syscall NtCreateSection(ptr long ptr ptr long long long) @ stdcall -syscall NtCreateSemaphore(ptr long ptr long long) @ stdcall -syscall NtCreateSymbolicLinkObject(ptr long ptr ptr) -@ stub NtCreateThread +@ stdcall -syscall NtCreateThread(ptr long ptr long ptr ptr ptr long) @ stdcall -syscall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall -syscall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken @@ -1191,7 +1191,7 @@ @ stdcall -private -syscall ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @ stdcall -private -syscall ZwCreateSemaphore(ptr long ptr long long) NtCreateSemaphore @ stdcall -private -syscall ZwCreateSymbolicLinkObject(ptr long ptr ptr) NtCreateSymbolicLinkObject -@ stub ZwCreateThread +@ stdcall -private -syscall ZwCreateThread(ptr long ptr long ptr ptr ptr long) NtCreateThread @ stdcall -private -syscall ZwCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) NtCreateThreadEx @ stdcall -private -syscall ZwCreateTimer(ptr long ptr long) NtCreateTimer @ stub ZwCreateToken diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 543a214e056..b1c64f6f7a8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -144,6 +144,16 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB } } +/*********************************************************************** + * NtCreateThread (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb, + BOOLEAN suspended ) +{ + FIXME( "%p %d %p %p %p %p %p %d, stub!\n", handle, access, attr, process, id, ctx, teb, suspended ); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * NtCreateThreadEx (NTDLL.@) -- 2.31.1

3 3

[PATCH] wined3d: Allow wined3d_stream_info_from_declaration() to include inputs with no buffer set.
by Jan Sikorski April 14, 2021

April 14, 2021

Include these inputs in the Vulkan pipeline input descriptor. This prevents MoltenVK from rejecting the pipeline when they are consumed by the shader. We should probably also bind a null resource in that case to comply with Vulkan spec. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2debf50de7f..f2fdcddc261 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -154,7 +154,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, bool require_buffer) { /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; @@ -182,7 +182,7 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf TRACE("%p Element %p (%u of %u).\n", declaration->elements, element, i + 1, declaration->element_count); - if (!stream->buffer) + if (!stream->buffer && require_buffer) continue; TRACE("offset %u input_slot %u usage_idx %d.\n", element->offset, element->input_slot, element->usage_idx); @@ -269,7 +269,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi unsigned int i; WORD map; - wined3d_stream_info_from_declaration(stream_info, state, d3d_info); + wined3d_stream_info_from_declaration(stream_info, state, d3d_info, true); stream_info->all_vbo = 1; for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45133eabb69..96b732fb3aa 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2032,7 +2032,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) { - wined3d_stream_info_from_declaration(&stream_info, state, d3d_info); + wined3d_stream_info_from_declaration(&stream_info, state, d3d_info, false); divisor_count = 0; for (i = 0, mask = 0, attribute_count = 0, binding_count = 0; i < ARRAY_SIZE(stream_info.elements); ++i) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9240bad9d27..4bc683d3c40 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3789,7 +3789,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; - wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info); + wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info, true); state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d5f4765f57..ab5f2253462 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1678,7 +1678,8 @@ struct wined3d_stream_info }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, + bool require_buffer) DECLSPEC_HIDDEN; struct wined3d_direct_dispatch_parameters { -- 2.31.0

2 3

[PATCH] kernel32: Implement VirtualAllocFromApp().
by Paul Gofman April 14, 2021

April 14, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Used by Forza Horizon 4. .../api-ms-win-core-memory-l1-1-3.spec | 2 +- dlls/kernel32/tests/virtual.c | 39 ++++++++++++++++++- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 22 +++++++++++ include/winbase.h | 1 + 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec index b0d402b24c7..5b143ec1af3 100644 --- a/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec +++ b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec @@ -19,7 +19,7 @@ @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc -@ stub VirtualAllocFromApp +@ stdcall VirtualAllocFromApp(ptr long long long) kernelbase.VirtualAllocFromApp @ stdcall VirtualFree(ptr long long) kernel32.VirtualFree @ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx @ stdcall VirtualLock(ptr long) kernel32.VirtualLock diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e6d9e8621a9..4abaa5befd1 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -35,7 +35,7 @@ #define NUM_THREADS 4 #define MAPPING_SIZE 0x100000 -static HINSTANCE hkernel32, hntdll; +static HINSTANCE hkernel32, hkernelbase, hntdll; static SYSTEM_INFO si; static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); @@ -50,6 +50,7 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); +static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); /* ############################### */ @@ -443,6 +444,39 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } +static void test_VirtualAllocFromApp(void) +{ + void *p; + BOOL ret; + if (!pVirtualAllocFromApp) + { + win_skip("VirtualAllocFromApp is not available.\n"); + return; + } + + p = GetProcAddress(hkernel32, "VirtualAllocFromApp"); + ok(!p, "Found VirtualAllocFromApp in kernel32.dll.\n"); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); + ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %u.\n", p, GetLastError()); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); +} + static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; @@ -4238,6 +4272,7 @@ START_TEST(virtual) } hkernel32 = GetModuleHandleA("kernel32.dll"); + hkernelbase = GetModuleHandleA("kernelbase.dll"); hntdll = GetModuleHandleA("ntdll.dll"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); @@ -4252,6 +4287,7 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); + pVirtualAllocFromApp = (void *)GetProcAddress( hkernelbase, "VirtualAllocFromApp" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -4266,6 +4302,7 @@ START_TEST(virtual) test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); + test_VirtualAllocFromApp(); test_MapViewOfFile(); test_NtAreMappedFilesTheSame(); test_CreateFileMapping(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 615b928bd22..28cfd842223 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1678,7 +1678,7 @@ @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) -# @ stub VirtualAllocFromApp +@ stdcall VirtualAllocFromApp(ptr long long long) @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) @ stdcall VirtualLock(ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 60333db242f..4b71c0cc6ec 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -314,6 +314,28 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_ } +/*********************************************************************** + * VirtualAllocFromApp (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size, + DWORD type, DWORD protect ) +{ + LPVOID ret = addr; + + TRACE_(virtual)( "addr %p, size %p, type %#x, protect %#x.\n", addr, (void *)size, type, protect ); + + if (protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE + || protect == PAGE_EXECUTE_WRITECOPY) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (!set_ntstatus( NtAllocateVirtualMemory( GetCurrentProcess(), &ret, 0, &size, type, protect ))) return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index beb91371bb6..11a92fa84d9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2748,6 +2748,7 @@ WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAllocFromApp(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T); -- 2.30.2

1 0

[PATCH 3/3] winevulkan: Move wine_vk_init to loader.c.
by Jacek Caban April 14, 2021

April 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 67 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 53 +++---------------------- dlls/winevulkan/vulkan_private.h | 8 ++++ 3 files changed, 81 insertions(+), 47 deletions(-)

1 0

[PATCH 2/3] winevulkan: Move fill_luid_property and its callers to loader.c.
by Jacek Caban April 14, 2021

April 14, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 109 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 95 ---------------------------------- 2 files changed, 109 insertions(+), 95 deletions(-)

1 0

[PATCH 1/3] winevulkan: Remove native_vkGetInstanceProcAddrWINE.
by Jacek Caban April 14, 2021

April 14, 2021

It was needed for use cases like DXVK winelib builds. It was never really adopted and it's problematic for PE builds. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 14 -------------- dlls/winevulkan/winevulkan.spec | 1 - 3 files changed, 16 deletions(-)

1 0

[PATCH 1/2] setupapi: Demote ERR on opening driver key to a TRACE.
by Arkadiusz Hiler April 14, 2021

April 14, 2021

open_driver_key() is called by create_driver_key() and SetupDiOpenDevRegKey() which depend on the failure path to detect the presence of the key. This causes a lot of unnecessary errors being printed out. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0758fef5603..dd1ddaa9d33 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -560,7 +560,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) RegCloseKey(class_key); return l; } - ERR("Failed to open driver key, error %u.\n", l); + TRACE("Failed to open driver key, error %u.\n", l); } RegCloseKey(class_key); -- 2.31.1

3 8

[PATCH] wineboot: Prevent infinite loops when restarting the 64-bit wineboot.
by Francois Gouget April 14, 2021

April 14, 2021

Sometimes, when the wineprefix is broken, trying to switch to the 64-bit wineboot starts the 32-bit executable instead, resulting in a slow-burn fork bomb. Fortunately this is rare but typically results in a session crash and the loss of unsaved unrelated documents. So detect and nip infinite restart loops in the bud. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The troublesome code has been present for the past 10 years so this issue is pretty rare. So an alternative would be to just ignore it. But because of the potential for data loss in unrelated applications I'd still feel better if this fork-bomb had a safety pin. --- programs/wineboot/wineboot.c | 42 +++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 9427448b612..9d87c26c207 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1616,27 +1616,39 @@ int __cdecl main( int argc, char *argv[] ) if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { - STARTUPINFOW si; - PROCESS_INFORMATION pi; WCHAR filename[MAX_PATH]; - void *redir; - DWORD exit_code; - memset( &si, 0, sizeof(si) ); - si.cb = sizeof(si); GetModuleFileNameW( 0, filename, MAX_PATH ); - - Wow64DisableWow64FsRedirection( &redir ); - if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + if (GetEnvironmentVariableA("RESTARTING_64BIT_WINEBOOT", NULL, 0) + && GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + WINE_ERR( "got an infinite loop while starting the 64-bit %s\n", wine_dbgstr_w(filename) ); + } + else { - WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); - WaitForSingleObject( pi.hProcess, INFINITE ); - GetExitCodeProcess( pi.hProcess, &exit_code ); - ExitProcess( exit_code ); + STARTUPINFOW si; + PROCESS_INFORMATION pi; + void *redir; + DWORD exit_code; + + Wow64DisableWow64FsRedirection( &redir ); + SetEnvironmentVariableA("RESTARTING_64BIT_WINEBOOT", "1"); + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + WINE_TRACE( "restarting %s\n", wine_dbgstr_w(filename) ); + WaitForSingleObject( pi.hProcess, INFINITE ); + GetExitCodeProcess( pi.hProcess, &exit_code ); + ExitProcess( exit_code ); + } + else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + + Wow64RevertWow64FsRedirection( redir ); } - else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); - Wow64RevertWow64FsRedirection( redir ); } + SetEnvironmentVariableA("RESTARTING_64BIT_WINEBOOT", NULL); for (i = 1; i < argc; i++) { -- 2.20.1

1 0

[PATCH 1/5] wined3d: Issue queries through wined3d_device_context_ops.
by Zebediah Figura April 14, 2021

April 14, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 10 +++++++--- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb11851c1be..ae4d97873a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2213,16 +2213,18 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) InterlockedIncrement(&query->counter_retrieved); } -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +static void wined3d_cs_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_query_issue *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; op->flags = flags; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; } @@ -2796,6 +2798,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2919,6 +2922,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_push_constants, wined3d_cs_map, wined3d_cs_unmap, + wined3d_cs_issue_query, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1ef83891ddf..ed66794c757 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -507,7 +507,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) if (flags & WINED3DISSUE_END) ++query->counter_main; - wined3d_cs_emit_query_issue(query->device->cs, query, flags); + query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d5f4765f57..0af1258e355 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4692,6 +4692,7 @@ struct wined3d_device_context_ops unsigned int flags); HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); + void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); }; struct wined3d_device_context @@ -4737,7 +4738,6 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; -- 2.30.2

3 10