February 2024 - Wine-Commits

Piotr Caban : jsproxy: Don't ignore hostname and url length in InternetGetProxyInfo.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 53faf7bda8f88d386a572db3b505cae0af8057fc URL: https://gitlab.winehq.org/wine/wine/-/commit/53faf7bda8f88d386a572db3b505ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 1 16:20:23 2024 +0100 jsproxy: Don't ignore hostname and url length in InternetGetProxyInfo. --- dlls/jsproxy/main.c | 9 ++------- dlls/jsproxy/tests/jsproxy.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4e69210dce3..9506b7153cf 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -576,13 +576,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW SetLastError( ERROR_CAN_NOT_COMPLETE ); goto done; } - if (hostname && len_hostname < strlen( hostname )) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - goto done; - } - if (!(urlW = strdupAW( url, -1 ))) goto done; - if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done; + if (!(urlW = strdupAW( url, len_url ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; TRACE( "%s\n", debugstr_w(global_script->text) ); ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 505d1a9398a..901ffdf910e 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -104,7 +104,9 @@ static void test_InternetInitializeAutoProxyDll(void) static void test_InternetGetProxyInfo(void) { const char url[] = "http://localhost"; - char script[] = "function FindProxyForURL(url, host) { return \"DIRECT\"; }"; + char script[] = "function FindProxyForURL(url, host) { " + "if (url.substring(0, 4) === 'test') return url + ' ' + host; " + "return \"DIRECT\"; }"; char *proxy, host[] = "localhost"; AUTO_PROXY_SCRIPT_BUFFER buf; DWORD len, err; @@ -159,6 +161,14 @@ static void test_InternetGetProxyInfo(void) ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( "testa", 4, host, 4, &proxy, &len); + ok( ret, "got %lu\n", GetLastError() ); + ok( !strcmp( proxy, "test loca" ), "got \"%s\"\n", proxy ); + ok( len == 10, "got %lu\n", len ); + GlobalFree( proxy ); + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); }

1 0

Felix Münchhalfen : kernelbase/tests: Add a test for MapViewOfFile3 with MEM_REPLACE_PLACEHOLDER.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 1cbff7c8d60b2cc244135fcedda900dfceaa225b URL: https://gitlab.winehq.org/wine/wine/-/commit/1cbff7c8d60b2cc244135fcedda900… Author: Felix Münchhalfen <jan.felix.muenchhalfen(a)rwth-aachen.de> Date: Wed Jan 10 23:34:58 2024 +0100 kernelbase/tests: Add a test for MapViewOfFile3 with MEM_REPLACE_PLACEHOLDER. --- dlls/kernelbase/tests/process.c | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 88a527c45d5..90d6b5204eb 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -106,6 +106,11 @@ static void test_MapViewOfFile3(void) HANDLE file, mapping; void *ptr; BOOL ret; + SYSTEM_INFO system_info; + size_t file_size = 1024 * 1024; + void *allocation; + void *map_start, *map_end, *map_start_offset; + void *view; if (!pMapViewOfFile3) { @@ -132,6 +137,83 @@ static void test_MapViewOfFile3(void) CloseHandle( file ); ret = DeleteFileA( testfile ); ok(ret, "Failed to delete a test file.\n"); + + /* Tests for using MapViewOfFile3 together with MEM_RESERVE_PLACEHOLDER/MEM_REPLACE_PLACEHOLDER */ + /* like self pe-loading programs do (e.g. .net pe-loader). */ + /* With MEM_REPLACE_PLACEHOLDER, MapViewOfFile3/NtMapViewOfSection(Ex) shall relax alignment from 64k to pagesize */ + GetSystemInfo(&system_info); + mapping = CreateFileMappingA(NULL, NULL, PAGE_READWRITE, 0, (DWORD)file_size, NULL); + ok(mapping != NULL, "CreateFileMapping did not return a handle %lu\n", GetLastError()); + + allocation = pVirtualAlloc2(GetCurrentProcess(), NULL, file_size, + MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, NULL, 0); + ok(allocation != NULL, "VirtualAlloc2 returned NULL %lu\n", GetLastError()); + + map_start = (void*)((ULONG_PTR)allocation + system_info.dwPageSize); + map_end = (void*)((ULONG_PTR)map_start + system_info.dwPageSize); + ret = VirtualFree(map_start, system_info.dwPageSize, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "VirtualFree failed to split the placeholder %lu\n", GetLastError()); + + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_start, system_info.dwPageSize, + system_info.dwPageSize, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, NULL, 0); + ok(view != NULL, "MapViewOfFile3 did not map the file mapping %lu\n", GetLastError()); + + ret = UnmapViewOfFile(view); + ok(ret, "UnmapViewOfFile failed %lu\n", GetLastError()); + + map_start_offset = (void*)((ULONG_PTR)map_start - 1); + SetLastError(0xdeadbeef); + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_start_offset, system_info.dwPageSize, + system_info.dwPageSize, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, NULL, 0); + ok(view == NULL, "MapViewOfFile3 did map the file mapping, though baseaddr was not pagesize aligned\n"); + ok(GetLastError() == ERROR_MAPPED_ALIGNMENT, "MapViewOfFile3 did not return ERROR_MAPPED_ALIGNMENT(%u), instead it returned %lu\n", + ERROR_MAPPED_ALIGNMENT, GetLastError()); + + SetLastError(0xdeadbeef); + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_start, system_info.dwPageSize-1, + system_info.dwPageSize, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, NULL, 0); + ok(view == NULL, "MapViewOfFile3 did map the file mapping, though offset was not pagesize aligned\n"); + ok(GetLastError() == ERROR_MAPPED_ALIGNMENT, + "MapViewOfFile3 did not return ERROR_MAPPED_ALIGNMENT(%u), instead it returned %lu\n", + ERROR_MAPPED_ALIGNMENT, GetLastError()); + + ret = VirtualFree(allocation, 0, MEM_RELEASE); + ok(ret, "VirtualFree of first remaining region failed: %lu\n", GetLastError()); + + ret = VirtualFree(map_end, 0, MEM_RELEASE); + ok(ret, "VirtualFree of remaining region failed: %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_end, system_info.dwPageSize, 0, 0, PAGE_READWRITE, NULL, 0); + ok(view == NULL, "MapViewOfFile3 did map the file mapping, though baseaddr was not 64k aligned\n"); + ok(GetLastError() == ERROR_MAPPED_ALIGNMENT, + "MapViewOfFile3 did not return ERROR_MAPPED_ALIGNMENT(%u), instead it returned %lu\n", + ERROR_MAPPED_ALIGNMENT, GetLastError()); + + SetLastError(0xdeadbeef); + map_start = (void*)(((ULONG_PTR)allocation + system_info.dwAllocationGranularity) & ~((ULONG_PTR)system_info.dwAllocationGranularity-1)); + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_end, + system_info.dwPageSize, system_info.dwPageSize, 0, PAGE_READWRITE, NULL, 0); + ok(view == NULL, "MapViewOfFile3 did map the file mapping, though offset was not 64k aligned\n"); + ok(GetLastError() == ERROR_MAPPED_ALIGNMENT, + "MapViewOfFile3 did not return ERROR_MAPPED_ALIGNMENT(%u), instead it returned %lu\n", + ERROR_MAPPED_ALIGNMENT, GetLastError()); + + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_start, 0, + system_info.dwPageSize, 0, PAGE_READWRITE, NULL, 0); + ok(view != NULL, "MapViewOfFile3 failed though both baseaddr and offset were 64k aligned %lu\n", GetLastError()); + + ret = UnmapViewOfFile(view); + ok(ret, "UnmapViewOfFile failed %lu\n", GetLastError()); + + view = pMapViewOfFile3(mapping, GetCurrentProcess(), map_start, + 4*system_info.dwAllocationGranularity, system_info.dwPageSize, 0, PAGE_READWRITE, NULL, 0); + ok(view != NULL, "MapViewOfFile3 failed though both baseaddr and offset were 64k aligned %lu\n", GetLastError()); + + ret = UnmapViewOfFile(view); + ok(ret, "UnmapViewOfFile failed %lu\n", GetLastError()); + + ok(CloseHandle(mapping), "CloseHandle failed on mapping\n"); } #define check_region_size(p, s) check_region_size_(p, s, __LINE__)

1 0

Felix Münchhalfen : ntdll: Use pagesize alignment if MEM_REPLACE_PLACEHOLDER is set in flags of NtMapViewOfSection(Ex).
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 2f88259a441208b668429a4ae0b610712783be03 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f88259a441208b668429a4ae0b610… Author: Felix Münchhalfen <jan.felix.muenchhalfen(a)rwth-aachen.de> Date: Wed Jan 10 20:43:34 2024 +0100 ntdll: Use pagesize alignment if MEM_REPLACE_PLACEHOLDER is set in flags of NtMapViewOfSection(Ex). --- dlls/ntdll/unix/virtual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index abe1b4dc4ec..2a53f56879e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5466,6 +5466,9 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p } #endif + if (alloc_type & MEM_REPLACE_PLACEHOLDER) + mask = page_mask; + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT; @@ -5535,6 +5538,9 @@ NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr } #endif + if (alloc_type & MEM_REPLACE_PLACEHOLDER) + mask = page_mask; + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Brendan Shanks : winebuild: As a last resort, search for tools un-prefixed using clang.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: f5c00e3870937a91da8d9acce1681577e9a070d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c00e3870937a91da8d9acce16815… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 30 10:50:15 2024 -0800 winebuild: As a last resort, search for tools un-prefixed using clang. --- tools/winebuild/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 8d7c4c9afc2..6048b99f267 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -247,6 +247,7 @@ struct strarray find_tool( const char *name, const char * const *names ) if (!file && cc_command.count) file = find_clang_tool( cc_command, name ); if (!file) file = find_binary( "llvm", name ); if (!file) file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); + if (!file) file = find_clang_tool( empty_strarray, name ); if (!file) fatal_error( "cannot find the '%s' tool\n", name );

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfacePresentModesKHR driver entry.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 4a16bcf9ab9b87589a7e2dac69a0f86e242618a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a16bcf9ab9b87589a7e2dac69a0f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 22:30:47 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfacePresentModesKHR driver entry. --- dlls/winemac.drv/vulkan.c | 14 -------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winewayland.drv/vulkan.c | 16 ---------------- dlls/winex11.drv/vulkan.c | 13 ------------- include/wine/vulkan_driver.h | 5 +---- 6 files changed, 4 insertions(+), 51 deletions(-)

1 0

Alexandre Julliard : winedump: Handle ARM64 exception unwind info with flag==3.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: a97b3f640cc4d0564774c7c6911d02c87fb5975f URL: https://gitlab.winehq.org/wine/wine/-/commit/a97b3f640cc4d0564774c7c6911d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 12:28:47 2024 +0100 winedump: Handle ARM64 exception unwind info with flag==3. --- tools/winedump/pe.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4d60c130a4d..f405acb2710 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1645,11 +1645,14 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) const struct unwind_info_arm64 *info; const struct unwind_info_ext_arm64 *infoex; const struct unwind_info_epilog_arm64 *infoepi; + const struct runtime_function_arm64 *parent_func; const BYTE *ptr; unsigned int i, rva, codes, epilogs; - if (func->Flag) + switch (func->Flag) { + case 1: + case 2: printf( "\nFunction %08x-%08x:\n", func->BeginAddress, func->BeginAddress + func->FunctionLength * 4 ); printf( " len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", @@ -1657,6 +1660,13 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) func->H, func->CR, func->FrameSize ); dump_arm64_packed_info( func ); return; + case 3: + rva = func->UnwindData & ~3; + parent_func = RVA( rva, sizeof(*parent_func) ); + printf( "\nFunction %08x-%08x:\n", func->BeginAddress, + func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */ ); + printf( " forward to parent %08x\n", parent_func->BeginAddress ); + return; } rva = func->UnwindData;

1 0

Alexandre Julliard : winebuild: Default to plain "clang" in find_clang_tool().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: b1ab51b5084ffa19c47752b4bb94392486c55e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ab51b5084ffa19c47752b4bb9439… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 11:05:56 2024 +0100 winebuild: Default to plain "clang" in find_clang_tool(). --- tools/winebuild/utils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9f51a60c01f..5e0e2194f10 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -193,6 +193,7 @@ static const char *find_clang_tool( struct strarray clang, const char *tool ) size_t cnt; strarray_addall( &args, clang ); + if (!args.count) strarray_add( &args, "clang" ); strarray_add( &args, strmake( "-print-prog-name=%s", tool )); if (verbose) strarray_add( &args, "-v" ); @@ -247,11 +248,7 @@ struct strarray find_tool( const char *name, const char * const *names ) { if (cc_command.count) file = find_clang_tool( cc_command, name ); if (!file && !(file = find_binary( "llvm", name ))) - { - struct strarray clang = empty_strarray; - strarray_add( &clang, "clang" ); - file = find_clang_tool( clang, strmake( "llvm-%s", name )); - } + file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); } if (!file) fatal_error( "cannot find the '%s' tool\n", name ); @@ -267,12 +264,7 @@ struct strarray find_link_tool(void) if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); if (!file) file = find_binary( NULL, "lld-link" ); - if (!file) - { - struct strarray clang = empty_strarray; - strarray_add( &clang, "clang" ); - file = find_clang_tool( clang, "lld-link" ); - } + if (!file) file = find_clang_tool( empty_strarray, "lld-link" ); if (!file) fatal_error( "cannot find the 'lld-link' tool\n" ); strarray_add( &ret, file );

1 0

Brendan Shanks : winebuild: Refactor find_tool().
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: d292c7ec74a88b2de46dcde8ca89ab93a41bc1ea URL: https://gitlab.winehq.org/wine/wine/-/commit/d292c7ec74a88b2de46dcde8ca89ab… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 30 10:39:59 2024 -0800 winebuild: Refactor find_tool(). --- tools/winebuild/utils.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 5e0e2194f10..8d7c4c9afc2 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -244,12 +244,10 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file) - { - if (cc_command.count) file = find_clang_tool( cc_command, name ); - if (!file && !(file = find_binary( "llvm", name ))) - file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); - } + if (!file && cc_command.count) file = find_clang_tool( cc_command, name ); + if (!file) file = find_binary( "llvm", name ); + if (!file) file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); + if (!file) fatal_error( "cannot find the '%s' tool\n", name ); strarray_add( &ret, file );

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetDeviceGroupSurfacePresentModesKHR driver entry.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: d352b852a985a4e886af4704e34640d422d48577 URL: https://gitlab.winehq.org/wine/wine/-/commit/d352b852a985a4e886af4704e34640… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 15:44:22 2023 +0100 winevulkan: Remove now unnecessary vkGetDeviceGroupSurfacePresentModesKHR driver entry. --- dlls/winemac.drv/vulkan.c | 1 - dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winewayland.drv/vulkan.c | 14 -------------- dlls/winex11.drv/vulkan.c | 13 ------------- include/wine/vulkan_driver.h | 5 +---- 6 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index fe53bf15ee7..434d11542aa 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -572,7 +572,6 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkDestroySurfaceKHR, macdrv_vkDestroySwapchainKHR, macdrv_vkEnumerateInstanceExtensionProperties, - NULL, macdrv_vkGetDeviceProcAddr, macdrv_vkGetInstanceProcAddr, NULL, diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 420c67ab000..e4a734c284b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -160,7 +160,7 @@ PERF_CRITICAL_FUNCTIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 13 +DRIVER_VERSION = 14 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -201,7 +201,6 @@ USER_DRIVER_FUNCS = { "vkDestroySurfaceKHR", "vkDestroySwapchainKHR", "vkEnumerateInstanceExtensionProperties", - "vkGetDeviceGroupSurfacePresentModesKHR", "vkGetDeviceProcAddr", "vkGetInstanceProcAddr", "vkGetPhysicalDevicePresentRectanglesKHR", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 2b90c99a7f9..9cb270c9dea 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -39391,7 +39391,7 @@ static NTSTATUS thunk64_vkGetDeviceGroupSurfacePresentModesKHR(void *args) TRACE("%p, 0x%s, %p\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); - params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->host_device, wine_surface_from_handle(params->surface)->driver_surface, params->pModes); + params->result = wine_device_from_handle(params->device)->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle(params->device)->host_device, wine_surface_from_handle(params->surface)->host_surface, params->pModes); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -39408,7 +39408,7 @@ static NTSTATUS thunk32_vkGetDeviceGroupSurfacePresentModesKHR(void *args) TRACE("%#x, 0x%s, %#x\n", params->device, wine_dbgstr_longlong(params->surface), params->pModes); - params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->host_device, wine_surface_from_handle(params->surface)->driver_surface, (VkDeviceGroupPresentModeFlagsKHR *)UlongToPtr(params->pModes)); + params->result = wine_device_from_handle((VkDevice)UlongToPtr(params->device))->funcs.p_vkGetDeviceGroupSurfacePresentModesKHR(wine_device_from_handle((VkDevice)UlongToPtr(params->device))->host_device, wine_surface_from_handle(params->surface)->host_surface, (VkDeviceGroupPresentModeFlagsKHR *)UlongToPtr(params->pModes)); return STATUS_SUCCESS; } diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 5693294804c..c9bb8acceed 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -58,7 +58,6 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); -static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static VkResult (*pvkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *); @@ -545,17 +544,6 @@ static VkResult wayland_vkEnumerateInstanceExtensionProperties(const char *layer return res; } -static VkResult wayland_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, - VkSurfaceKHR surface, - VkDeviceGroupPresentModeFlagsKHR *flags) -{ - struct wine_vk_surface *wine_vk_surface = wine_vk_surface_from_handle(surface); - - TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(surface), flags); - - return pvkGetDeviceGroupSurfacePresentModesKHR(device, wine_vk_surface->host_surface, flags); -} - static void *wayland_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; @@ -770,7 +758,6 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkDestroySurfaceKHR); LOAD_FUNCPTR(vkDestroySwapchainKHR); LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); - LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR); LOAD_FUNCPTR(vkGetDeviceProcAddr); LOAD_FUNCPTR(vkGetInstanceProcAddr); LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR); @@ -800,7 +787,6 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR, .p_vkDestroySwapchainKHR = wayland_vkDestroySwapchainKHR, .p_vkEnumerateInstanceExtensionProperties = wayland_vkEnumerateInstanceExtensionProperties, - .p_vkGetDeviceGroupSurfacePresentModesKHR = wayland_vkGetDeviceGroupSurfacePresentModesKHR, .p_vkGetDeviceProcAddr = wayland_vkGetDeviceProcAddr, .p_vkGetInstanceProcAddr = wayland_vkGetInstanceProcAddr, .p_vkGetPhysicalDevicePresentRectanglesKHR = wayland_vkGetPhysicalDevicePresentRectanglesKHR, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index ba10a4a2ffc..576c0788fc1 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -81,7 +81,6 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); -static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static VkResult (*pvkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *); @@ -131,7 +130,6 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR); LOAD_FUNCPTR(vkGetSwapchainImagesKHR); LOAD_FUNCPTR(vkQueuePresentKHR); - LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR); LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR); #undef LOAD_FUNCPTR #undef LOAD_OPTIONAL_FUNCPTR @@ -454,16 +452,6 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, - VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR *flags) -{ - struct wine_vk_surface *x11_surface = surface_from_handle(surface); - - TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(surface), flags); - - return pvkGetDeviceGroupSurfacePresentModesKHR( device, x11_surface->host_surface, flags ); -} - static const char *wine_vk_host_fn_name( const char *name ) { if (!strcmp(name, "vkCreateWin32SurfaceKHR")) @@ -664,7 +652,6 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkDestroySurfaceKHR, X11DRV_vkDestroySwapchainKHR, X11DRV_vkEnumerateInstanceExtensionProperties, - X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, X11DRV_vkGetDeviceProcAddr, X11DRV_vkGetInstanceProcAddr, X11DRV_vkGetPhysicalDevicePresentRectanglesKHR, diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 6307d37fdf6..7e2e2e5ea70 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -13,7 +13,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 13 +#define WINE_VULKAN_DRIVER_VERSION 14 struct vulkan_funcs { @@ -28,7 +28,6 @@ struct vulkan_funcs void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); void (*p_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); VkResult (*p_vkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); - VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *); VkResult (*p_vkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *); @@ -55,8 +54,6 @@ static inline void *get_vulkan_driver_device_proc_addr( return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) return vulkan_funcs->p_vkDestroySwapchainKHR; - if (!strcmp(name, "GetDeviceGroupSurfacePresentModesKHR")) - return vulkan_funcs->p_vkGetDeviceGroupSurfacePresentModesKHR; if (!strcmp(name, "GetDeviceProcAddr")) return vulkan_funcs->p_vkGetDeviceProcAddr; if (!strcmp(name, "GetSwapchainImagesKHR"))

1 0

Alexandre Julliard : winedump: Make the ARM exception information more compact.
by Alexandre Julliard Feb. 1, 2024

Feb. 1, 2024

Module: wine Branch: master Commit: 3825af604129e5403ad7104676e3275a2afe0e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/3825af604129e5403ad7104676e327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 11:39:28 2024 +0100 winedump: Make the ARM exception information more compact. --- tools/winedump/pe.c | 103 ++++++++++++++++++++-------------------------------- 1 file changed, 39 insertions(+), 64 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c90a339e5ba..4d60c130a4d 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -985,7 +985,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { const struct unwind_info_armnt *info; const struct unwind_info_ext_armnt *infoex; - const struct unwind_info_epilogue_armnt *infoepi; + const struct unwind_info_epilogue_armnt *infoepi = NULL; unsigned int rva; WORD i, count = 0, words = 0; @@ -993,18 +993,11 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { char intregs[32] = {0}, intregspop[32] = {0}, vfpregs[32] = {0}; WORD pf = 0, ef = 0, fpoffset = 0, stack = fnc->StackAdjust; + const char *pfx = " ... "; - printf( "\nFunction %08x-%08x:\n", fnc->BeginAddress & ~1, - (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2 ); - printf( " Flag %x\n", fnc->Flag ); - printf( " FunctionLength %x\n", fnc->FunctionLength ); - printf( " Ret %x\n", fnc->Ret ); - printf( " H %x\n", fnc->H ); - printf( " Reg %x\n", fnc->Reg ); - printf( " R %x\n", fnc->R ); - printf( " L %x\n", fnc->L ); - printf( " C %x\n", fnc->C ); - printf( " StackAdjust %x\n", fnc->StackAdjust ); + printf( "\nFunction %08x-%08x: (flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u)\n", + fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2, + fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C ); if (fnc->StackAdjust >= 0x03f4) { @@ -1075,47 +1068,48 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) strcpy(vfpregs, "d8"); } + printf( " Prologue:\n" ); if (fnc->Flag == 1) { if (fnc->H) - printf( " Unwind Code\tpush {r0-r3}\n" ); + printf( "%s push {r0-r3}\n", pfx ); if (intregs[0]) - printf( " Unwind Code\tpush {%s}\n", intregs ); + printf( "%s push {%s}\n", pfx, intregs ); if (fnc->C && fpoffset == 0) - printf( " Unwind Code\tmov r11, sp\n" ); + printf( "%s mov r11, sp\n", pfx ); else if (fnc->C) - printf( " Unwind Code\tadd r11, sp, #%d\n", fpoffset * 4 ); + printf( "%s add r11, sp, #%d\n", pfx, fpoffset * 4 ); if (fnc->R && fnc->Reg != 0x07) - printf( " Unwind Code\tvpush {%s}\n", vfpregs ); + printf( "%s vpush {%s}\n", pfx, vfpregs ); if (stack && !pf) - printf( " Unwind Code\tsub sp, sp, #%d\n", stack * 4 ); + printf( "%s sub sp, sp, #%d\n", pfx, stack * 4 ); } if (fnc->Ret == 3) return; - printf( "Epilogue:\n" ); + printf( " Epilogue:\n" ); if (stack && !ef) - printf( " Unwind Code\tadd sp, sp, #%d\n", stack * 4 ); + printf( "%s add sp, sp, #%d\n", pfx, stack * 4 ); if (fnc->R && fnc->Reg != 0x07) - printf( " Unwind Code\tvpop {%s}\n", vfpregs ); + printf( "%s vpop {%s}\n", pfx, vfpregs ); if (intregspop[0]) - printf( " Unwind Code\tpop {%s}\n", intregspop ); + printf( "%s pop {%s}\n", pfx, intregspop ); if (fnc->H && !(fnc->L && fnc->Ret == 0)) - printf( " Unwind Code\tadd sp, sp, #16\n" ); + printf( "%s add sp, sp, #16\n", pfx ); else if (fnc->H && (fnc->L && fnc->Ret == 0)) - printf( " Unwind Code\tldr pc, [sp], #20\n" ); + printf( "%s ldr pc, [sp], #20\n", pfx ); if (fnc->Ret == 1) - printf( " Unwind Code\tbx <reg>\n" ); + printf( "%s bx <reg>\n", pfx ); else if (fnc->Ret == 2) - printf( " Unwind Code\tb <address>\n" ); + printf( "%s b <address>\n", pfx ); return; } @@ -1125,17 +1119,9 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) count = info->count; words = info->words; - printf( "\nFunction %08x-%08x:\n", fnc->BeginAddress & ~1, - (fnc->BeginAddress & ~1) + info->function_length * 2 ); - printf( " unwind info at %08x\n", fnc->UnwindData ); - printf( " Flag %x\n", fnc->Flag ); - printf( " FunctionLength %x\n", info->function_length ); - printf( " Version %x\n", info->version ); - printf( " X %x\n", info->x ); - printf( " E %x\n", info->e ); - printf( " F %x\n", info->f ); - printf( " Count %x\n", count ); - printf( " Words %x\n", words ); + printf( "\nFunction %08x-%08x: (ver=%u X=%u E=%u F=%u)\n", fnc->BeginAddress & ~1, + (fnc->BeginAddress & ~1) + info->function_length * 2, + info->version, info->x, info->e, info->f ); if (!info->count && !info->words) { @@ -1143,26 +1129,13 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) rva = rva + sizeof(*infoex); count = infoex->excount; words = infoex->exwords; - printf( " ExtCount %x\n", count ); - printf( " ExtWords %x\n", words ); } - if (!info->e) + if (!info->e) { infoepi = RVA( rva, count * sizeof(*infoepi) ); rva = rva + count * sizeof(*infoepi); - - for (i = 0; i < count; i++) - { - printf( " Epilogue Scope %x\n", i ); - printf( " Offset %x\n", infoepi[i].offset ); - printf( " Reserved %x\n", infoepi[i].res ); - printf( " Condition %x\n", infoepi[i].cond ); - printf( " Index %x\n", infoepi[i].index ); - } } - else - infoepi = NULL; if (words) { @@ -1174,6 +1147,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) rva = rva + words * sizeof(*codes); bytes = (BYTE*)codes; + printf( " Prologue:\n" ); for (b = 0; b < words * sizeof(*codes); b++) { BYTE code = bytes[b]; @@ -1181,7 +1155,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (info->e && b == count) { - printf( "Epilogue:\n" ); + printf( " Epilogue:\n" ); inepilogue = TRUE; } else if (!info->e && infoepi) @@ -1189,16 +1163,17 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) for (i = 0; i < count; i++) if (b == infoepi[i].index) { - printf( "Epilogue from Scope %x at %08x:\n", i, - (fnc->BeginAddress & ~1) + infoepi[i].offset * 2 ); + printf( " Epilogue %u at %08x: (res=%x cond=%x)\n", i, + (fnc->BeginAddress & ~1) + infoepi[i].offset * 2, + infoepi[i].res, infoepi[i].cond ); inepilogue = TRUE; } } - printf( " Unwind Code"); + printf( " "); for (i = 0; i < len; i++) printf( " %02x", bytes[b+i] ); - printf( "\t" ); + printf( " %*s", 3 * (3 - len), "" ); if (code == 0x00) printf( "\n" ); @@ -1232,16 +1207,16 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) printf( "mov sp, r%u\n", code & 0x0f ); else printf( "mov r%u, sp\n", code & 0x0f ); + else if (code <= 0xd3) + printf( "%s {r4-r%u}\n", inepilogue ? "pop" : "push", (code & 0x03) + 4 ); + else if (code <= 0xd4) + printf( "%s {r4, %s}\n", inepilogue ? "pop" : "push", inepilogue ? "pc" : "lr" ); else if (code <= 0xd7) - if (inepilogue) - printf( "pop {r4-r%u%s}\n", (code & 0x03) + 4, (code & 0x04) ? ", pc" : "" ); - else - printf( "push {r4-r%u%s}\n", (code & 0x03) + 4, (code & 0x04) ? ", lr" : "" ); + printf( "%s {r4-r%u, %s}\n", inepilogue ? "pop" : "push", (code & 0x03) + 4, inepilogue ? "pc" : "lr" ); + else if (code <= 0xdb) + printf( "%s {r4-r%u}\n", inepilogue ? "pop" : "push", (code & 0x03) + 8 ); else if (code <= 0xdf) - if (inepilogue) - printf( "pop {r4-r%u%s}\n", (code & 0x03) + 8, (code & 0x04) ? ", pc" : "" ); - else - printf( "push {r4-r%u%s}\n", (code & 0x03) + 8, (code & 0x04) ? ", lr" : "" ); + printf( "%s {r4-r%u, %s}\n", inepilogue ? "pop" : "push", (code & 0x03) + 8, inepilogue ? "pc" : "lr" ); else if (code <= 0xe7) printf( "%s {d8-d%u}\n", inepilogue ? "vpop" : "vpush", (code & 0x07) + 8 ); else if (code <= 0xeb)

1 0