September 2023 - Wine-commits

Joel Holdsworth : include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 26b8284d21c425f8eb039aaf230f216b4415ee79 URL: https://gitlab.winehq.org/wine/wine/-/commit/26b8284d21c425f8eb039aaf230f21… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 7 14:14:06 2023 +0100 include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- include/winternl.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index eadb36aa028..d0f37c2bada 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1451,12 +1451,26 @@ typedef struct _FILE_RENAME_INFORMATION { #define FILE_RENAME_IGNORE_READONLY_ATTRIBUTE 0x00000040 typedef struct _FILE_LINK_INFORMATION { - BOOLEAN ReplaceIfExists; + union { + BOOLEAN ReplaceIfExists; + ULONG Flags; + } DUMMYUNIONNAME; HANDLE RootDirectory; ULONG FileNameLength; WCHAR FileName[1]; } FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; +#define FILE_LINK_REPLACE_IF_EXISTS 0x00000001 +#define FILE_LINK_POSIX_SEMANTICS 0x00000002 +#define FILE_LINK_SUPPRESS_STORAGE_RESERVE_INHERITANCE 0x00000008 +#define FILE_LINK_NO_INCREASE_AVAILABLE_SPACE 0x00000010 +#define FILE_LINK_NO_DECREASE_AVAILABLE_SPACE 0x00000020 +#define FILE_LINK_PRESERVE_AVAILABLE_SPACE 0x00000030 +#define FILE_LINK_IGNORE_READONLY_ATTRIBUTE 0x00000040 +#define FILE_LINK_FORCE_RESIZE_TARGET_SR 0x00000080 +#define FILE_LINK_FORCE_RESIZE_SOURCE_SR 0x00000100 +#define FILE_LINK_FORCE_RESIZE_SR 0x00000180 + typedef struct _FILE_NAMES_INFORMATION { ULONG NextEntryOffset; ULONG FileIndex;

1 0

Joel Holdsworth : ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: c695f8906fc270c551ec9ebe0531d2ceabba5b79 URL: https://gitlab.winehq.org/wine/wine/-/commit/c695f8906fc270c551ec9ebe0531d2… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Sep 15 17:56:30 2023 +0100 ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 132 +++++++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 46 deletions(-)

1 0

Alex Henrie : include: Move RTL functions that belong in winnt.h from winternl.h to winnt.h.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 38a7e68af1170651bfef62f81e0242e9c33db281 URL: https://gitlab.winehq.org/wine/wine/-/commit/38a7e68af1170651bfef62f81e0242… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 18 23:24:36 2023 -0600 include: Move RTL functions that belong in winnt.h from winternl.h to winnt.h. --- include/winnt.h | 8 ++++++++ include/winternl.h | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e5dc402c694..d4137a64aea 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1911,6 +1911,10 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define WOW64_SIZE_OF_80387_REGISTERS 80 #define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 +#ifdef __x86_64__ +NTSYSAPI BOOLEAN NTAPI RtlIsEcCode(const void*); +#endif + /* Exception definitions */ #define EXCEPTION_READ_FAULT 0 @@ -2062,6 +2066,9 @@ typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64); #endif /* __aarch64__ */ +NTSYSAPI void NTAPI RtlRaiseException(struct _EXCEPTION_RECORD*); +NTSYSAPI void NTAPI RtlUnwind(void*,void*,struct _EXCEPTION_RECORD*,void*); + #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD_PTR,PVOID); @@ -6710,6 +6717,7 @@ typedef VOID (CALLBACK *PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WAIT, NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); +NTSYSAPI void* NTAPI RtlPcToFileHeader(void*,void**); typedef enum _RTL_UMS_THREAD_INFO_CLASS { diff --git a/include/winternl.h b/include/winternl.h index d3537cc774d..a233d8008ee 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4818,9 +4818,6 @@ NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTIO NTSYSAPI BOOLEAN WINAPI RtlIsCurrentProcess(HANDLE); NTSYSAPI BOOLEAN WINAPI RtlIsCurrentThread(HANDLE); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); -#ifdef __x86_64__ -NTSYSAPI BOOLEAN WINAPI RtlIsEcCode(const void*); -#endif NTSYSAPI BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlIsNormalizedString(ULONG,const WCHAR*,INT,BOOLEAN*); NTSYSAPI BOOLEAN WINAPI RtlIsProcessorFeaturePresent(UINT); @@ -4858,7 +4855,6 @@ NTSYSAPI ULONG WINAPI RtlOemStringToUnicodeSize(const STRING*); NTSYSAPI NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); -NTSYSAPI PVOID WINAPI RtlPcToFileHeader(PVOID,PVOID*); NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); @@ -4881,7 +4877,6 @@ NTSYSAPI NTSTATUS WINAPI RtlQueryRegistryValues(ULONG, PCWSTR, PRTL_QUERY_REGIS NTSYSAPI NTSTATUS WINAPI RtlQueryTimeZoneInformation(RTL_TIME_ZONE_INFORMATION*); NTSYSAPI BOOL WINAPI RtlQueryUnbiasedInterruptTime(ULONGLONG*); NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); -NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void DECLSPEC_NORETURN WINAPI RtlRaiseStatus(NTSTATUS); NTSYSAPI ULONG WINAPI RtlRandom(PULONG); NTSYSAPI ULONG WINAPI RtlRandomEx(PULONG); @@ -4954,7 +4949,6 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); -NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); NTSYSAPI WCHAR WINAPI RtlUpcaseUnicodeChar(WCHAR); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING *,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToAnsiString(STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

Alexandre Julliard : winebuild: Add a separate helper for .seh annotations.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 6828fc8b3a7fe1fd396a0f5ebe5cec95d24c7840 URL: https://gitlab.winehq.org/wine/wine/-/commit/6828fc8b3a7fe1fd396a0f5ebe5cec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:00:35 2023 +0200 winebuild: Add a separate helper for .seh annotations. --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 8 ++++---- tools/winebuild/spec32.c | 10 +++++----- tools/winebuild/utils.c | 13 +++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 733cd34e614..dfa8574a5da 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -246,6 +246,8 @@ extern int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern void output_seh( const char *format, ... ) + __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_rva( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_thunk_rva( int ordinal, const char *format, ... ) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index de4bc26f60d..1de0bea3faa 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1698,11 +1698,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output_cfi( ".seh_proc %s", asm_name( delay_load ) ); + output_seh( ".seh_proc %s", asm_name( delay_load ) ); output( "\tsubq $0x48, %%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 0x48" ); - output_cfi( ".seh_stackalloc 0x48" ); - output_cfi( ".seh_endprologue" ); + output_seh( ".seh_stackalloc 0x48" ); + output_seh( ".seh_endprologue" ); output( "\tmovq %%rcx, 0x40(%%rsp)\n" ); output( "\tmovq %%rdx, 0x38(%%rsp)\n" ); output( "\tmovq %%r8, 0x30(%%rsp)\n" ); @@ -1717,7 +1717,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\taddq $0x48, %%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset -0x48" ); output( "\tjmp *%%rax\n" ); - output_cfi( ".seh_endproc" ); + output_seh( ".seh_endproc" ); break; case CPU_ARM: output( "\tpush {r0-r3, FP, LR}\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 874c81d0ddc..e3c29acfa91 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -334,12 +334,12 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".seh_proc __wine_spec_relay_entry_point_%d", i ); + output_seh( ".seh_proc __wine_spec_relay_entry_point_%d", i ); output( "\tstp x29, x30, [sp, #-%u]!\n", stack_size + 16 ); - output_cfi( ".seh_save_fplr_x %u", stack_size + 16 ); + output_seh( ".seh_save_fplr_x %u", stack_size + 16 ); output( "\tmov x29, sp\n" ); - output_cfi( ".seh_set_fp" ); - output_cfi( ".seh_endprologue" ); + output_seh( ".seh_set_fp" ); + output_seh( ".seh_endprologue" ); switch (stack_size) { case 64: output( "\tstp x6, x7, [sp, #64]\n" ); @@ -363,7 +363,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tmov sp, x29\n" ); output( "\tldp x29, x30, [sp], #%u\n", stack_size + 16 ); output( "\tret\n"); - output_cfi( ".seh_endproc" ); + output_seh( ".seh_endproc" ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 49d2468b236..64437acf9ce 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -938,6 +938,19 @@ void output_cfi( const char *format, ... ) va_end( valist ); } +/* output a .seh directive */ +void output_seh( const char *format, ... ) +{ + va_list valist; + + if (!is_pe()) return; + va_start( valist, format ); + fputc( '\t', output_file ); + vfprintf( output_file, format, valist ); + fputc( '\n', output_file ); + va_end( valist ); +} + /* output an RVA pointer */ void output_rva( const char *format, ... ) {

1 0

Alexandre Julliard : winebuild: Remove unnecessary .cfi_startproc/endproc annotations.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: e3aa775a63e82dc04df4fa206961957f77fa4cab URL: https://gitlab.winehq.org/wine/wine/-/commit/e3aa775a63e82dc04df4fa20696195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 12:06:59 2023 +0200 winebuild: Remove unnecessary .cfi_startproc/endproc annotations. --- tools/winebuild/import.c | 20 ++++++-------------- tools/winebuild/spec32.c | 6 ------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1de0bea3faa..7f817990c44 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -756,10 +756,8 @@ void output_get_pc_thunk(void) output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration("__wine_spec_get_pc_thunk_eax") ); output( "%s:\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output_cfi( ".cfi_startproc" ); output( "\tmovl (%%esp),%%eax\n" ); output( "\tret\n" ); - output_cfi( ".cfi_endproc" ); output_function_size( "__wine_spec_get_pc_thunk_eax" ); } @@ -769,7 +767,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\n\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s\n", asm_globl(name) ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { @@ -811,7 +808,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tbr x16\n" ); break; } - output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -1144,7 +1140,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_delay_imp_%s_%s:\n", import->c_name, name ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { case CPU_i386: @@ -1183,7 +1178,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tb %s\n", asm_name(module_func) ); break; } - output_cfi( ".cfi_endproc" ); iat_pos += get_ptr_size(); } pos += 8 * 4; /* IMAGE_DELAYLOAD_DESCRIPTOR is 8 DWORDs */ @@ -1267,11 +1261,11 @@ void output_stubs( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", asm_name(name) ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { case CPU_i386: + output_cfi( ".cfi_startproc" ); /* flesh out the stub a bit to make safedisc happy */ output(" \tnop\n" ); output(" \tnop\n" ); @@ -1309,8 +1303,10 @@ void output_stubs( DLLSPEC *spec ) output( "\tmovl $.L__wine_spec_file_name,(%%esp)\n" ); } output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output_cfi( ".cfi_endproc" ); break; case CPU_x86_64: + output_cfi( ".cfi_startproc" ); output( "\tsubq $0x28,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 8" ); output( "\tleaq .L__wine_spec_file_name(%%rip),%%rcx\n" ); @@ -1319,6 +1315,7 @@ void output_stubs( DLLSPEC *spec ) else output( "\tmovq $%d,%%rdx\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output_cfi( ".cfi_endproc" ); break; case CPU_ARM: if (UsePIC) @@ -1362,7 +1359,6 @@ void output_stubs( DLLSPEC *spec ) default: assert(0); } - output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -1421,7 +1417,6 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration(name) ); output( "%s\n", asm_globl(name) ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { case CPU_i386: @@ -1483,7 +1478,6 @@ void output_syscalls( DLLSPEC *spec ) default: assert(0); } - output_cfi( ".cfi_endproc" ); output_function_size( name ); } @@ -1678,10 +1672,10 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "%s\n", asm_globl( delay_load ) ); output( "\t%s\n", func_declaration( delay_load ) ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { case CPU_i386: + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ecx\n" ); output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tpushl %%edx\n" ); @@ -1696,11 +1690,11 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tpopl %%ecx\n" ); output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tjmp *%%eax\n" ); + output_cfi( ".cfi_endproc" ); break; case CPU_x86_64: output_seh( ".seh_proc %s", asm_name( delay_load ) ); output( "\tsubq $0x48, %%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 0x48" ); output_seh( ".seh_stackalloc 0x48" ); output_seh( ".seh_endprologue" ); output( "\tmovq %%rcx, 0x40(%%rsp)\n" ); @@ -1715,7 +1709,6 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tmovq 0x38(%%rsp), %%rdx\n" ); output( "\tmovq 0x40(%%rsp), %%rcx\n" ); output( "\taddq $0x48, %%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -0x48" ); output( "\tjmp *%%rax\n" ); output_seh( ".seh_endproc" ); break; @@ -1750,7 +1743,6 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tbr x16\n" ); break; } - output_cfi( ".cfi_endproc" ); output_function_size( delay_load ); output_gnu_stack_note(); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index e3c29acfa91..96f1875da38 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -300,7 +300,6 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); if (has_float) output( "\tvpush {s0-s15}\n" ); @@ -324,7 +323,6 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); if (UsePIC) output( "2:\t.long .L__wine_spec_relay_descr-1b-%u\n", thumb_mode ? 4 : 8 ); - output_cfi( ".cfi_endproc" ); break; } @@ -371,7 +369,6 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) { default: output( "\tmovq %%%s,32(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); @@ -388,7 +385,6 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); output( "\tcallq *8(%%rcx)\n" ); output( "\tret\n" ); - output_cfi( ".cfi_endproc" ); break; default: @@ -583,7 +579,6 @@ void output_exports( DLLSPEC *spec ) output( "\t.long 0x90909090,0x90909090\n" ); if (name) output( "%s_%s:\n", asm_name("__wine_spec_imp"), name ); else output( "%s_%u:\n", asm_name("__wine_spec_imp"), i ); - output_cfi( ".cfi_startproc" ); switch (target.cpu) { @@ -604,7 +599,6 @@ void output_exports( DLLSPEC *spec ) default: assert(0); } - output_cfi( ".cfi_endproc" ); } }

1 0

Alexandre Julliard : winebuild: Add a few more SEH annotations.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 40c1c498a990a835cedee2d8db6fe6a0a5c114f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/40c1c498a990a835cedee2d8db6fe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 13:02:21 2023 +0200 winebuild: Add a few more SEH annotations. --- tools/winebuild/import.c | 22 ++++++++++++++++++++-- tools/winebuild/spec32.c | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7f817990c44..75e4dacf871 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1307,8 +1307,11 @@ void output_stubs( DLLSPEC *spec ) break; case CPU_x86_64: output_cfi( ".cfi_startproc" ); + output_seh( ".seh_proc %s", asm_name(name) ); output( "\tsubq $0x28,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 8" ); + output_cfi( ".cfi_adjust_cfa_offset 0x28" ); + output_seh( ".seh_stackalloc 0x28" ); + output_seh( ".seh_endprologue" ); output( "\tleaq .L__wine_spec_file_name(%%rip),%%rcx\n" ); if (exp_name) output( "leaq .L%s_string(%%rip),%%rdx\n", name ); @@ -1316,6 +1319,7 @@ void output_stubs( DLLSPEC *spec ) output( "\tmovq $%d,%%rdx\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); output_cfi( ".cfi_endproc" ); + output_seh( ".seh_endproc" ); break; case CPU_ARM: if (UsePIC) @@ -1343,6 +1347,8 @@ void output_stubs( DLLSPEC *spec ) } break; case CPU_ARM64: + output_seh( ".seh_proc %s", asm_name(name) ); + output_seh( ".seh_endprologue" ); output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_file_name") ); if (exp_name) @@ -1354,7 +1360,8 @@ void output_stubs( DLLSPEC *spec ) } else output( "\tmov x1, %u\n", odp->ordinal ); - output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tb %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output_seh( ".seh_endproc" ); break; default: assert(0); @@ -1436,6 +1443,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: + output_seh( ".seh_proc %s", asm_name(name) ); + output_seh( ".seh_endprologue" ); /* Chromium depends on syscall thunks having the same form as on * Windows. For 64-bit systems the only viable form we can emulate is * having an int $0x2e fallback. Since actually using an interrupt is @@ -1461,6 +1470,7 @@ void output_syscalls( DLLSPEC *spec ) output( "1:\tcallq *%s(%%rip)\n", asm_name("__wine_syscall_dispatcher") ); } output( "\tret\n" ); + output_seh( ".seh_endproc" ); break; case CPU_ARM: output( "\tpush {r0-r3}\n" ); @@ -1470,10 +1480,13 @@ void output_syscalls( DLLSPEC *spec ) output( "\tbx lr\n" ); break; case CPU_ARM64: + output_seh( ".seh_proc %s", asm_name(name) ); + output_seh( ".seh_endprologue" ); output( "\tmov x8, #%u\n", id ); output( "\tmov x9, x30\n" ); output( "\tbl %s\n", asm_name("__wine_syscall" )); output( "\tret\n" ); + output_seh( ".seh_endproc" ); break; default: assert(0); @@ -1724,8 +1737,12 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "1:\t.long %s\n", asm_name( import_desc ) ); break; case CPU_ARM64: + output_seh( ".seh_proc %s", asm_name( delay_load ) ); output( "\tstp x29, x30, [sp, #-80]!\n" ); + output_seh( ".seh_save_fplr_x 80" ); output( "\tmov x29, sp\n" ); + output_seh( ".seh_set_fp" ); + output_seh( ".seh_endprologue" ); output( "\tstp x0, x1, [sp, #16]\n" ); output( "\tstp x2, x3, [sp, #32]\n" ); output( "\tstp x4, x5, [sp, #48]\n" ); @@ -1741,6 +1758,7 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tldp x6, x7, [sp, #64]\n" ); output( "\tldp x29, x30, [sp], #80\n" ); output( "\tbr x16\n" ); + output_seh( ".seh_endproc" ); break; } output_function_size( delay_load ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 96f1875da38..c4267d7bba1 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -369,6 +369,8 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "\t.long 0x90909090,0x90909090\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); + output_seh( ".seh_proc __wine_spec_relay_entry_point_%d", i ); + output_seh( ".seh_endprologue" ); switch (odp->u.func.nb_args) { default: output( "\tmovq %%%s,32(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); @@ -385,6 +387,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); output( "\tcallq *8(%%rcx)\n" ); output( "\tret\n" ); + output_seh( ".seh_endproc" ); break; default:

1 0

Alexandre Julliard : winebuild: Make the syscall thunks position-independent on ARM64.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: cfaf09940a4390bb882959a76decdf1951913914 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfaf09940a4390bb882959a76decdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 19 13:12:03 2023 +0200 winebuild: Make the syscall thunks position-independent on ARM64. --- tools/winebuild/import.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 75e4dacf871..a9e536c3369 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1484,8 +1484,11 @@ void output_syscalls( DLLSPEC *spec ) output_seh( ".seh_endprologue" ); output( "\tmov x8, #%u\n", id ); output( "\tmov x9, x30\n" ); - output( "\tbl %s\n", asm_name("__wine_syscall" )); + output( "\tldr x16, 1f\n" ); + output( "\tldr x16, [x16]\n" ); + output( "\tblr x16\n" ); output( "\tret\n" ); + output( "1:\t.quad %s\n", asm_name("__wine_syscall_dispatcher") ); output_seh( ".seh_endproc" ); break; default: @@ -1523,14 +1526,6 @@ void output_syscalls( DLLSPEC *spec ) if (UsePIC) output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); output_function_size( "__wine_syscall" ); break; - case CPU_ARM64: - output( "\t.align %d\n", get_alignment(16) ); - output( "\t%s\n", func_declaration("__wine_syscall") ); - output( "%s:\n", asm_name("__wine_syscall") ); - output( "\tadrp x16, %s\n", arm64_page( asm_name("__wine_syscall_dispatcher") ) ); - output( "\tldr x16, [x16, #%s]\n", arm64_pageoff( asm_name("__wine_syscall_dispatcher") ) ); - output( "\tbr x16\n"); - output_function_size( "__wine_syscall" ); default: break; }

1 0

Jeff Smith : gdiplus/tests: Test GdipCreateFont character set initialization.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 13174a2f5fafdb9ec6ac046d8c805295ab6005de URL: https://gitlab.winehq.org/wine/wine/-/commit/13174a2f5fafdb9ec6ac046d8c8052… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Sep 15 17:37:55 2023 -0500 gdiplus/tests: Test GdipCreateFont character set initialization. --- dlls/gdiplus/tests/font.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 30cf159e140..7a9d50c8c2e 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -191,6 +191,78 @@ static void test_createfont(void) GdipDeleteFontFamily(fontfamily); } +static void test_createfont_charset(void) +{ + GpFontFamily* fontfamily = NULL; + GpGraphics *graphics; + GpFont* font = NULL; + GpStatus stat; + LOGFONTW lf; + HDC hdc; + UINT i; + + static const struct { + LPCWSTR family_name; + BYTE char_set; + BOOL todo; + } td[] = + { + {L"Tahoma", ANSI_CHARSET}, + {L"Symbol", SYMBOL_CHARSET}, + {L"Marlett", SYMBOL_CHARSET, TRUE}, + {L"Wingdings", SYMBOL_CHARSET, TRUE}, + }; + + hdc = CreateCompatibleDC(0); + stat = GdipCreateFromHDC(hdc, &graphics); + expect (Ok, stat); + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + winetest_push_context("%u", i); + + stat = GdipCreateFontFamilyFromName(td[i].family_name, NULL, &fontfamily); + expect (Ok, stat); + stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitPoint, &font); + expect (Ok, stat); + + stat = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, stat); + + if (lstrcmpiW(lf.lfFaceName, td[i].family_name) != 0) + { + skip("%s not installed\n", wine_dbgstr_w(td[i].family_name)); + } + else + { + ok(lf.lfHeight < 0, "Expected negative height, got %ld\n", lf.lfHeight); + expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); + ok((lf.lfWeight >= 100) && (lf.lfWeight <= 900), "Expected weight to be set\n"); + expect(0, lf.lfItalic); + expect(0, lf.lfUnderline); + expect(0, lf.lfStrikeOut); + todo_wine_if(td[i].todo) + ok(td[i].char_set == lf.lfCharSet || + (td[i].char_set == ANSI_CHARSET && lf.lfCharSet == GetTextCharset(hdc)), + "got %#x\n", lf.lfCharSet); + expect(0, lf.lfOutPrecision); + expect(0, lf.lfClipPrecision); + expect(0, lf.lfQuality); + expect(0, lf.lfPitchAndFamily); + } + + GdipDeleteFont(font); + GdipDeleteFontFamily(fontfamily); + + winetest_pop_context(); + } + + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + static void test_logfont(void) { LOGFONTA lfa, lfa2; @@ -1479,6 +1551,7 @@ START_TEST(font) test_font_substitution(); test_font_metrics(); test_createfont(); + test_createfont_charset(); test_logfont(); test_fontfamily(); test_fontfamily_properties();

1 0

Jeff Smith : gdiplus: Fix GdipCreateFont character set initialization.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: a51c15ff720f414fe383b62a3047a4208d489bb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a51c15ff720f414fe383b62a3047a4… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Fri Sep 15 23:25:22 2023 -0500 gdiplus: Fix GdipCreateFont character set initialization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34789 --- dlls/gdiplus/font.c | 1 + dlls/gdiplus/tests/font.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 7bd60750e6d..081fddf7c5d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -173,6 +173,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, lfw.lfItalic = style & FontStyleItalic; lfw.lfUnderline = style & FontStyleUnderline; lfw.lfStrikeOut = style & FontStyleStrikeout; + lfw.lfCharSet = DEFAULT_CHARSET; hfont = CreateFontIndirectW(&lfw); hdc = CreateCompatibleDC(0); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7a9d50c8c2e..8f0bbce0eb4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -204,13 +204,12 @@ static void test_createfont_charset(void) static const struct { LPCWSTR family_name; BYTE char_set; - BOOL todo; } td[] = { {L"Tahoma", ANSI_CHARSET}, {L"Symbol", SYMBOL_CHARSET}, - {L"Marlett", SYMBOL_CHARSET, TRUE}, - {L"Wingdings", SYMBOL_CHARSET, TRUE}, + {L"Marlett", SYMBOL_CHARSET}, + {L"Wingdings", SYMBOL_CHARSET}, }; hdc = CreateCompatibleDC(0); @@ -243,7 +242,6 @@ static void test_createfont_charset(void) expect(0, lf.lfItalic); expect(0, lf.lfUnderline); expect(0, lf.lfStrikeOut); - todo_wine_if(td[i].todo) ok(td[i].char_set == lf.lfCharSet || (td[i].char_set == ANSI_CHARSET && lf.lfCharSet == GetTextCharset(hdc)), "got %#x\n", lf.lfCharSet);

1 0

Henri Verbeet : vkd3d-shader: Export vkd3d_shader_build_varying_map.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: vkd3d Branch: master Commit: f796d8668e67b2dcf42fac9b615654fce8c975b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f796d8668e67b2dcf42fac9b61565… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 19 13:29:51 2023 +0200 vkd3d-shader: Export vkd3d_shader_build_varying_map. --- libs/vkd3d-shader/vkd3d_shader.map | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 8a596a80..a64b98e7 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -1,6 +1,7 @@ VKD3D_1_0 { global: + vkd3d_shader_build_varying_map; vkd3d_shader_compile; vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element;

1 0