wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Alexandre Julliard : ntdll: Use the current machine by default to create an ARM64X process.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 1456b31eecfef91fc8ffc8c2de29ab69c5b5463b URL: https://gitlab.winehq.org/wine/wine/-/commit/1456b31eecfef91fc8ffc8c2de29ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 15:46:17 2024 +0100 ntdll: Use the current machine by default to create an ARM64X process. --- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/process.c | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 88b24420ec1..06959fa95df 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -480,7 +480,8 @@ char *get_alternate_wineloader( WORD machine ) if (machine == current_machine) return NULL; - if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */ + /* try the 64-bit loader */ + if (current_machine == IMAGE_FILE_MACHINE_I386 && machine == IMAGE_FILE_MACHINE_AMD64) { size_t len = strlen(wineloader); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 71eab55920d..b58d69fb28a 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -801,7 +801,12 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } goto done; } - if (!machine) machine = pe_info.machine; + if (!machine) + { + machine = pe_info.machine; + if (is_arm64ec() && pe_info.is_hybrid && machine == IMAGE_FILE_MACHINE_ARM64) + machine = main_image_info.Machine; + } if (!(startup_info = create_startup_info( attr.ObjectName, process_flags, params, &pe_info, &startup_info_size ))) goto done; env_size = get_env_size( params, &winedebug );

1 0

Alexandre Julliard : server: Add hybrid flag in image mapping information.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: de988eeea0801289adb9dbd2420a66d142382ab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/de988eeea0801289adb9dbd2420a66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 15:39:46 2024 +0100 server: Add hybrid flag in image mapping information. --- include/wine/server_protocol.h | 5 ++-- server/mapping.c | 68 ++++++++++++++++++++++++++++++++++-------- server/protocol.def | 3 +- 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0286ee7056e..e039cf59e72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -844,7 +844,8 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; - unsigned char padding : 5; + unsigned char is_hybrid : 1; + unsigned char padding : 4; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -6506,7 +6507,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 787 +#define SERVER_PROTOCOL_VERSION 788 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 13604455729..6b0de1b8b94 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -654,11 +654,10 @@ static int build_shared_mapping( struct mapping *mapping, int fd, return 0; } -/* load the CLR header from its section */ -static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int unix_fd, - IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +/* load a data directory header from its section */ +static int load_data_dir( void *dir, size_t dir_size, size_t va, size_t size, int unix_fd, + IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { - ssize_t ret; size_t map_size, file_size; off_t file_start; unsigned int i; @@ -672,18 +671,41 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int get_section_sizes( &sec[i], &map_size, &file_start, &file_size ); if (size >= map_size) continue; if (va - sec[i].VirtualAddress >= map_size - size) continue; - file_size = min( file_size, map_size ); - size = min( size, sizeof(*hdr) ); - ret = pread( unix_fd, hdr, min( size, file_size ), file_start + va - sec[i].VirtualAddress ); - if (ret <= 0) break; - if (ret < sizeof(*hdr)) memset( (char *)hdr + ret, 0, sizeof(*hdr) - ret ); - return (hdr->MajorRuntimeVersion > COR_VERSION_MAJOR_V2 || - (hdr->MajorRuntimeVersion == COR_VERSION_MAJOR_V2 && - hdr->MinorRuntimeVersion >= COR_VERSION_MINOR)); + if (size > dir_size) size = dir_size; + if (size > file_size) size = file_size; + return pread( unix_fd, dir, size, file_start + va - sec[i].VirtualAddress ); } return 0; } +/* load the CLR header from its section */ +static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int unix_fd, + IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +{ + int ret = load_data_dir( hdr, sizeof(*hdr), va, size, unix_fd, sec, nb_sec ); + + if (ret <= 0) return 0; + if (ret < sizeof(*hdr)) memset( (char *)hdr + ret, 0, sizeof(*hdr) - ret ); + return (hdr->MajorRuntimeVersion > COR_VERSION_MAJOR_V2 || + (hdr->MajorRuntimeVersion == COR_VERSION_MAJOR_V2 && + hdr->MinorRuntimeVersion >= COR_VERSION_MINOR)); +} + +/* load the LOAD_CONFIG header from its section */ +static int load_cfg_header( IMAGE_LOAD_CONFIG_DIRECTORY64 *cfg, size_t va, size_t size, + int unix_fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) +{ + unsigned int cfg_size; + int ret = load_data_dir( cfg, sizeof(*cfg), va, size, unix_fd, sec, nb_sec ); + + if (ret <= 0) return 0; + cfg_size = ret; + if (cfg_size < offsetof( IMAGE_LOAD_CONFIG_DIRECTORY64, Size ) + sizeof(cfg_size)) return 0; + if (cfg_size > cfg->Size) cfg_size = cfg->Size; + if (cfg_size < sizeof(*cfg)) memset( (char *)cfg + cfg_size, 0, sizeof(*cfg) - cfg_size ); + return 1; +} + /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { @@ -707,9 +729,14 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s IMAGE_OPTIONAL_HEADER64 hdr64; } opt; } nt; + union + { + IMAGE_LOAD_CONFIG_DIRECTORY32 cfg32; + IMAGE_LOAD_CONFIG_DIRECTORY64 cfg64; + } cfg; off_t pos; int size, has_relocs; - size_t mz_size, clr_va = 0, clr_size = 0; + size_t mz_size, clr_va = 0, clr_size = 0, cfg_va, cfg_size; unsigned int i; /* load the headers */ @@ -753,6 +780,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; } + cfg_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress; + cfg_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size; + mapping->image.base = nt.opt.hdr32.ImageBase; mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); @@ -801,6 +831,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; } + cfg_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress; + cfg_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].Size; + mapping->image.base = nt.opt.hdr64.ImageBase; mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); @@ -834,6 +867,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_IMAGE_FORMAT; } + mapping->image.is_hybrid = 0; mapping->image.padding = 0; mapping->image.map_addr = get_fd_map_address( mapping->fd ); mapping->image.image_charact = nt.FileHeader.Characteristics; @@ -875,6 +909,14 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } } + if (load_cfg_header( &cfg.cfg64, cfg_va, cfg_size, unix_fd, sec, nt.FileHeader.NumberOfSections )) + { + if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + mapping->image.is_hybrid = !!cfg.cfg32.CHPEMetadataPointer; + else + mapping->image.is_hybrid = !!cfg.cfg64.CHPEMetadataPointer; + } + if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) return STATUS_INVALID_FILE_FOR_SECTION; diff --git a/server/protocol.def b/server/protocol.def index ee4648350db..3c452e08e2a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -860,7 +860,8 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; - unsigned char padding : 5; + unsigned char is_hybrid : 1; + unsigned char padding : 4; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size;

1 0

Alexandre Julliard : ntdll: Redirect the module entry point for ARM64EC modules.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: 8c703f3e2f8162364564a0d47307887d9de5f2a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c703f3e2f8162364564a0d4730788… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 14:00:20 2024 +0100 ntdll: Redirect the module entry point for ARM64EC modules. --- dlls/ntdll/tests/wow64.c | 1 - dlls/ntdll/unix/loader.c | 19 ++++++++----------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 11 ++++++----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 941b127a2f6..a1beb9a4997 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -275,7 +275,6 @@ static void test_process_machine( HANDLE process, HANDLE thread, win32_entry is the redirected x86-64 -> ARM64EC one */ ok( image.TransferAddress != entry_point, "wrong entry %p\n", image.TransferAddress ); ok( image.TransferAddress != win32_entry, "wrong entry %p\n", image.TransferAddress ); - todo_wine ok( win32_entry != entry_point, "wrong win32 entry %p\n", win32_entry ); } } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 05284115b67..88b24420ec1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1585,24 +1585,23 @@ static void load_ntdll_wow64_functions( HMODULE module ) /*********************************************************************** - * redirect_arm64ec_ptr + * redirect_arm64ec_rva * - * Redirect a function pointer through the arm64ec redirection table. + * Redirect an address through the arm64ec redirection table. */ -static void *redirect_arm64ec_ptr( void *module, void *ptr, - const IMAGE_ARM64EC_REDIRECTION_ENTRY *map, ULONG map_count ) +ULONG_PTR redirect_arm64ec_rva( void *base, ULONG_PTR rva, const IMAGE_ARM64EC_METADATA *metadata ) { - int min = 0, max = map_count - 1; - ULONG_PTR rva = (char *)ptr - (char *)module; + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map = get_rva( base, metadata->RedirectionMetadata ); + int min = 0, max = metadata->RedirectionMetadataCount - 1; while (min <= max) { int pos = (min + max) / 2; - if (map[pos].Source == rva) return get_rva( module, map[pos].Destination ); + if (map[pos].Source == rva) return map[pos].Destination; if (map[pos].Source < rva) min = pos + 1; else max = pos - 1; } - return ptr; + return rva; } @@ -1615,13 +1614,11 @@ static void redirect_ntdll_functions( HMODULE module ) { const IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; const IMAGE_ARM64EC_METADATA *metadata; - const IMAGE_ARM64EC_REDIRECTION_ENTRY *map; if (!(loadcfg = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, NULL ))) return; if (!(metadata = (void *)loadcfg->CHPEMetadataPointer)) return; - if (!(map = get_rva( module, metadata->RedirectionMetadata ))) return; #define REDIRECT(name) \ - p##name = redirect_arm64ec_ptr( module, p##name, map, metadata->RedirectionMetadataCount ) + p##name = get_rva( module, redirect_arm64ec_rva( module, (char *)p##name - (char *)module, metadata )) REDIRECT( DbgUiRemoteBreakin ); REDIRECT( KiRaiseUserExceptionDispatcher ); REDIRECT( KiUserExceptionDispatcher ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index af746b220e8..cbf72651a9a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -191,6 +191,7 @@ extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ); extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, USHORT load_machine, WCHAR **image, void **module ); extern NTSTATUS load_start_exe( WCHAR **image, void **module ); +extern ULONG_PTR redirect_arm64ec_rva( void *module, ULONG_PTR rva, const IMAGE_ARM64EC_METADATA *metadata ); extern void start_server( BOOL debug ); extern unsigned int server_call_unlocked( void *req_ptr ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index cfe19eae89d..02c0bebe879 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2488,7 +2488,7 @@ static void alloc_arm64ec_map(void) * update_arm64ec_ranges */ static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, - const IMAGE_DATA_DIRECTORY *dir ) + const IMAGE_DATA_DIRECTORY *dir, UINT *entry_point ) { const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_CHPE_RANGE_ENTRY *map; @@ -2501,6 +2501,7 @@ static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, if (!arm64ec_view) alloc_arm64ec_map(); commit_arm64ec_map( view ); metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + *entry_point = redirect_arm64ec_rva( base, nt->OptionalHeader.AddressOfEntryPoint, metadata ); if (!metadata->CodeMap) return; map = (void *)(base + metadata->CodeMap); @@ -2865,11 +2866,11 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64))) { update_arm64x_mapping( view, nt, dir, sections ); - /* reload changed data from NT header */ - image_info->machine = nt->FileHeader.Machine; - image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + /* reload changed machine from NT header */ + image_info->machine = nt->FileHeader.Machine; } - if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) update_arm64ec_ranges( view, nt, dir ); + if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) + update_arm64ec_ranges( view, nt, dir, &image_info->entry_point ); } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED;

1 0

Alexandre Julliard : server: Don't update the entry point in the image information for ARM64EC modules.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: e05c6c821104d45344fc532a15f96360a24a0174 URL: https://gitlab.winehq.org/wine/wine/-/commit/e05c6c821104d45344fc532a15f963… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 13:10:44 2024 +0100 server: Don't update the entry point in the image information for ARM64EC modules. --- dlls/ntdll/tests/wow64.c | 39 ++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/server.c | 5 ++--- include/wine/server_protocol.h | 5 ++--- server/debugger.c | 2 +- server/mapping.c | 8 ++++++-- server/process.c | 13 +------------ server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 4 +--- 9 files changed, 49 insertions(+), 33 deletions(-)

1 0

Alexandre Julliard : server: Don't update the machine in the image information for ARM64EC modules.
by Alexandre Julliard 08 Feb '24

08 Feb '24

Module: wine Branch: master Commit: bd703632fd82cc2414e78f5f68b71dd587ed278c URL: https://gitlab.winehq.org/wine/wine/-/commit/bd703632fd82cc2414e78f5f68b71d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 8 12:17:23 2024 +0100 server: Don't update the machine in the image information for ARM64EC modules. --- server/mapping.c | 31 +++++++++++++------------------ server/object.h | 1 + server/process.c | 1 + 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index f754078acf7..69d8f71e23b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -404,14 +404,6 @@ struct memory_view *get_exe_view( struct process *process ) return LIST_ENTRY( list_head( &process->views ), struct memory_view, entry ); } -static void set_process_machine( struct process *process, struct memory_view *view ) -{ - if (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady) - process->machine = native_machine; - else - process->machine = view->image.machine; -} - static int generate_dll_event( struct thread *thread, int code, struct memory_view *view ) { if (!(view->flags & SEC_IMAGE)) return 0; @@ -420,7 +412,8 @@ static int generate_dll_event( struct thread *thread, int code, struct memory_vi } /* add a view to the process list */ -static void add_process_view( struct thread *thread, struct memory_view *view ) +/* return 1 if this is the main exe view */ +static int add_process_view( struct thread *thread, struct memory_view *view ) { struct process *process = thread->process; struct unicode_str name; @@ -434,18 +427,17 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) else if (!(view->image.image_charact & IMAGE_FILE_DLL)) { /* main exe */ - set_process_machine( process, view ); - list_add_head( &process->views, &view->entry ); - free( process->image ); process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; process->image_info = view->image; - return; + list_add_head( &process->views, &view->entry ); + return 1; } } list_add_tail( &process->views, &view->entry ); + return 0; } static void free_memory_view( struct memory_view *view ) @@ -1401,16 +1393,19 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; - view->image.machine = req->machine; view->image.entry_point = req->entry; - add_process_view( current, view ); + if (add_process_view( current, view )) + { + current->process->machine = (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady) ? + native_machine : req->machine; + } if (view->base != (mapping->image.map_addr ? mapping->image.map_addr : mapping->image.base)) set_error( STATUS_IMAGE_NOT_AT_BASE ); - if (view->image.machine != current->process->machine) + if (req->machine != current->process->machine) { /* on 32-bit, the native 64-bit machine is allowed */ - if (is_machine_64bit( current->process->machine ) || view->image.machine != native_machine) + if (is_machine_64bit( current->process->machine ) || req->machine != native_machine) set_error( STATUS_IMAGE_MACHINE_TYPE_MISMATCH ); } } @@ -1443,7 +1438,7 @@ DECL_HANDLER(map_builtin_view) view->image = *image; view->namelen = namelen; memcpy( view->name, image + 1, namelen ); - add_process_view( current, view ); + if (add_process_view( current, view )) current->process->machine = image->machine; } } diff --git a/server/object.h b/server/object.h index dfdd691601f..d4d66536b81 100644 --- a/server/object.h +++ b/server/object.h @@ -253,6 +253,7 @@ static inline int is_machine_supported( unsigned short machine ) { unsigned int i; for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == machine) return 1; + if (native_machine == IMAGE_FILE_MACHINE_ARM64) return machine == IMAGE_FILE_MACHINE_AMD64; return 0; } diff --git a/server/process.c b/server/process.c index e166aeae64e..39076351cea 100644 --- a/server/process.c +++ b/server/process.c @@ -656,6 +656,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->msg_fd = NULL; process->sigkill_timeout = NULL; process->sigkill_delay = TICKS_PER_SEC / 64; + process->machine = native_machine; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0;

1 0

Henri Verbeet : vkd3d: Use PRIuPTR for SIZE_T variables in debug traces.
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 5c917552c927835c6f446dbecf1aa6ff2cc30cbe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c917552c927835c6f446dbecf1aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 16:54:47 2024 +0100 vkd3d: Use PRIuPTR for SIZE_T variables in debug traces. --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/device.c | 11 ++++++----- libs/vkd3d/vkd3d_main.c | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9a3e44c6..8a47dc49 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5963,15 +5963,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndRenderPass(ID3D12GraphicsCom static void STDMETHODCALLTYPE d3d12_command_list_InitializeMetaCommand(ID3D12GraphicsCommandList5 *iface, ID3D12MetaCommand *meta_command, const void *parameters_data, SIZE_T data_size_in_bytes) { - FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %lu stub!\n", iface, - meta_command, parameters_data, data_size_in_bytes); + FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %"PRIuPTR" stub!\n", iface, + meta_command, parameters_data, (uintptr_t)data_size_in_bytes); } static void STDMETHODCALLTYPE d3d12_command_list_ExecuteMetaCommand(ID3D12GraphicsCommandList5 *iface, ID3D12MetaCommand *meta_command, const void *parameters_data, SIZE_T data_size_in_bytes) { - FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %lu stub!\n", iface, - meta_command, parameters_data, data_size_in_bytes); + FIXME("iface %p, meta_command %p, parameters_data %p, data_size_in_bytes %"PRIuPTR" stub!\n", iface, + meta_command, parameters_data, (uintptr_t)data_size_in_bytes); } static void STDMETHODCALLTYPE d3d12_command_list_BuildRaytracingAccelerationStructure(ID3D12GraphicsCommandList5 *iface, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7cdc5d77..90272818 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3487,8 +3487,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device7 struct d3d12_root_signature *object; HRESULT hr; - TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n", - iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature); + TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %"PRIuPTR", riid %s, root_signature %p.\n", + iface, node_mask, bytecode, (uintptr_t)bytecode_length, debugstr_guid(riid), root_signature); debug_ignored_node_mask(node_mask); @@ -4125,7 +4125,8 @@ static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device7 *iface static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePipelineLibrary(ID3D12Device7 *iface, const void *blob, SIZE_T blob_size, REFIID iid, void **lib) { - FIXME("iface %p, blob %p, blob_size %lu, iid %s, lib %p stub!\n", iface, blob, blob_size, debugstr_guid(iid), lib); + FIXME("iface %p, blob %p, blob_size %"PRIuPTR", iid %s, lib %p stub!\n", + iface, blob, (uintptr_t)blob_size, debugstr_guid(iid), lib); return DXGI_ERROR_UNSUPPORTED; } @@ -4322,9 +4323,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateMetaCommand(ID3D12Device7 *i SIZE_T data_size_in_bytes, REFIID iid, void **meta_command) { FIXME("iface %p, command_id %s, node_mask %#x, parameters_data %p, " - "data_size_in_bytes %lu, iid %s, meta_command %p stub!\n", iface, + "data_size_in_bytes %"PRIuPTR", iid %s, meta_command %p stub!\n", iface, debugstr_guid(command_id), node_mask, parameters_data, - data_size_in_bytes, debugstr_guid(iid), meta_command); + (uintptr_t)data_size_in_bytes, debugstr_guid(iid), meta_command); return E_NOTIMPL; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index f71b3701..7919b7d8 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -222,8 +222,8 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s struct d3d12_root_signature_deserializer *object; HRESULT hr; - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", - data, data_size, debugstr_guid(iid), deserializer); + TRACE("data %p, data_size %"PRIuPTR", iid %s, deserializer %p.\n", + data, (uintptr_t)data_size, debugstr_guid(iid), deserializer); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; @@ -406,8 +406,8 @@ HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZ struct vkd3d_shader_code dxbc = {data, data_size}; HRESULT hr; - TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", - data, data_size, debugstr_guid(iid), deserializer); + TRACE("data %p, data_size %"PRIuPTR", iid %s, deserializer %p.\n", + data, (uintptr_t)data_size, debugstr_guid(iid), deserializer); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_decrement().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 8ddca1ebaf376716baff259c4c7052a73404436d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ddca1ebaf376716baff259c4c705… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 13:21:09 2024 +0100 vkd3d: Get rid of vkd3d_atomic_decrement(). --- configure.ac | 1 - libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 14 -------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 0b84b1ab..4cb229d5 100644 --- a/configure.ac +++ b/configure.ac @@ -154,7 +154,6 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) -VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_BOOL_COMPARE_AND_SWAP], [__sync_bool_compare_and_swap], [__sync_bool_compare_and_swap((int *)0, 0, 0)]) VKD3D_CHECK_FUNC([HAVE_ATOMIC_EXCHANGE_N], [__atomic_exchange_n], [__atomic_exchange_n((int *)0, 0, 0)]) AC_CHECK_FUNCS([gettid]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 132ab228..9a3e44c6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1926,7 +1926,7 @@ static void d3d12_command_signature_incref(struct d3d12_command_signature *signa static void d3d12_command_signature_decref(struct d3d12_command_signature *signature) { - unsigned int refcount = vkd3d_atomic_decrement(&signature->internal_refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&signature->internal_refcount); if (!refcount) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 2368473a..8f4d1835 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2321,7 +2321,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) { if ((u.object = cache->heads[i].head)) { - vkd3d_atomic_decrement(&cache->free_count); + vkd3d_atomic_decrement_u32(&cache->free_count); cache->heads[i].head = u.header->next; vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); return u.object; @@ -2429,7 +2429,7 @@ void vkd3d_view_decref(void *view, struct d3d12_device *device) { union d3d12_desc_object u = {view}; - if (vkd3d_atomic_decrement(&u.header->refcount)) + if (vkd3d_atomic_decrement_u32(&u.header->refcount)) return; if (u.header->magic != VKD3D_DESCRIPTOR_MAGIC_CBV) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eb65397a..a74c49ea 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,11 +257,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) { } -static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) -{ - return InterlockedDecrement((LONG volatile *)x); -} - static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) { return InterlockedCompareExchange((LONG volatile *)x, xchg, cmp) == cmp; @@ -384,15 +379,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) ERR("Could not destroy the condition variable, error %d.\n", ret); } -# if HAVE_SYNC_SUB_AND_FETCH -static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) -{ - return __sync_sub_and_fetch(x, 1); -} -# else -# error "vkd3d_atomic_decrement() not implemented for this platform" -# endif /* HAVE_SYNC_SUB_AND_FETCH */ - # if HAVE_SYNC_BOOL_COMPARE_AND_SWAP static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) {

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_increment().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 6e439045e8f1de337c1dc2cfbe0da3875b11973d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e439045e8f1de337c1dc2cfbe0da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 13:17:29 2024 +0100 vkd3d: Get rid of vkd3d_atomic_increment(). --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 14 -------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 609300d3..132ab228 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1921,7 +1921,7 @@ HRESULT d3d12_command_allocator_create(struct d3d12_device *device, static void d3d12_command_signature_incref(struct d3d12_command_signature *signature) { - vkd3d_atomic_increment(&signature->internal_refcount); + vkd3d_atomic_increment_u32(&signature->internal_refcount); } static void d3d12_command_signature_decref(struct d3d12_command_signature *signature) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c04f4870..2368473a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2314,7 +2314,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) STATIC_ASSERT(!(ARRAY_SIZE(cache->heads) & HEAD_INDEX_MASK)); - i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) @@ -2345,7 +2345,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, /* Using the same index as above may result in a somewhat uneven distribution, * but the main objective is to avoid costly spinlock contention. */ - i = (vkd3d_atomic_increment(&cache->next_index)) & HEAD_INDEX_MASK; + i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) @@ -2357,7 +2357,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, u.header->next = head; cache->heads[i].head = u.object; vkd3d_atomic_exchange(&cache->heads[i].spinlock, 0); - vkd3d_atomic_increment(&cache->free_count); + vkd3d_atomic_increment_u32(&cache->free_count); } #undef HEAD_INDEX_MASK diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5955e616..eb65397a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,11 +257,6 @@ static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) { } -static inline unsigned int vkd3d_atomic_increment(unsigned int volatile *x) -{ - return InterlockedIncrement((LONG volatile *)x); -} - static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) { return InterlockedDecrement((LONG volatile *)x); @@ -398,15 +393,6 @@ static inline unsigned int vkd3d_atomic_decrement(unsigned int volatile *x) # error "vkd3d_atomic_decrement() not implemented for this platform" # endif /* HAVE_SYNC_SUB_AND_FETCH */ -# if HAVE_SYNC_ADD_AND_FETCH -static inline unsigned int vkd3d_atomic_increment(unsigned int volatile *x) -{ - return __sync_add_and_fetch(x, 1); -} -# else -# error "vkd3d_atomic_increment() not implemented for this platform" -# endif /* HAVE_SYNC_ADD_AND_FETCH */ - # if HAVE_SYNC_BOOL_COMPARE_AND_SWAP static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) {

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS9 in CheckFeatureSupport().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 18f73c1c4d9dbd4de9549c4eee1487b51146ced6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18f73c1c4d9dbd4de9549c4eee148… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 6 12:17:02 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS9 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1c07eb2..7cdc5d77 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3407,6 +3407,32 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS9: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS9 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->MeshShaderPipelineStatsSupported = FALSE; + data->MeshShaderSupportsFullRangeRenderTargetArrayIndex = FALSE; + data->AtomicInt64OnTypedResourceSupported = FALSE; + data->AtomicInt64OnGroupSharedSupported = FALSE; + data->DerivativesInMeshAndAmplificationShadersSupported = FALSE; + data->WaveMMATier = D3D12_WAVE_MMA_TIER_NOT_SUPPORTED; + + TRACE("Mesh shader pipeline stats support %#x.\n", data->MeshShaderPipelineStatsSupported); + TRACE("Mesh shader RT array index full range %#x.\n", data->MeshShaderSupportsFullRangeRenderTargetArrayIndex); + TRACE("Atomic int64 on typed resource %#x.\n", data->AtomicInt64OnTypedResourceSupported); + TRACE("Atomic int64 on group shared mem %#x.\n", data->AtomicInt64OnGroupSharedSupported); + TRACE("Derivatives in mesh and amp shaders %#x.\n", data->DerivativesInMeshAndAmplificationShadersSupported); + TRACE("Wave MMA tier %#x.\n", data->WaveMMATier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS8 in CheckFeatureSupport().
by Alexandre Julliard 07 Feb '24

07 Feb '24

Module: vkd3d Branch: master Commit: 8ea67b0ac61b0122826ff9f61b34fc20b3ead7ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ea67b0ac61b0122826ff9f61b34f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 31 17:09:59 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS8 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 299ecd6d..b1c07eb2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3391,6 +3391,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS8: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS8 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->UnalignedBlockTexturesSupported = FALSE; + + TRACE("Unaligned block texture support %#x.\n", data->UnalignedBlockTexturesSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024