November 2022 - Wine-commits

Alexandre Julliard : winebuild: Use RVAs instead of absolute addresses in the delay import descriptors.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 0c39285077eb75783daa3c78226dc91e14266ed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c39285077eb75783daa3c78226dc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:00:00 2022 +0100 winebuild: Use RVAs instead of absolute addresses in the delay import descriptors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/delay_load.c | 46 ++++++++++++++----------------------- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 56 ++++++++++++++++++++++------------------------ tools/winebuild/spec32.c | 2 ++ 4 files changed, 47 insertions(+), 58 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 4ba840479d8..af14fce3668 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -24,49 +24,37 @@ #include "delayloadhandler.h" WINBASEAPI void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); - -#ifdef __WINE_PE_BUILD - -extern IMAGE_DOS_HEADER __ImageBase; - WINBASEAPI void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, IMAGE_THUNK_DATA* addr, ULONG flags ); -FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr ) +static inline void *image_base(void) { - return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 ); +#ifdef __WINE_PE_BUILD + extern IMAGE_DOS_HEADER __ImageBase; + return (void *)&__ImageBase; +#else + extern IMAGE_NT_HEADERS __wine_spec_nt_header; + return (void *)((__wine_spec_nt_header.OptionalHeader.ImageBase + 0xffff) & ~0xffff); +#endif } -#else /* __WINE_PE_BUILD */ - -struct ImgDelayDescr +FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr ) { - DWORD_PTR grAttrs; - LPCSTR szName; - HMODULE *phmod; - IMAGE_THUNK_DATA *pIAT; - const IMAGE_THUNK_DATA *pINT; - const IMAGE_THUNK_DATA *pBoundIAT; - const IMAGE_THUNK_DATA *pUnloadIAT; - DWORD_PTR dwTimeStamp; -}; + return ResolveDelayLoadedAPI( image_base(), descr, NULL, DelayLoadFailureHook, addr, 0 ); +} + +#ifndef __WINE_PE_BUILD -extern struct ImgDelayDescr __wine_spec_delay_imports[]; +extern IMAGE_DELAYLOAD_DESCRIPTOR __wine_spec_delay_imports[]; FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) { - struct ImgDelayDescr *descr = __wine_spec_delay_imports + HIWORD(id); - WORD func = LOWORD(id); - FARPROC proc; + const IMAGE_DELAYLOAD_DESCRIPTOR *descr = __wine_spec_delay_imports + HIWORD(id); + IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA *)((char *)image_base() + descr->ImportAddressTableRVA); - if (!*descr->phmod) *descr->phmod = LoadLibraryA( descr->szName ); - if (!*descr->phmod || - !(proc = GetProcAddress( *descr->phmod, (LPCSTR)descr->pINT[func].u1.Function ))) - proc = DelayLoadFailureHook( descr->szName, (LPCSTR)descr->pINT[func].u1.Function ); - descr->pIAT[func].u1.Function = (ULONG_PTR)proc; - return proc; + return __delayLoadHelper2( descr, thunk + LOWORD(id) ); } #endif /* __WINE_PE_BUILD */ diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index f501cca8f84..3b5ba0fff2a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -303,6 +303,7 @@ extern void read_undef_symbols( DLLSPEC *spec, struct strarray files ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); extern int has_imports(void); +extern int has_delay_imports(void); extern void output_get_pc_thunk(void); extern void output_module( DLLSPEC *spec ); extern void output_stubs( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 57adbef0d23..4c77c6cc60e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -821,6 +821,12 @@ int has_imports(void) return !list_empty( &dll_imports ); } +/* check if we need a delayed import directory */ +int has_delay_imports(void) +{ + return !list_empty( &dll_delayed ); +} + /* output the import table of a Win32 module */ static void output_immediate_imports(void) { @@ -928,7 +934,7 @@ static void output_immediate_import_thunks(void) /* output the delayed import table of a Win32 module */ static void output_delayed_imports( const DLLSPEC *spec ) { - int j, mod; + int j, iat_pos, int_pos, mod_pos; struct import *import; if (list_empty( &dll_delayed )) return; @@ -936,36 +942,28 @@ static void output_delayed_imports( const DLLSPEC *spec ) output( "\n/* delayed imports */\n\n" ); output( "\t.data\n" ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( ".L__wine_spec_delay_imports:\n" ); output( "%s\n", asm_globl("__wine_spec_delay_imports") ); /* list of dlls */ - j = mod = 0; + iat_pos = int_pos = mod_pos = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* grAttrs */ - output( "\t%s .L__wine_delay_name_%s\n", /* szName */ - get_asm_ptr_keyword(), import->c_name ); - output( "\t%s .L__wine_delay_modules+%d\n", /* phmod */ - get_asm_ptr_keyword(), mod * get_ptr_size() ); - output( "\t%s .L__wine_delay_IAT+%d\n", /* pIAT */ - get_asm_ptr_keyword(), j * get_ptr_size() ); - output( "\t%s .L__wine_delay_INT+%d\n", /* pINT */ - get_asm_ptr_keyword(), j * get_ptr_size() ); - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pBoundIAT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pUnloadIAT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* dwTimeStamp */ - j += import->nb_imports; - mod++; + output( "\t.long 1\n" ); /* Attributes */ + output_rva( ".L__wine_delay_name_%s", import->c_name ); /* DllNameRVA */ + output_rva( ".L__wine_delay_modules+%d", mod_pos ); /* ModuleHandleRVA */ + output_rva( ".L__wine_delay_IAT+%d", iat_pos ); /* ImportAddressTableRVA */ + output_rva( ".L__wine_delay_INT+%d", int_pos ); /* ImportNameTableRVA */ + output( "\t.long 0\n" ); /* BoundImportAddressTableRVA */ + output( "\t.long 0\n" ); /* UnloadInformationTableRVA */ + output( "\t.long 0\n" ); /* TimeDateStamp */ + iat_pos += import->nb_imports * get_ptr_size(); + int_pos += (import->nb_imports + 1) * get_ptr_size(); + mod_pos += get_ptr_size(); } - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* grAttrs */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* szName */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* phmod */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pIAT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pINT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pBoundIAT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* pUnloadIAT */ - output( "\t%s 0\n", get_asm_ptr_keyword() ); /* dwTimeStamp */ + output( "\t.long 0,0,0,0,0,0,0,0\n" ); + output( ".L__wine_spec_delay_imports_end:\n" ); output( "\n.L__wine_delay_IAT:\n" ); LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) @@ -986,12 +984,10 @@ static void output_delayed_imports( const DLLSPEC *spec ) for (j = 0; j < import->nb_imports; j++) { struct import_func *func = &import->imports[j]; - if (!func->name) - output( "\t%s %d\n", get_asm_ptr_keyword(), func->ordinal ); - else - output( "\t%s .L__wine_delay_data_%s_%s\n", - get_asm_ptr_keyword(), import->c_name, func->name ); + output_thunk_rva( func->name ? -1 : func->ordinal, + ".L__wine_delay_data_%s_%s", import->c_name, func->name ); } + output( "\t%s 0\n", get_asm_ptr_keyword() ); } output( "\n.L__wine_delay_modules:\n" ); @@ -1012,7 +1008,9 @@ static void output_delayed_imports( const DLLSPEC *spec ) { struct import_func *func = &import->imports[j]; if (!func->name) continue; + output( "\t.align %d\n", get_alignment(2) ); output( ".L__wine_delay_data_%s_%s:\n", import->c_name, func->name ); + output( "\t.short %d\n", func->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), func->name ); } } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index a4a95f09c43..296d15c5d3b 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -735,6 +735,8 @@ void output_module( DLLSPEC *spec ) data_dirs[1] = ".L__wine_spec_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ if (spec->nb_resources) data_dirs[2] = ".L__wine_spec_resources"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ + if (has_delay_imports()) + data_dirs[13] = ".L__wine_spec_delay_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT] */ output_data_directories( data_dirs );

1 0

Alexandre Julliard : winebuild: Generate a separate helper for each delay-imported module.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: a2d8e7a5d367a20ba973619b61d185b2335d2622 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2d8e7a5d367a20ba973619b61d185… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:09:12 2022 +0100 winebuild: Generate a separate helper for each delay-imported module. --- tools/winebuild/import.c | 165 ++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 81 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4c77c6cc60e..29a693d5908 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1031,88 +1031,91 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.text\n" ); output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - output( "\t%s\n", func_declaration("__wine_delay_load_asm") ); - output( "%s:\n", asm_name("__wine_delay_load_asm") ); - output_cfi( ".cfi_startproc" ); - switch (target.cpu) - { - case CPU_i386: - output( "\tpushl %%ecx\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tpushl %%edx\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tpushl %%eax\n" ); - output_cfi( ".cfi_adjust_cfa_offset 4" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tpopl %%edx\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tpopl %%ecx\n" ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); - output( "\tjmp *%%eax\n" ); - break; - case CPU_x86_64: - output( "\tsubq $0x98,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 0x98" ); - output( "\tmovq %%rdx,0x88(%%rsp)\n" ); - output( "\tmovq %%rcx,0x80(%%rsp)\n" ); - output( "\tmovq %%r8,0x78(%%rsp)\n" ); - output( "\tmovq %%r9,0x70(%%rsp)\n" ); - output( "\tmovq %%r10,0x68(%%rsp)\n" ); - output( "\tmovq %%r11,0x60(%%rsp)\n" ); - output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); - output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); - output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); - output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); - output( "\tmovq %%rax,%%rcx\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); - output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); - output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); - output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); - output( "\tmovq 0x60(%%rsp),%%r11\n" ); - output( "\tmovq 0x68(%%rsp),%%r10\n" ); - output( "\tmovq 0x70(%%rsp),%%r9\n" ); - output( "\tmovq 0x78(%%rsp),%%r8\n" ); - output( "\tmovq 0x80(%%rsp),%%rcx\n" ); - output( "\tmovq 0x88(%%rsp),%%rdx\n" ); - output( "\taddq $0x98,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -0x98" ); - output( "\tjmp *%%rax\n" ); - break; - case CPU_ARM: - output( "\tpush {r0-r3,FP,LR}\n" ); - output( "\tmov r0,IP\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov IP,r0\n"); - output( "\tpop {r0-r3,FP,LR}\n" ); - output( "\tbx IP\n"); - break; - case CPU_ARM64: - output( "\tstp x29, x30, [sp,#-80]!\n" ); - output( "\tmov x29, sp\n" ); - output( "\tstp x0, x1, [sp,#16]\n" ); - output( "\tstp x2, x3, [sp,#32]\n" ); - output( "\tstp x4, x5, [sp,#48]\n" ); - output( "\tstp x6, x7, [sp,#64]\n" ); - output( "\tmov x0, x16\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov x16, x0\n" ); - output( "\tldp x0, x1, [sp,#16]\n" ); - output( "\tldp x2, x3, [sp,#32]\n" ); - output( "\tldp x4, x5, [sp,#48]\n" ); - output( "\tldp x6, x7, [sp,#64]\n" ); - output( "\tldp x29, x30, [sp],#80\n" ); - output( "\tbr x16\n" ); - break; - } - output_cfi( ".cfi_endproc" ); - output_function_size( "__wine_delay_load_asm" ); - output( "\n" ); idx = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { + char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); + output( "\t.align %d\n", get_alignment(4) ); + output( "\t%s\n", func_declaration(module_func) ); + output( "%s:\n", asm_name(module_func) ); + output_cfi( ".cfi_startproc" ); + switch (target.cpu) + { + case CPU_i386: + output( "\tpushl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tpushl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tpopl %%edx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tpopl %%ecx\n" ); + output_cfi( ".cfi_adjust_cfa_offset -4" ); + output( "\tjmp *%%eax\n" ); + break; + case CPU_x86_64: + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); + output( "\tmovq %%rax,%%rcx\n" ); + output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); + output( "\tjmp *%%rax\n" ); + break; + case CPU_ARM: + output( "\tpush {r0-r3,FP,LR}\n" ); + output( "\tmov r0,IP\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov IP,r0\n"); + output( "\tpop {r0-r3,FP,LR}\n" ); + output( "\tbx IP\n"); + break; + case CPU_ARM64: + output( "\tstp x29, x30, [sp,#-80]!\n" ); + output( "\tmov x29, sp\n" ); + output( "\tstp x0, x1, [sp,#16]\n" ); + output( "\tstp x2, x3, [sp,#32]\n" ); + output( "\tstp x4, x5, [sp,#48]\n" ); + output( "\tstp x6, x7, [sp,#64]\n" ); + output( "\tmov x0, x16\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov x16, x0\n" ); + output( "\tldp x0, x1, [sp,#16]\n" ); + output( "\tldp x2, x3, [sp,#32]\n" ); + output( "\tldp x4, x5, [sp,#48]\n" ); + output( "\tldp x6, x7, [sp,#64]\n" ); + output( "\tldp x29, x30, [sp],#80\n" ); + output( "\tbr x16\n" ); + break; + } + output_cfi( ".cfi_endproc" ); + output_function_size( module_func ); + output( "\n" ); + for (j = 0; j < import->nb_imports; j++) { struct import_func *func = &import->imports[j]; @@ -1126,12 +1129,12 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_i386: case CPU_x86_64: output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); - output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: output( "\tmov ip, #%u\n", j ); if (idx) output( "\tmovt ip, #%u\n", idx ); - output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tb %s\n", asm_name(module_func) ); break; case CPU_ARM64: if (idx) @@ -1140,7 +1143,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) if (j) output( "\tmovk x16, #0x%x\n", j ); } else output( "\tmov x16, #0x%x\n", j ); - output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tb %s\n", asm_name(module_func) ); break; } output_cfi( ".cfi_endproc" );

1 0

Alexandre Julliard : winebuild: Pass the delay import descriptor to the __wine_spec_delay_load function.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 1181011c1ee01f62bb2c891cc99a5f252bc8c3f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1181011c1ee01f62bb2c891cc99a5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:23:26 2022 +0100 winebuild: Pass the delay import descriptor to the __wine_spec_delay_load function. --- dlls/winecrt0/delay_load.c | 5 +---- tools/winebuild/import.c | 49 ++++++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index af14fce3668..219c9e741b4 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -47,11 +47,8 @@ FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAG #ifndef __WINE_PE_BUILD -extern IMAGE_DELAYLOAD_DESCRIPTOR __wine_spec_delay_imports[]; - -FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) +FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, unsigned int id ) { - const IMAGE_DELAYLOAD_DESCRIPTOR *descr = __wine_spec_delay_imports + HIWORD(id); IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA *)((char *)image_base() + descr->ImportAddressTableRVA); return __delayLoadHelper2( descr, thunk + LOWORD(id) ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 29a693d5908..8245819ebfd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,7 +943,6 @@ static void output_delayed_imports( const DLLSPEC *spec ) output( "\t.data\n" ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_delay_imports:\n" ); - output( "%s\n", asm_globl("__wine_spec_delay_imports") ); /* list of dlls */ @@ -1014,13 +1013,12 @@ static void output_delayed_imports( const DLLSPEC *spec ) output( "\t%s \"%s\"\n", get_asm_string_keyword(), func->name ); } } - output_function_size( "__wine_spec_delay_imports" ); } /* output the delayed import thunks of a Win32 module */ static void output_delayed_import_thunks( const DLLSPEC *spec ) { - int idx, j, pos; + int j, pos; struct import *import; static const char delayed_import_loaders[] = "__wine_spec_delayed_import_loaders"; static const char delayed_import_thunks[] = "__wine_spec_delayed_import_thunks"; @@ -1032,7 +1030,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - idx = 0; + pos = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); @@ -1049,8 +1047,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset 4" ); output( "\tpushl %%eax\n" ); output_cfi( ".cfi_adjust_cfa_offset 4" ); + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_spec_delay_imports+%d-1b(%%eax),%%eax\n", pos ); + output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + needs_get_pc_thunk = 1; + } + else + { + output( "\tpushl $.L__wine_spec_delay_imports+%d\n", pos ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + } output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output_cfi( ".cfi_adjust_cfa_offset -4" ); + output_cfi( ".cfi_adjust_cfa_offset -8" ); output( "\tpopl %%edx\n" ); output_cfi( ".cfi_adjust_cfa_offset -4" ); output( "\tpopl %%ecx\n" ); @@ -1070,7 +1081,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); - output( "\tmovq %%rax,%%rcx\n" ); + output( "\tleaq .L__wine_spec_delay_imports+%d(%%rip),%%rcx\n", pos ); + output( "\tmovq %%rax,%%rdx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); @@ -1088,11 +1100,17 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r0-r3,FP,LR}\n" ); - output( "\tmov r0,IP\n" ); + output( "\tmov r1,IP\n" ); + output( "\tldr r0, 1f\n"); + if (UsePIC) output( "2:\tadd r0, pc\n" ); output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmov IP,r0\n"); output( "\tpop {r0-r3,FP,LR}\n" ); output( "\tbx IP\n"); + if (UsePIC) + output( "1:\t.long .L__wine_spec_delay_imports+%u-2b-%u\n", pos, thumb_mode ? 4 : 8 ); + else + output( "1:\t.long .L__wine_spec_delay_imports+%u\n", pos ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-80]!\n" ); @@ -1101,7 +1119,10 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tstp x2, x3, [sp,#32]\n" ); output( "\tstp x4, x5, [sp,#48]\n" ); output( "\tstp x6, x7, [sp,#64]\n" ); - output( "\tmov x0, x16\n" ); + output( "\tmov x1, x16\n" ); + output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_delay_imports") ); + output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_delay_imports") ); + if (pos) output( "\tadd x0, x0, #%u\n", pos ); output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp,#16]\n" ); @@ -1128,27 +1149,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) { case CPU_i386: case CPU_x86_64: - output( "\tmovl $%d,%%eax\n", (idx << 16) | j ); + output( "\tmovl $%d,%%eax\n", j ); output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: output( "\tmov ip, #%u\n", j ); - if (idx) output( "\tmovt ip, #%u\n", idx ); output( "\tb %s\n", asm_name(module_func) ); break; case CPU_ARM64: - if (idx) - { - output( "\tmov x16, #0x%x\n", idx << 16 ); - if (j) output( "\tmovk x16, #0x%x\n", j ); - } - else output( "\tmov x16, #0x%x\n", j ); + output( "\tmov x16, #0x%x\n", j ); output( "\tb %s\n", asm_name(module_func) ); break; } output_cfi( ".cfi_endproc" ); } - idx++; + pos += 8 * 4; /* IMAGE_DELAYLOAD_DESCRIPTOR is 8 DWORDs */ } output_function_size( delayed_import_loaders );

1 0

Alexandre Julliard : winebuild: Call __delayLoadHelper2 to resolve delay imports also on non-PE builds.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: de3c286adf70ffab9f02393536b5ea2bdfa05117 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3c286adf70ffab9f02393536b5ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:31:46 2022 +0100 winebuild: Call __delayLoadHelper2 to resolve delay imports also on non-PE builds. --- dlls/winecrt0/delay_load.c | 11 ----------- tools/winebuild/import.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 219c9e741b4..3044fa4431f 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -44,14 +44,3 @@ FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAG { return ResolveDelayLoadedAPI( image_base(), descr, NULL, DelayLoadFailureHook, addr, 0 ); } - -#ifndef __WINE_PE_BUILD - -FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, unsigned int id ) -{ - IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA *)((char *)image_base() + descr->ImportAddressTableRVA); - - return __delayLoadHelper2( descr, thunk + LOWORD(id) ); -} - -#endif /* __WINE_PE_BUILD */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8245819ebfd..515283fb50f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -511,7 +511,7 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) add_extra_ld_symbol( spec->init_func ); if (spec->type == SPEC_WIN16) add_extra_ld_symbol( "DllMain" ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); - if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); + if (delayed_imports.count) add_extra_ld_symbol( "__delayLoadHelper2" ); } /* check if a given imported dll is not needed, taking forwards into account */ @@ -1018,7 +1018,7 @@ static void output_delayed_imports( const DLLSPEC *spec ) /* output the delayed import thunks of a Win32 module */ static void output_delayed_import_thunks( const DLLSPEC *spec ) { - int j, pos; + int j, pos, iat_pos; struct import *import; static const char delayed_import_loaders[] = "__wine_spec_delayed_import_loaders"; static const char delayed_import_thunks[] = "__wine_spec_delayed_import_thunks"; @@ -1030,7 +1030,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(8) ); output( "%s:\n", asm_name(delayed_import_loaders)); - pos = 0; + pos = iat_pos = 0; LIST_FOR_EACH_ENTRY( import, &dll_delayed, struct import, entry ) { char *module_func = strmake( "__wine_delay_load_asm_%s", import->c_name ); @@ -1060,7 +1060,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tpushl $.L__wine_spec_delay_imports+%d\n", pos ); output_cfi( ".cfi_adjust_cfa_offset 4" ); } - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tcall %s\n", asm_name("__delayLoadHelper2") ); output_cfi( ".cfi_adjust_cfa_offset -8" ); output( "\tpopl %%edx\n" ); output_cfi( ".cfi_adjust_cfa_offset -4" ); @@ -1083,7 +1083,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); output( "\tleaq .L__wine_spec_delay_imports+%d(%%rip),%%rcx\n", pos ); output( "\tmovq %%rax,%%rdx\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tcall %s\n", asm_name("__delayLoadHelper2") ); output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); @@ -1103,7 +1103,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmov r1,IP\n" ); output( "\tldr r0, 1f\n"); if (UsePIC) output( "2:\tadd r0, pc\n" ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); output( "\tmov IP,r0\n"); output( "\tpop {r0-r3,FP,LR}\n" ); output( "\tbx IP\n"); @@ -1123,7 +1123,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_delay_imports") ); output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_delay_imports") ); if (pos) output( "\tadd x0, x0, #%u\n", pos ); - output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tbl %s\n", asm_name("__delayLoadHelper2") ); output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp,#16]\n" ); output( "\tldp x2, x3, [sp,#32]\n" ); @@ -1148,20 +1148,43 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) switch (target.cpu) { case CPU_i386: + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_delay_IAT+%d-1b(%%eax),%%eax\n", iat_pos ); + needs_get_pc_thunk = 1; + } + else output( "\tmovl $.L__wine_delay_IAT+%d,%%eax\n", iat_pos ); + output( "\tjmp %s\n", asm_name(module_func) ); + break; case CPU_x86_64: - output( "\tmovl $%d,%%eax\n", j ); + output( "\tleaq .L__wine_delay_IAT+%d(%%rip),%%rax\n", iat_pos ); output( "\tjmp %s\n", asm_name(module_func) ); break; case CPU_ARM: - output( "\tmov ip, #%u\n", j ); - output( "\tb %s\n", asm_name(module_func) ); + if (UsePIC) + { + output( "\tldr ip, 2f\n"); + output( "1:\tadd ip, pc\n" ); + output( "\tb %s\n", asm_name(module_func) ); + output( "2:\t.long .L__wine_delay_IAT+%u-1b-%u\n", iat_pos, thumb_mode ? 4 : 8 ); + } + else + { + output( "\tldr ip, 1f\n"); + output( "\tb %s\n", asm_name(module_func) ); + output( "1:\t.long .L__wine_delay_IAT+%u\n", iat_pos ); + } break; case CPU_ARM64: - output( "\tmov x16, #0x%x\n", j ); + output( "\tadrp x16, %s\n", arm64_page(".L__wine_delay_IAT") ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff(".L__wine_delay_IAT") ); + if (iat_pos) output( "\tadd x16, x16, #%u\n", iat_pos ); 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 */ }

1 0

Piotr Caban : gdi32: NULL terminate output string in CreateDCW.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: b6204639ba864231bd14164363613963a9696278 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6204639ba864231bd141643636139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 29 12:17:11 2022 +0100 gdi32: NULL terminate output string in CreateDCW. --- dlls/gdi32/dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 6ec11650d27..44dd9b9373d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -244,7 +244,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, { return 0; } - else if (output && !(port = HeapAlloc( GetProcessHeap(), 0, output_str.Length ))) + else if (output && !(port = HeapAlloc( GetProcessHeap(), 0, output_str.Length + sizeof(WCHAR) ))) { ClosePrinter( hspool ); return 0; @@ -271,7 +271,10 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (ret && hspool && (dc_attr = get_dc_attr( ret ))) { if (port) + { memcpy( port, output, output_str.Length ); + port[output_str.Length / sizeof(WCHAR)] = 0; + } dc_attr->hspool = HandleToULong( hspool ); dc_attr->output = (ULONG_PTR)port; }

1 0

Rémi Bernon : joy.cpl: Merge the dinput test and force feedback tabs.
by Alexandre Julliard 29 Nov '22

29 Nov '22

1 0

Alex Henrie : comctl32: Use standard C functions for memory allocation in edit.c.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 5fe082172d71abdca6f1bbad0be96478247db9dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5fe082172d71abdca6f1bbad0be964… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 27 17:10:16 2022 -0700 comctl32: Use standard C functions for memory allocation in edit.c. --- dlls/comctl32/edit.c | 78 +++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 96ed2b0ae1b..eb74af29aa5 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -44,7 +44,6 @@ #include "uxtheme.h" #include "vsstyle.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(edit); @@ -239,7 +238,7 @@ static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT memset(&psa,0,sizeof(SCRIPT_ANALYSIS)); psa.eScript = SCRIPT_UNDEFINED; - es->logAttr = heap_alloc(sizeof(SCRIPT_LOGATTR) * get_text_length(es)); + es->logAttr = malloc(sizeof(SCRIPT_LOGATTR) * get_text_length(es)); ScriptBreak(es->text, get_text_length(es), &psa, es->logAttr); } @@ -477,7 +476,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The buffer has been expanded, create a new line and insert it into the link list */ - LINEDEF *new_line = heap_alloc_zero(sizeof(*new_line)); + LINEDEF *new_line = calloc(1, sizeof(*new_line)); new_line->next = previous_line->next; previous_line->next = new_line; current_line = new_line; @@ -487,7 +486,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { /* The previous line merged with this line so we delete this extra entry */ previous_line->next = current_line->next; - heap_free(current_line); + free(current_line); current_line = previous_line->next; es->line_count--; continue; @@ -587,7 +586,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->ssa) { count = ScriptString_pcOutChars(current_line->ssa); - piDx = heap_alloc(sizeof(INT) * (*count)); + piDx = malloc(sizeof(INT) * (*count)); ScriptStringGetLogicalWidths(current_line->ssa,piDx); prev = current_line->net_length-1; @@ -597,7 +596,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta } while ( prev > 0 && current_line->width > fw); if (prev<=0) prev = 1; - heap_free(piDx); + free(piDx); } else prev = (fw / es->char_width); @@ -686,7 +685,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta { pnext = current_line->next; EDIT_InvalidateUniscribeData_linedef(current_line); - heap_free(current_line); + free(current_line); current_line = pnext; es->line_count--; } @@ -1174,7 +1173,7 @@ static inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; - heap_free( es->logAttr ); + free(es->logAttr); es->logAttr = NULL; EDIT_InvalidateUniscribeData(es); } @@ -1300,7 +1299,8 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size) TRACE("trying to ReAlloc to %d+1\n", size); alloc_size = ROUND_TO_GROW((size + 1) * sizeof(WCHAR)); - if ((new_undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) { + if ((new_undo_text = realloc(es->undo_text, alloc_size))) { + memset(new_undo_text + es->undo_buffer_size, 0, alloc_size - es->undo_buffer_size * sizeof(WCHAR)); es->undo_text = new_undo_text; es->undo_buffer_size = alloc_size/sizeof(WCHAR) - 1; return TRUE; @@ -2473,7 +2473,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r /* there is something to be deleted */ TRACE("deleting stuff.\n"); bufl = e - s; - buf = heap_alloc((bufl + 1) * sizeof(WCHAR)); + buf = malloc((bufl + 1) * sizeof(WCHAR)); if (!buf) return; memcpy(buf, es->text + s, bufl * sizeof(WCHAR)); buf[bufl] = 0; /* ensure 0 termination */ @@ -2586,7 +2586,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r EDIT_EM_EmptyUndoBuffer(es); } - heap_free(buf); + free(buf); s += strl; @@ -2831,12 +2831,12 @@ static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, const INT *tabs) { if (!(es->style & ES_MULTILINE)) return FALSE; - heap_free(es->tabs); + free(es->tabs); es->tabs_count = count; if (!count) es->tabs = NULL; else { - es->tabs = heap_alloc(count * sizeof(INT)); + es->tabs = malloc(count * sizeof(INT)); memcpy(es->tabs, tabs, count * sizeof(INT)); } EDIT_InvalidateUniscribeData(es); @@ -2880,7 +2880,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) ulength = lstrlenW(es->undo_text); - utext = heap_alloc((ulength + 1) * sizeof(WCHAR)); + utext = malloc((ulength + 1) * sizeof(WCHAR)); lstrcpyW(utext, es->undo_text); @@ -2894,7 +2894,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) /* send the notification after the selection start and end are set */ if (!notify_parent(es, EN_CHANGE)) return TRUE; EDIT_EM_ScrollCaret(es); - heap_free(utext); + free(utext); TRACE("after UNDO:insertion length = %d, deletion buffer = %s\n", es->undo_insert_count, debugstr_w(es->undo_text)); @@ -4203,14 +4203,6 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } -static inline WCHAR *heap_strdupW(const WCHAR *str) -{ - int len = lstrlenW(str) + 1; - WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); - lstrcpyW(ret, str); - return ret; -} - /********************************************************************* * * EM_SETCUEBANNER @@ -4221,8 +4213,8 @@ static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL draw_focused, const WCHAR * if (es->style & ES_MULTILINE || !cue_text) return FALSE; - heap_free(es->cue_banner_text); - es->cue_banner_text = heap_strdupW(cue_text); + free(es->cue_banner_text); + es->cue_banner_text = wcsdup(cue_text); es->cue_banner_draw_focused = draw_focused; return TRUE; @@ -4272,7 +4264,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) return; } - lpCompStr = heap_alloc(buflen); + lpCompStr = malloc(buflen); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -4292,11 +4284,11 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) if (dwBufLenAttr) { dwBufLenAttr ++; - lpCompStrAttr = heap_alloc(dwBufLenAttr + 1); + lpCompStrAttr = malloc(dwBufLenAttr + 1); if (!lpCompStrAttr) { ERR("Unable to allocate IME Attribute String\n"); - heap_free(lpCompStr); + free(lpCompStr); return; } ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, @@ -4323,8 +4315,8 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->selection_start + es->composition_len; - heap_free(lpCompStrAttr); - heap_free(lpCompStr); + free(lpCompStrAttr); + free(lpCompStr); } static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) @@ -4338,7 +4330,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) return; } - lpResultStr = heap_alloc(buflen); + lpResultStr = malloc(buflen); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -4357,7 +4349,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) es->composition_start = es->selection_end; es->composition_len = 0; - heap_free(lpResultStr); + free(lpResultStr); } static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) @@ -4404,7 +4396,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) TRACE("Creating edit control, style = %#lx\n", lpcs->style); - if (!(es = heap_alloc_zero(sizeof(*es)))) + if (!(es = calloc(1, sizeof(*es)))) return FALSE; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)es ); @@ -4466,12 +4458,12 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) goto cleanup; es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; - if (!(es->undo_text = heap_alloc_zero((es->buffer_size + 1) * sizeof(WCHAR)))) + if (!(es->undo_text = calloc(es->buffer_size + 1, sizeof(WCHAR)))) goto cleanup; es->undo_buffer_size = es->buffer_size; if (es->style & ES_MULTILINE) - if (!(es->first_line_def = heap_alloc_zero(sizeof(LINEDEF)))) + if (!(es->first_line_def = calloc(1, sizeof(LINEDEF)))) goto cleanup; es->line_count = 1; @@ -4496,11 +4488,11 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) cleanup: SetWindowLongPtrW(es->hwndSelf, 0, 0); EDIT_InvalidateUniscribeData(es); - heap_free(es->first_line_def); - heap_free(es->undo_text); + free(es->first_line_def); + free(es->undo_text); if (es->hloc32W) LocalFree(es->hloc32W); - heap_free(es->logAttr); - heap_free(es); + free(es->logAttr); + free(es); return FALSE; } @@ -4583,14 +4575,14 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) while (pc) { pp = pc->next; - heap_free(pc); + free(pc); pc = pp; } SetWindowLongPtrW( es->hwndSelf, 0, 0 ); - heap_free(es->undo_text); - heap_free(es->cue_banner_text); - heap_free(es); + free(es->undo_text); + free(es->cue_banner_text); + free(es); return 0; }

1 0

Huw Davies : ntdll: Fix -Wformat warnings on macOS.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 905821fc695803ac359c28b91a7436e6f2054c98 URL: https://gitlab.winehq.org/wine/wine/-/commit/905821fc695803ac359c28b91a7436… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 29 08:40:43 2022 +0000 ntdll: Fix -Wformat warnings on macOS. --- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/serial.c | 2 +- dlls/ntdll/unix/sync.c | 2 +- dlls/ntdll/unix/system.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 328040bbda6..6f1709f4713 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1563,7 +1563,7 @@ static WCHAR *build_command_line( WCHAR **wargv ) *p = 0; if (p - ret >= 32767) { - ERR( "command line too long (%zu)\n", p - ret ); + ERR( "command line too long (%u)\n", (int)(p - ret) ); NtTerminateProcess( GetCurrentProcess(), 1 ); } return ret; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 45fda0f33db..d8f492fcc64 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -555,7 +555,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) } break; #else /* Don't have linux/serial.h or lack TIOCSSERIAL */ - ERR("baudrate %d\n", sbr->BaudRate); + ERR("baudrate %d\n", (int)sbr->BaudRate); return STATUS_NOT_SUPPORTED; #endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index f80a2945cef..650e32a7d41 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2352,7 +2352,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return NULL; - if (InterlockedCompareExchange( (int *)&entry->sem, sem, 0 )) + if (InterlockedCompareExchange( (LONG *)&entry->sem, sem, 0 )) semaphore_destroy( mach_task_self(), sem ); } #else diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 603f778bd97..2dc99316f9c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1023,13 +1023,13 @@ static NTSTATUS create_logical_proc_info(void) /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(void) { - DWORD pkgs_no, cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; - DWORD cache_ctrs[10] = {0}; + unsigned int pkgs_no, cores_no, lcpu_no, lcpu_per_core, cores_per_package, assoc; + unsigned int cache_ctrs[10] = {0}; ULONG_PTR all_cpus_mask = 0; CACHE_DESCRIPTOR cache[10]; LONGLONG cache_size, cache_line_size, cache_sharing[10]; size_t size; - DWORD p,i,j,k; + unsigned int p, i, j, k; lcpu_no = peb->NumberOfProcessors; @@ -1806,7 +1806,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON return ret; } default: - FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", (unsigned int)sfti->ProviderSignature); return STATUS_NOT_IMPLEMENTED; } }

1 0

Rémi Bernon : joy.cpl: Move the device effect list to static global scope.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 2b706a00a3aecb1f26507d991d52cb4f41a00cbf URL: https://gitlab.winehq.org/wine/wine/-/commit/2b706a00a3aecb1f26507d991d52cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 00:07:17 2022 +0100 joy.cpl: Move the device effect list to static global scope. --- dlls/joy.cpl/main.c | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index ec8299753f1..33af6202445 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -78,9 +78,6 @@ struct effect struct Joystick { IDirectInputDevice8W *device; - - struct list effects; - IDirectInputEffect *effect_selected; }; struct Graphics @@ -114,6 +111,9 @@ static CRITICAL_SECTION_DEBUG joy_cs_debug = }; static CRITICAL_SECTION joy_cs = { &joy_cs_debug, -1, 0, 0, 0, 0 }; +static struct list effects = LIST_INIT( effects ); +static IDirectInputEffect *effect_selected; + /********************************************************************* * DllMain */ @@ -217,32 +217,46 @@ static BOOL CALLBACK enum_effects( const DIEFFECTINFOW *info, void *context ) } entry->effect = effect; - list_add_tail( &joystick->effects, &entry->entry ); + list_add_tail( &effects, &entry->entry ); return DIENUM_CONTINUE; } -static void set_selected_effect( struct Joystick *joystick, IDirectInputEffect *effect ) +static void set_selected_effect( IDirectInputEffect *effect ) { IDirectInputEffect *previous; EnterCriticalSection( &joy_cs ); - if ((previous = joystick->effect_selected)) IDirectInputEffect_Release( previous ); - if ((joystick->effect_selected = effect)) IDirectInput_AddRef( effect ); + if ((previous = effect_selected)) IDirectInputEffect_Release( previous ); + if ((effect_selected = effect)) IDirectInput_AddRef( effect ); LeaveCriticalSection( &joy_cs ); } -static IDirectInputEffect *get_selected_effect( struct Joystick *joystick ) +static IDirectInputEffect *get_selected_effect(void) { IDirectInputEffect *effect; EnterCriticalSection( &joy_cs ); - if ((effect = joystick->effect_selected)) IDirectInputEffect_AddRef( effect ); + if ((effect = effect_selected)) IDirectInputEffect_AddRef( effect ); LeaveCriticalSection( &joy_cs ); return effect; } +static void clear_effects(void) +{ + struct effect *effect, *next; + + set_selected_effect( NULL ); + + LIST_FOR_EACH_ENTRY_SAFE( effect, next, &effects, struct effect, entry ) + { + list_remove( &effect->entry ); + IDirectInputEffect_Release( effect->effect ); + free( effect ); + } +} + static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context) { DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; @@ -262,9 +276,6 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont IDirectInput8_CreateDevice(data->di, &instance->guidInstance, &joystick->device, NULL); IDirectInputDevice8_SetDataFormat(joystick->device, &c_dfDIJoystick); - list_init( &joystick->effects ); - joystick->effect_selected = NULL; - IDirectInputDevice8_GetCapabilities(joystick->device, &caps); if (caps.dwFlags & DIDC_FORCEFEEDBACK) data->num_ff++; @@ -277,7 +288,6 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont proprange.lMax = TEST_AXIS_MAX; IDirectInputDevice_SetProperty(joystick->device, DIPROP_RANGE, &proprange.diph); - IDirectInputDevice8_EnumEffects( joystick->device, enum_effects, (void *)joystick, 0 ); return DIENUM_CONTINUE; } @@ -305,17 +315,6 @@ static void destroy_joysticks(struct JoystickData *data) for (i = 0; i < data->num_joysticks; i++) { - struct effect *effect, *next_effect; - - set_selected_effect( &data->joysticks[i], NULL ); - - LIST_FOR_EACH_ENTRY_SAFE( effect, next_effect, &data->joysticks[i].effects, struct effect, entry ) - { - list_remove( &effect->entry ); - IDirectInputEffect_Release( effect->effect ); - free( effect ); - } - IDirectInputDevice8_Unacquire(data->joysticks[i].device); IDirectInputDevice8_Release(data->joysticks[i].device); } @@ -394,6 +393,7 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) LSTATUS status; DWORD i; + clear_effects(); destroy_joysticks(data); initialize_joysticks(data); @@ -873,9 +873,13 @@ static void initialize_effects_list(HWND hwnd, struct Joystick* joy) { struct effect *effect; + clear_effects(); + + IDirectInputDevice8_EnumEffects( joy->device, enum_effects, (void *)joy, 0 ); + SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_RESETCONTENT, 0, 0); - LIST_FOR_EACH_ENTRY( effect, &joy->effects, struct effect, entry ) + LIST_FOR_EACH_ENTRY( effect, &effects, struct effect, entry ) { DIEFFECTINFOW info = {.dwSize = sizeof(DIEFFECTINFOW)}; GUID guid; @@ -899,16 +903,16 @@ static void ff_handle_effectchange(HWND hwnd, struct Joystick *joy) struct list *entry; int sel; - set_selected_effect( joy, NULL ); + set_selected_effect( NULL ); sel = SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_GETCURSEL, 0, 0); if (sel < 0) return; - entry = list_head( &joy->effects ); - while (sel-- && entry) entry = list_next( &joy->effects, entry ); + entry = list_head( &effects ); + while (sel-- && entry) entry = list_next( &effects, entry ); if (!entry) return; - set_selected_effect( joy, LIST_ENTRY( entry, struct effect, entry )->effect ); + set_selected_effect( LIST_ENTRY( entry, struct effect, entry )->effect ); IDirectInputDevice8_Unacquire(joy->device); IDirectInputDevice8_SetCooperativeLevel(joy->device, GetAncestor(hwnd, GA_ROOT), DISCL_BACKGROUND|DISCL_EXCLUSIVE); @@ -942,7 +946,7 @@ static DWORD WINAPI ff_input_thread(void *param) Sleep(TEST_POLL_TIME); - if (!(effect = get_selected_effect( joy ))) continue; + if (!(effect = get_selected_effect())) continue; poll_input(joy, &state); @@ -1207,6 +1211,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) break; case CPL_STOP: + clear_effects(); destroy_joysticks(&data); /* And destroy dinput too */

1 0

Rémi Bernon : joy.cpl: Use a struct list to keep created dinput devices.
by Alexandre Julliard 29 Nov '22

29 Nov '22

Module: wine Branch: master Commit: 8c6e2a2d799c493f97b33e5e3b3ede28cd1a8ce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c6e2a2d799c493f97b33e5e3b3ede… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 00:09:01 2022 +0100 joy.cpl: Use a struct list to keep created dinput devices. --- dlls/joy.cpl/main.c | 228 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 137 insertions(+), 91 deletions(-)

1 0