November 2022 - Wine-commits

Alexandre Julliard : winegcc: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: f57c8d68bdc4c9f02d03fd65b333ccca0bdc2635 URL: https://gitlab.winehq.org/wine/wine/-/commit/f57c8d68bdc4c9f02d03fd65b333cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:07:13 2022 +0100 winegcc: Remove support for "hybrid" Unix libraries. --- tools/winegcc/winegcc.c | 23 +++-------------------- tools/winegcc/winegcc.man.in | 2 -- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ddd513e55d0..e1efa518925 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -172,7 +172,6 @@ struct options int nodefaultlibs; int noshortwchar; int data_only; - int unix_lib; int gui_app; int unicode_app; int win16_app; @@ -404,7 +403,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n switch (opts->target.platform) { case PLATFORM_APPLE: - strarray_add( &flags, opts->unix_lib ? "-dynamiclib" : "-bundle" ); + strarray_add( &flags, "-bundle" ); strarray_add( &flags, "-multiply_defined" ); strarray_add( &flags, "suppress" ); if (opts->image_base) @@ -413,12 +412,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, opts->image_base ); } if (opts->strip) strarray_add( &flags, "-Wl,-x" ); - if (opts->unix_lib) - { - strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); - strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); - } strarray_addall( &link_args, flags ); return link_args; @@ -522,7 +515,6 @@ static struct strarray get_link_args( struct options *opts, const char *output_n } if (!try_link( opts->prefix, link_args, "-Wl,-z,max-page-size=0x1000")) strarray_add( &flags, "-Wl,-z,max-page-size=0x1000"); - if (opts->unix_lib) strarray_add( &flags, strmake( "-Wl,-soname,%s.so", output_name )); break; } @@ -1262,7 +1254,7 @@ static void build(struct options* opts) /* set default entry point, if needed */ if (!opts->entry_point) { - if (opts->subsystem && !opts->unix_lib && !strcmp( opts->subsystem, "native" )) + if (opts->subsystem && !strcmp( opts->subsystem, "native" )) entry_point = (is_pe && opts->target.cpu == CPU_i386) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; @@ -1275,8 +1267,7 @@ static void build(struct options* opts) build_data_lib( opts, spec_file, output_file, files ); return; } - if (spec_file || !opts->unix_lib) - spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); + spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (opts->fake_module) return; /* nothing else to do */ @@ -1414,8 +1405,6 @@ static void build(struct options* opts) spawn(opts->prefix, tool, 0); } - if (opts->unix_lib) return; - if (opts->out_implib && !is_pe) { struct strarray tool, implib_args; @@ -1756,12 +1745,6 @@ int main(int argc, char **argv) { raw_compiler_arg = 0; } - else if (strcmp("-munix", opts.args.str[i]) == 0) - { - opts.unix_lib = 1; - raw_compiler_arg = 0; - raw_winebuild_arg = 1; - } else if (strcmp("-m16", opts.args.str[i]) == 0) { opts.win16_app = 1; diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 87c1496fd18..cb485492bea 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,8 +59,6 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.IP \fB-munix\fR -Set when building the Unix counterpart of a builtin module. .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Alexandre Julliard : winebuild: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: ac17191530c6fdaebe7e8761ed85212764ae3eb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac17191530c6fdaebe7e8761ed8521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:07:41 2022 +0100 winebuild: Remove support for "hybrid" Unix libraries. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 10 ---------- tools/winebuild/main.c | 4 +--- tools/winebuild/spec32.c | 1 - tools/winebuild/winebuild.man.in | 3 --- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a7ef23b199e..576304cd2b8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -360,7 +360,6 @@ extern int force_pointer_size; extern int unwind_tables; extern int use_dlltool; extern int use_msvcrt; -extern int unix_lib; extern int safe_seh; extern int prefer_native; extern int data_only; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c934e456cfe..9f87adcf593 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -497,8 +497,6 @@ static int has_stubs( const DLLSPEC *spec ) { int i; - if (unix_lib) return 0; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -543,8 +541,6 @@ static void check_undefined_forwards( DLLSPEC *spec ) char *link_name, *api_name, *dll_name, *p; int i; - if (unix_lib) return; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -575,8 +571,6 @@ static void check_undefined_exports( DLLSPEC *spec ) { int i; - if (unix_lib) return; - for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -616,8 +610,6 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) int i; unsigned int j; - if (unix_lib) return NULL; - as_file = open_temp_output_file( ".s" ); output( "\t.data\n" ); @@ -1375,8 +1367,6 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; - if (unix_lib) return; - for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 77339b2b4e7..875bf45f0a1 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -44,7 +44,6 @@ int force_pointer_size = 0; int unwind_tables = 0; int use_dlltool = 1; int use_msvcrt = 0; -int unix_lib = 0; int safe_seh = 0; int prefer_native = 0; int data_only = 0; @@ -408,7 +407,6 @@ static void option_callback( int optc, char *optarg ) else if (!strcmp( optarg, "arm" )) thumb_mode = 0; else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; - else if (!strcmp( optarg, "unix" )) unix_lib = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); @@ -646,7 +644,7 @@ int main(int argc, char **argv) case MODE_EXE: files = load_resources( files, spec ); if (spec_file_name && !parse_input_file( spec )) break; - if (!spec->init_func && !unix_lib) spec->init_func = xstrdup( get_default_entry_point( spec )); + if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) { diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c09e58084cc..a4a95f09c43 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -108,7 +108,6 @@ static int has_relays( DLLSPEC *spec ) static int get_exports_count( DLLSPEC *spec ) { - if (unix_lib) return 0; if (spec->base > spec->limit) return 0; return spec->limit - spec->base + 1; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 7f93a5befdc..23ef3495744 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -186,9 +186,6 @@ Set code generation options for the assembler. Build a library that uses the Windows runtime instead of the Unix C library. .TP -.B \-munix -Build the Unix counterpart of a builtin module. -.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the

1 0

Jacek Caban : winevulkan: Remove no longer used make_vulkan functions.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: a2dc7a4ad0864ee2fbab6a0a76c1ebc39446c06a URL: https://gitlab.winehq.org/wine/wine/-/commit/a2dc7a4ad0864ee2fbab6a0a76c1eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 16:25:10 2022 +0100 winevulkan: Remove no longer used make_vulkan functions. --- dlls/winevulkan/make_vulkan | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 26045f36055..da6e4568c18 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -642,18 +642,6 @@ class VkFunction(object): def returns_longlong(self): return self.type in ["uint64_t", "VkDeviceAddress"] - def needs_unwrapping(self): - """ Check if the function needs any input/output type unwrapping. - Functions need input/output unwrapping if struct parameters have - wrapped handles. - """ - - for p in self.params: - if p.needs_unwrapping(): - return True - - return False - def needs_dispatch(self): return self.dispatch @@ -747,7 +735,7 @@ class VkFunction(object): body += " return params.result;\n" return body - def body(self, conv, unwrap=True, params_prefix=""): + def body(self, conv, unwrap, params_prefix=""): body = "" needs_alloc = False @@ -2235,17 +2223,6 @@ class StructConversionFunction(object): return body - def _set_name(self): - name = "convert_{0}_".format(self.type) - win_type = "win32" if self.conv else "win64" - host_part = "host" if self.unwrap else "unwrapped_host" - if self.direction == Direction.INPUT: - name += "{0}_to_{1}".format(win_type, host_part) - else: # Direction.OUTPUT - name += "{0}_to_{1}".format(host_part, win_type) - - self.name = name - class ArrayConversionFunction(object): def __init__(self, array, direction, conv, unwrap):

1 0

Jacek Caban : winevulkan: Move needs_unwrapping implementation to VkVariable.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: ee4c61a1b55051a793ad9e7065d5f193ec026c0a URL: https://gitlab.winehq.org/wine/wine/-/commit/ee4c61a1b55051a793ad9e7065d5f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 16:33:03 2022 +0100 winevulkan: Move needs_unwrapping implementation to VkVariable. --- dlls/winevulkan/make_vulkan | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index da6e4568c18..ff964505bd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1203,6 +1203,20 @@ class VkVariable(object): return not self.handle.is_dispatchable() return False + def needs_unwrapping(self): + """ Returns if variable needs unwrapping of handle. """ + + if self.is_struct(): + return self.struct.needs_unwrapping() + + if self.is_handle(): + return self.handle.needs_unwrapping() + + if self.is_generic_handle(): + return True + + return False + def needs_alloc(self, conv, unwrap): """ Returns True if conversion needs allocation """ if self.is_dynamic_array(): @@ -1425,20 +1439,6 @@ class VkMember(VkVariable): def is_bit_field(self): return self.bit_width is not None - def needs_unwrapping(self): - """ Structures with wrapped handles need unwrapping. """ - - if self.is_struct(): - return self.struct.needs_unwrapping() - - if self.is_handle(): - return self.handle.is_wrapped() - - if self.is_generic_handle(): - return True - - return False - def needs_conversion(self, conv, unwrap, direction, struct_const): """ Check if member needs conversion. """ @@ -1678,18 +1678,6 @@ class VkParam(VkVariable): return True return False - def needs_unwrapping(self): - """ Returns if parameter needs unwrapping of handle. """ - - # Wrapped handle parameters are handled separately, only look for wrapped handles in structs - if self.is_struct(): - return self.struct.needs_unwrapping() - - if self.is_handle() and self.is_dynamic_array(): - return self.handle.needs_unwrapping() - - return False - def spec(self): """ Generate spec file entry for this parameter. """

1 0

Jacek Caban : winevulkan: Don't generate private thunk prototypes for PE-only functions.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 866c7de65fc9ad1f976ffc771423b3daa655522f URL: https://gitlab.winehq.org/wine/wine/-/commit/866c7de65fc9ad1f976ffc771423b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 14:21:34 2022 +0100 winevulkan: Don't generate private thunk prototypes for PE-only functions. --- dlls/winevulkan/make_vulkan | 9 ++++----- dlls/winevulkan/vulkan_thunks.h | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ff964505bd9..75121c8eef6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2,6 +2,7 @@ # Wine Vulkan generator # # Copyright 2017-2018 Roderick Colenbrander +# Copyright 2022 Jacek Caban for CodeWeavers # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -645,11 +646,9 @@ class VkFunction(object): def needs_dispatch(self): return self.dispatch - def needs_thunk(self): - return self.thunk_type != ThunkType.NONE - def needs_private_thunk(self): - return self.thunk_type == ThunkType.PRIVATE + return self.needs_exposing() and self.loader_thunk_type != ThunkType.NONE and \ + self.thunk_type != ThunkType.PUBLIC def needs_exposing(self): # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED @@ -2556,7 +2555,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.needs_exposing() or vk_func.thunk_type == ThunkType.PUBLIC: + if not vk_func.needs_private_thunk(): continue f.write("{0};\n".format(vk_func.prototype(prefix=prefix, postfix="DECLSPEC_HIDDEN", is_thunk=True))) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index c8da040a235..24c94e2b5ee 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -31,17 +31,14 @@ void wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const V VkResult wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; -VkResult wine_vkEnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumerateInstanceVersion(uint32_t *pApiVersion) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDeviceGroups(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; VkResult wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; void wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) DECLSPEC_HIDDEN; VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT *pTimestampInfos, uint64_t *pTimestamps, uint64_t *pMaxDeviation) DECLSPEC_HIDDEN; -PFN_vkVoidFunction wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; void wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) DECLSPEC_HIDDEN; void wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) DECLSPEC_HIDDEN; -PFN_vkVoidFunction wine_vkGetInstanceProcAddr(VkInstance instance, const char *pName) DECLSPEC_HIDDEN; VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice physicalDevice, uint32_t *pTimeDomainCount, VkTimeDomainEXT *pTimeDomains) DECLSPEC_HIDDEN; void wine_vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN; void wine_vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) DECLSPEC_HIDDEN;

1 0

Paul Gofman : ntdll: Pass alignemnt mask to map_view().
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: bf9dc3ff1f5eda01102b4f01ddd90cd058f3c336 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9dc3ff1f5eda01102b4f01ddd90c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 24 11:25:39 2022 -0500 ntdll: Pass alignemnt mask to map_view(). --- dlls/ntdll/unix/virtual.c | 64 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 29 deletions(-)

1 0

Paul Gofman : ntdll: Support specified alignment in NtAllocateVirtualMemoryEx().
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: 17328f4f5c2c6e9ccca64c8efe154143e2a57196 URL: https://gitlab.winehq.org/wine/wine/-/commit/17328f4f5c2c6e9ccca64c8efe1541… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 6 21:10:56 2022 -0500 ntdll: Support specified alignment in NtAllocateVirtualMemoryEx(). --- dlls/ntdll/tests/virtual.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/server.c | 7 +++++-- dlls/ntdll/unix/virtual.c | 24 ++++++++++++++++++------ include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 2c5e1d6ecc3..6831fe3c522 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -584,6 +584,48 @@ static void test_NtAllocateVirtualMemoryEx_address_requirements(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); ok(!status, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 1); + a.Alignment = 0x20000000; + size = 0x2000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_NO_MEMORY, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = NULL; + a.Alignment = 0x8000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x30000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x40000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(!status, "Unexpected status %08lx.\n", status); + ok(!((ULONG_PTR)addr & 0x3ffff), "Unexpected addr %p.\n", addr); + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + ok(!status, "Unexpected status %08lx.\n", status); + + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); } struct test_stack_size_thread_args diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b7d8733f2bc..07d9c8d3acd 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -358,7 +358,7 @@ static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTAT */ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self ) { - SIZE_T size, bits, limit; + SIZE_T size, bits, limit, align; void *addr; memset( result, 0, sizeof(*result) ); @@ -416,9 +416,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO addr = wine_server_get_ptr( call->virtual_alloc_ex.addr ); size = call->virtual_alloc_ex.size; limit = min( (ULONG_PTR)sbi.HighestUserAddress, call->virtual_alloc_ex.limit ); - if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size) + align = call->virtual_alloc_ex.align; + if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size + && align == call->virtual_alloc_ex.align) { r.HighestEndingAddress = (void *)limit; + r.Alignment = align; result->virtual_alloc_ex.status = NtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr, &size, call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot, &ext, 1 ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b1caaff8a13..3367913d4e2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3738,7 +3738,7 @@ void virtual_set_large_address_space(void) * NtAllocateVirtualMemory[Ex] implementation. */ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG type, ULONG protect, - ULONG_PTR limit ) + ULONG_PTR limit, ULONG_PTR align ) { void *base; unsigned int vprot; @@ -3800,7 +3800,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, limit, - granularity_mask ); + align ? align - 1 : granularity_mask ); if (status == STATUS_SUCCESS) base = view->base; } @@ -3888,7 +3888,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z else limit = 0; - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, 0 ); } @@ -3901,6 +3901,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s ULONG count ) { ULONG_PTR limit = 0; + ULONG_PTR align = 0; TRACE("%p %p %08lx %x %08x %p %u\n", process, *ret, *size_ptr, type, protect, parameters, count ); @@ -3930,17 +3931,27 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s } r = (MEM_ADDRESS_REQUIREMENTS *)parameters[i].Pointer; - if (r->LowestStartingAddress || r->Alignment) + if (r->LowestStartingAddress) FIXME( "Not supported requirements LowestStartingAddress %p, Alignment %p.\n", r->LowestStartingAddress, (void *)r->Alignment ); + if (r->Alignment) + { + if (*ret || (r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) + { + WARN( "Invalid alignment %lu.\n", r->Alignment ); + return STATUS_INVALID_PARAMETER; + } + align = r->Alignment; + } + limit = (ULONG_PTR)r->HighestEndingAddress; if (limit && (*ret || limit > (ULONG_PTR)user_space_limit || ((limit + 1) & (page_mask - 1)))) { WARN( "Invalid limit %p.\n", r->HighestEndingAddress); return STATUS_INVALID_PARAMETER; } - TRACE( "limit %p.\n", (void *)limit ); + TRACE( "limit %p, align %p.\n", (void *)limit, (void *)align ); } } @@ -3958,6 +3969,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s call.virtual_alloc_ex.addr = wine_server_client_ptr( *ret ); call.virtual_alloc_ex.size = *size_ptr; call.virtual_alloc_ex.limit = limit; + call.virtual_alloc_ex.align = align; call.virtual_alloc_ex.op_type = type; call.virtual_alloc_ex.prot = protect; status = server_queue_process_apc( process, &call, &result ); @@ -3971,7 +3983,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s return result.virtual_alloc_ex.status; } - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, align ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 58dd870a6ce..472c0ea709d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -526,6 +526,7 @@ typedef union client_ptr_t addr; mem_size_t size; mem_size_t limit; + mem_size_t align; unsigned int prot; } virtual_alloc_ex; struct @@ -6355,7 +6356,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 757 +#define SERVER_PROTOCOL_VERSION 758 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 06977c29054..8c2fbeb4afe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -542,6 +542,7 @@ typedef union client_ptr_t addr; /* requested address */ mem_size_t size; /* allocation size */ mem_size_t limit; /* allocation address limit */ + mem_size_t align; /* allocation alignment */ unsigned int prot; /* memory protection flags */ } virtual_alloc_ex; struct diff --git a/server/trace.c b/server/trace.c index 560a1b617ea..a0076d5449b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -193,6 +193,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc_ex.addr ); dump_uint64( ",size=", &call->virtual_alloc_ex.size ); dump_uint64( ",limit=", &call->virtual_alloc_ex.limit ); + dump_uint64( ",align=", &call->virtual_alloc_ex.align ); fprintf( stderr, ",op_type=%x,prot=%x", call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot ); break; case APC_VIRTUAL_FREE:

1 0

Martin Storsjö : ntdll: Readd the missed initialization of the thread register on arm.
by Alexandre Julliard 11 Nov '22

11 Nov '22

Module: wine Branch: master Commit: e05a8697026eb8d6d3e0ab4ab3df71d30e1e4a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/e05a8697026eb8d6d3e0ab4ab3df71… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Nov 11 11:17:04 2022 +0200 ntdll: Readd the missed initialization of the thread register on arm. This was missed in d3a68e434e9b19ac35066ebf47a01cea0a19b7da. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index fe51629838c..ba3a0ea1d8c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1594,6 +1594,8 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { CONTEXT_ALL }; + __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); + context.R0 = (DWORD)entry; context.R1 = (DWORD)arg; context.Sp = (DWORD)teb->Tib.StackBase;

1 0

Francisco Casas : vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2".
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: vkd3d Branch: fixes2 Commit: bf038eb3d525f54046b623a8d6b24fad68aaf235 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf038eb3d525f54046b623a8d6b24… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 12:59:09 2022 -0300 vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2". Unlike compatible_data_types() and implicit_compatible_data_types(), this function is intended to be symmetrical. So it makes sense to preserve the names "t1" and "t2" for the arguments. --- libs/vkd3d-shader/hlsl.y | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 750ae9de..198eb038 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1175,34 +1175,34 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) } } -static bool expr_compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) +static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { - if (src->base_type > HLSL_TYPE_LAST_SCALAR || dst->base_type > HLSL_TYPE_LAST_SCALAR) + if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) return false; /* Scalar vars can be converted to pretty much everything */ - if ((src->dimx == 1 && src->dimy == 1) || (dst->dimx == 1 && dst->dimy == 1)) + if ((t1->dimx == 1 && t1->dimy == 1) || (t2->dimx == 1 && t2->dimy == 1)) return true; - if (src->type == HLSL_CLASS_VECTOR && dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) return true; - if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) { /* Matrix-vector conversion is apparently allowed if either they have the same components count or the matrix is nx1 or 1xn */ - if (src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) { - if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) + if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; - return (src->type == HLSL_CLASS_MATRIX && (src->dimx == 1 || src->dimy == 1)) - || (dst->type == HLSL_CLASS_MATRIX && (dst->dimx == 1 || dst->dimy == 1)); + return (t1->type == HLSL_CLASS_MATRIX && (t1->dimx == 1 || t1->dimy == 1)) + || (t2->type == HLSL_CLASS_MATRIX && (t2->dimx == 1 || t2->dimy == 1)); } /* Both matrices */ - if ((src->dimx >= dst->dimx && src->dimy >= dst->dimy) - || (src->dimx <= dst->dimx && src->dimy <= dst->dimy)) + if ((t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + || (t1->dimx <= t2->dimx && t1->dimy <= t2->dimy)) return true; }

1 0

Rémi Bernon : kernel32/tests: Test more Global/Local functions with invalid pointers.
by Alexandre Julliard 10 Nov '22

10 Nov '22

Module: wine Branch: master Commit: 5c928bc0ef27ee28d232d98156e9792ce8bee721 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c928bc0ef27ee28d232d98156e979… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 9 14:21:40 2022 +0100 kernel32/tests: Test more Global/Local functions with invalid pointers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53741 --- dlls/kernel32/tests/heap.c | 109 ++++++++++++++++++++++++++++++++------------- 1 file changed, 79 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 83daa4dafa1..309274a66bf 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -241,34 +241,36 @@ static void test_HeapCreate(void) ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, NULL ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); -#if 0 /* crashes */ - SetLastError( 0xdeadbeef ); - ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); - ok( !ret, "HeapFree succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; - ret = HeapFree( heap, 0, ptr ); - ok( !ret, "HeapFree succeeded\n" ); - ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); -#endif + if (0) /* crashes */ + { + SetLastError( 0xdeadbeef ); + ret = HeapFree( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ret = HeapFree( heap, 0, ptr ); + ok( !ret, "HeapFree succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + } SetLastError( 0xdeadbeef ); ptr = HeapReAlloc( heap, 0, NULL, 1 ); ok( !ptr, "HeapReAlloc succeeded\n" ); todo_wine ok( GetLastError() == NO_ERROR, "got error %lu\n", GetLastError() ); -#if 0 /* crashes */ - SetLastError( 0xdeadbeef ); - ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); - ok( !ptr1, "HeapReAlloc succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; - ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); - ok( !ptr1, "HeapReAlloc succeeded\n" ); - ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); -#endif + if (0) /* crashes */ + { + SetLastError( 0xdeadbeef ); + ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; + ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); + ok( !ptr1, "HeapReAlloc succeeded\n" ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + } SetLastError( 0xdeadbeef ); ret = HeapValidate( heap, 0, NULL ); @@ -1557,14 +1559,18 @@ static void test_GlobalAlloc(void) todo_wine ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); -#if 0 /* corrupts Wine heap */ SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( mem, 0, GMEM_MOVEABLE ); - todo_wine ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); -#endif + if (sizeof(void *) != 8) /* crashes on 64-bit */ + { + SetLastError( 0xdeadbeef ); + tmp_mem = GlobalHandle( mem ); + ok( !tmp_mem, "GlobalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + } /* invalid handles are caught */ SetLastError( 0xdeadbeef ); @@ -1592,6 +1598,20 @@ static void test_GlobalAlloc(void) tmp_mem = GlobalReAlloc( invalid_mem, 0, GMEM_MOVEABLE ); ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + if (sizeof(void *) != 8) /* crashes on 64-bit */ + { + SetLastError( 0xdeadbeef ); + tmp_mem = GlobalHandle( invalid_mem ); + ok( !tmp_mem, "GlobalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pRtlGetUserInfoHeap( GetProcessHeap(), 0, invalid_mem, (void **)&tmp_ptr, &tmp_flags ); + todo_wine + ok( !ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + } /* invalid pointers are caught */ SetLastError( 0xdeadbeef ); @@ -1624,6 +1644,18 @@ static void test_GlobalAlloc(void) ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); todo_wine ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + tmp_mem = GlobalHandle( invalid_ptr ); + ok( !tmp_mem, "GlobalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + if (0) /* crashes */ + { + SetLastError( 0xdeadbeef ); + ret = pRtlGetUserInfoHeap( GetProcessHeap(), 0, invalid_ptr, (void **)&tmp_ptr, &tmp_flags ); + ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + } /* GMEM_FIXED block doesn't allow resize, though it succeeds with GMEM_MODIFY */ mem = GlobalAlloc( GMEM_FIXED, 10 ); @@ -1912,14 +1944,18 @@ static void test_LocalAlloc(void) ret = LocalUnlock( mem ); ok( !ret, "LocalUnlock succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); -#if 0 /* corrupts Wine heap */ SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( mem, 0, LMEM_MOVEABLE ); - todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); -#endif + if (sizeof(void *) != 8) /* crashes on 64-bit */ + { + SetLastError( 0xdeadbeef ); + tmp_mem = LocalHandle( mem ); + ok( !tmp_mem, "LocalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + } /* invalid handles are caught */ SetLastError( 0xdeadbeef ); @@ -1946,6 +1982,14 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( invalid_mem, 0, LMEM_MOVEABLE ); ok( !tmp_mem, "LocalReAlloc succeeded\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + if (sizeof(void *) != 8) /* crashes on 64-bit */ + { + SetLastError( 0xdeadbeef ); + tmp_mem = LocalHandle( invalid_mem ); + ok( !tmp_mem, "LocalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); + } /* invalid pointers are caught */ SetLastError( 0xdeadbeef ); @@ -1977,6 +2021,11 @@ static void test_LocalAlloc(void) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); todo_wine ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + tmp_mem = LocalHandle( invalid_ptr ); + ok( !tmp_mem, "LocalHandle succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); /* LMEM_FIXED block doesn't allow resize, though it succeeds with LMEM_MODIFY */ mem = LocalAlloc( LMEM_FIXED, 10 );

1 0