June 2021 - Wine-commits - list.winehq.org

Jacek Caban : winevulkan: Reflect USE_STRUCT_CONVERSION in _host typedefs.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 8cbad5bc6d7c9d9a87390ed5ef1edc5d616a237e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cbad5bc6d7c9d9a87390ed5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:16:54 2021 +0200 winevulkan: Reflect USE_STRUCT_CONVERSION in _host typedefs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +- dlls/winevulkan/vulkan_thunks.h | 530 ++++++++++++++++++++++++++++++++-------- include/wine/vulkan.h | 3 + 3 files changed, 433 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cbad5bc6d7c9d9a8739…

1 0

Jacek Caban : winevulkan: Remove no longer needed #ifdefs from dispatch tables.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: b02e18f393053d849d696ba8bfe7d24736f29f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02e18f393053d849d696ba8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:17:03 2021 +0200 winevulkan: Remove no longer needed #ifdefs from dispatch tables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 18 +- dlls/winevulkan/vulkan_thunks.h | 440 ---------------------------------------- 2 files changed, 2 insertions(+), 456 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b02e18f393053d849d69…

1 0

Jacek Caban : winevulkan: Remove no longer needed #ifdefs.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 7e36a9d6039f6183b97016c9cd1f42dcd6aec154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e36a9d6039f6183b97016c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:17:25 2021 +0200 winevulkan: Remove no longer needed #ifdefs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9f181d92bc5..1c985aaf03c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -122,11 +122,7 @@ static uint64_t wine_vk_get_wrapper(struct VkInstance_T *instance, uint64_t nati static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagBitsEXT severity, VkDebugUtilsMessageTypeFlagsEXT message_types, -#if defined(USE_STRUCT_CONVERSION) const VkDebugUtilsMessengerCallbackDataEXT_host *callback_data, -#else - const VkDebugUtilsMessengerCallbackDataEXT *callback_data, -#endif void *user_data) { struct VkDebugUtilsMessengerCallbackDataEXT wine_callback_data; @@ -640,11 +636,8 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, for (i = 0; i < allocate_info->commandBufferCount; i++) { -#if defined(USE_STRUCT_CONVERSION) VkCommandBufferAllocateInfo_host allocate_info_host; -#else - VkCommandBufferAllocateInfo allocate_info_host; -#endif + /* TODO: future extensions (none yet) may require pNext conversion. */ allocate_info_host.pNext = allocate_info->pNext; allocate_info_host.sType = allocate_info->sType;

1 0

Jacek Caban : winevulkan: Directly use host vkGetPhysicalDeviceProperties in wine_vkCreateDevice.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 272542f4965067b91288ab678ac3987824c94dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=272542f4965067b91288ab67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 16:17:31 2021 +0200 winevulkan: Directly use host vkGetPhysicalDeviceProperties in wine_vkCreateDevice. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 1c985aaf03c..bdd9f2151c0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -70,9 +70,6 @@ static uint32_t wine_vk_count_struct_(void *s, VkStructureType t) static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); -void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, - VkPhysicalDeviceProperties *properties); - #define WINE_VK_ADD_DISPATCHABLE_MAPPING(instance, object, native_handle) \ wine_vk_add_handle_mapping((instance), (uint64_t) (uintptr_t) (object), (uint64_t) (uintptr_t) (native_handle), &(object)->mapping) #define WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, native_handle) \ @@ -694,9 +691,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (TRACE_ON(vulkan)) { - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceProperties_host properties; - wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + phys_dev->instance->funcs.p_vkGetPhysicalDeviceProperties(phys_dev->phys_dev, &properties); TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID);

1 0

Jacek Caban : winevulkan: Make core function thunks static.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 8285f616030f27877922ff414530d4f909306ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=8285f616030f27877922ff41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 31 18:01:42 2021 +0200 winevulkan: Make core function thunks static. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 338 ++++++++++++++++++++-------------------- 2 files changed, 170 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8285f616030f27877922…

1 0

Jacek Caban : winegcc: Use -soname for unix libs.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 388c91042ce5e16ada34b0ce56ad195aa446615f URL: https://source.winehq.org/git/wine.git/?a=commit;h=388c91042ce5e16ada34b0ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:01:10 2021 +0200 winegcc: Use -soname for unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 404c7b773ae..e43ad298e60 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -594,6 +594,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) } 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; }

1 0

Jacek Caban : winegcc: Link unix libs directly to native libraries.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 69ef7374b48c109126b1e15ae3b46403866fdecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ef7374b48c109126b1e15a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:02:56 2021 +0200 winegcc: Link unix libs directly to native libraries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 14 +++++++------- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 19 ++++++++++++++++--- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 0fe9b04b002..0b82af90683 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -271,39 +271,39 @@ static char* try_lib_path(const char* dir, const char* pre, } static file_type guess_lib_type(enum target_platform platform, const char* dir, - const char* library, const char *suffix, char** file) + const char* library, const char *prefix, const char *suffix, char** file) { if (platform != PLATFORM_WINDOWS && platform != PLATFORM_MINGW && platform != PLATFORM_CYGWIN) { /* Unix shared object */ - if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) + if ((*file = try_lib_path(dir, prefix, library, ".so", file_so))) return file_so; /* Mach-O (Darwin/Mac OS X) Dynamic Library behaves mostly like .so */ - if ((*file = try_lib_path(dir, "lib", library, ".dylib", file_so))) + if ((*file = try_lib_path(dir, prefix, library, ".dylib", file_so))) return file_so; /* Windows DLL */ - if ((*file = try_lib_path(dir, "lib", library, ".def", file_def))) + if ((*file = try_lib_path(dir, prefix, library, ".def", file_def))) return file_dll; } /* static archives */ - if ((*file = try_lib_path(dir, "lib", library, suffix, file_arh))) + if ((*file = try_lib_path(dir, prefix, library, suffix, file_arh))) return file_arh; return file_na; } file_type get_lib_type(enum target_platform platform, strarray* path, const char *library, - const char *suffix, char** file) + const char *prefix, const char *suffix, char** file) { unsigned int i; if (!suffix) suffix = ".a"; for (i = 0; i < path->size; i++) { - file_type type = guess_lib_type(platform, path->base[i], library, suffix, file); + file_type type = guess_lib_type(platform, path->base[i], library, prefix, suffix, file); if (type != file_na) return type; } return file_na; diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 9c70011a90f..39fe8a8d08a 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -85,7 +85,7 @@ char* get_basename(const char* file); void create_file(const char* name, int mode, const char* fmt, ...); file_type get_file_type(const char* filename); file_type get_lib_type(enum target_platform platform, strarray* path, const char *library, - const char *suffix, char** file); + const char *prefix, const char *suffix, char** file); const char *find_binary( const strarray* prefix, const char *name ); int spawn(const strarray* prefix, const strarray* arr, int ignore_errors); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e43ad298e60..bcabc4f7998 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1083,14 +1083,27 @@ static const char *find_libgcc(const strarray *prefix, const strarray *link_tool /* add specified library to the list of files */ static void add_library( struct options *opts, strarray *lib_dirs, strarray *files, const char *library ) { - char *static_lib, *fullname = 0; + char *static_lib, *fullname = 0, *unixlib; - switch(get_lib_type(opts->target_platform, lib_dirs, library, opts->lib_suffix, &fullname)) + switch(get_lib_type(opts->target_platform, lib_dirs, library, "lib", opts->lib_suffix, &fullname)) { case file_arh: strarray_add(files, strmake("-a%s", fullname)); break; case file_dll: + if (opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native")) + { + if (get_lib_type(opts->target_platform, lib_dirs, library, "", ".so", &unixlib) == file_so) + { + strarray_add(files, strmake("-s%s", unixlib)); + free(unixlib); + } + else + { + strarray_add(files, strmake("-l%s", library)); + } + break; + } strarray_add(files, strmake("-d%s", fullname)); if ((static_lib = find_static_lib(fullname))) { @@ -1266,7 +1279,7 @@ static void build(struct options* opts) /* set default entry point, if needed */ if (!opts->entry_point) { - if (opts->subsystem && !strcmp( opts->subsystem, "native" )) + if (opts->subsystem && !opts->unix_lib && !strcmp( opts->subsystem, "native" )) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup";

1 0

Jacek Caban : ntdll: Introduce wine_unix_call.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 1b5ea62e8ecf99adb97d23ce8a7d142d6b381cbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5ea62e8ecf99adb97d23ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:03:09 2021 +0200 ntdll: Introduce wine_unix_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 9 +++++++++ include/winternl.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 529bf6f269a..e2296f7cf27 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1612,6 +1612,7 @@ @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) # Unix interface +@ cdecl -syscall __wine_unix_call(int64 long ptr) @ cdecl __wine_set_unix_funcs(long ptr) @ cdecl __wine_init_unix_lib(long long ptr ptr) @ extern __wine_syscall_dispatcher diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ee66807997b..fb863bf17ad 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1123,6 +1123,15 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr } +/*********************************************************************** + * __wine_unix_call + */ +NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ) +{ + return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); +} + + /*********************************************************************** * load_so_dll */ diff --git a/include/winternl.h b/include/winternl.h index c688cdd5bb7..4f2fcc26682 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4561,6 +4561,9 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); +extern NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ); + +typedef NTSTATUS (*unixlib_entry_t)( void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

Jacek Caban : makedep: Make unix libs depend on ntdll.so.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: 32afe1d9825d59858879329c6e5b88ee115f2427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32afe1d9825d59858879329c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:03:22 2021 +0200 makedep: Make unix libs depend on ntdll.so. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index f19ddfc6b74..db076d0c057 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3362,7 +3362,10 @@ static void output_module( struct makefile *make ) strcat( unix_lib, dll_ext ); if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) + { strarray_add( &unix_imports, "ntdll" ); + strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); + } strarray_add( &unix_imports, "winecrt0" ); strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 1 ));

1 0

Jacek Caban : winepulse: Wrap unix call parameters in structs.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: f77af3dd6324fadaf153062d77b51f755f71faea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f77af3dd6324fadaf153062d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 19:05:01 2021 +0200 winepulse: Wrap unix call parameters in structs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 163 +++++++++++++++----- dlls/winepulse.drv/pulse.c | 335 ++++++++++++++++++++++++------------------ dlls/winepulse.drv/unixlib.h | 202 +++++++++++++++++++++---- 3 files changed, 493 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f77af3dd6324fadaf153…

1 0