April 2020 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object().
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 85f9f51df88661a513eaa474cd4941a62ef991db URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f9f51df88661a513eaa474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:11 2020 +0430 wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object(). We may get coherent memory anyway, but we don't require it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 47aca9218d..2e2ae23921 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1589,9 +1589,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT - | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT + | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n");

1 0

Jacek Caban : server: Allow passing suspend context in select request.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: e70b684dedaa1a7c9b5fc884f7083cbf7228600f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70b684dedaa1a7c9b5fc884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:03 2020 +0200 server: Allow passing suspend context in select request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 1 + include/wine/server_protocol.h | 8 +++++--- server/protocol.def | 5 ++++- server/request.h | 3 ++- server/thread.c | 22 ++++++++++++++++++++-- server/trace.c | 5 ++++- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9053ad2042..7e178aa745 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -624,6 +624,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT req->cookie = wine_server_client_ptr( &cookie ); req->prev_apc = apc_handle; req->timeout = abs_timeout; + req->size = size; wine_server_add_data( req, &result, sizeof(result) ); wine_server_add_data( req, select_op, size ); ret = server_call_unlocked( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 298e2dbfa4..77f62afb72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1257,16 +1257,18 @@ struct select_request int flags; client_ptr_t cookie; abstime_t timeout; + data_size_t size; obj_handle_t prev_apc; /* VARARG(result,apc_result); */ - /* VARARG(data,select_op); */ - char __pad_36[4]; + /* VARARG(data,select_op,size); */ + /* VARARG(context,context); */ }; struct select_reply { struct reply_header __header; apc_call_t call; obj_handle_t apc_handle; + /* VARARG(context,context); */ char __pad_52[4]; }; #define SELECT_ALERTABLE 1 @@ -6716,7 +6718,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 598 +#define SERVER_PROTOCOL_VERSION 599 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index bfe817b654..318c3b0b83 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1106,12 +1106,15 @@ struct rawinput_device int flags; /* wait flags (see below) */ client_ptr_t cookie; /* magic cookie to return to client */ abstime_t timeout; /* timeout */ + data_size_t size; /* size of select_op */ obj_handle_t prev_apc; /* handle to previous APC */ VARARG(result,apc_result); /* result of previous APC */ - VARARG(data,select_op); /* operation-specific data */ + VARARG(data,select_op,size); /* operation-specific data */ + VARARG(context,context); /* suspend context */ @REPLY apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ + VARARG(context,context); /* suspend context */ @END #define SELECT_ALERTABLE 1 #define SELECT_INTERRUPTIBLE 2 diff --git a/server/request.h b/server/request.h index d8967211e7..c1f4fc6b39 100644 --- a/server/request.h +++ b/server/request.h @@ -938,7 +938,8 @@ C_ASSERT( sizeof(struct open_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct select_request, flags) == 12 ); C_ASSERT( FIELD_OFFSET(struct select_request, cookie) == 16 ); C_ASSERT( FIELD_OFFSET(struct select_request, timeout) == 24 ); -C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 32 ); +C_ASSERT( FIELD_OFFSET(struct select_request, size) == 32 ); +C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 36 ); C_ASSERT( sizeof(struct select_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct select_reply, call) == 8 ); C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 48 ); diff --git a/server/thread.c b/server/thread.c index ba481223b7..d75dc238d5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1536,18 +1536,36 @@ DECL_HANDLER(select) struct thread_apc *apc; const apc_result_t *result = get_req_data(); - if (get_req_data_size() < sizeof(*result)) + if (get_req_data_size() < sizeof(*result) || + get_req_data_size() - sizeof(*result) < req->size || + req->size & 3) { set_error( STATUS_INVALID_PARAMETER ); return; } + + if (get_req_data_size() - sizeof(*result) - req->size == sizeof(context_t)) + { + const context_t *context = (const context_t *)((const char *)(result + 1) + req->size); + if (current->context || context->cpu != current->process->cpu) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!(current->suspend_context = mem_alloc( sizeof(*context) ))) return; + memcpy( current->suspend_context, context, sizeof(*context) ); + current->suspend_context->flags = 0; /* to keep track of what is modified */ + current->context = current->suspend_context; + } + if (!req->cookie) { set_error( STATUS_INVALID_PARAMETER ); return; } - op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); + op_size = min( req->size, sizeof(select_op) ); memset( &select_op, 0, sizeof(select_op) ); memcpy( &select_op, result + 1, op_size ); diff --git a/server/trace.c b/server/trace.c index 095a45f0dd..9dd7ab73a1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1588,15 +1588,18 @@ static void dump_select_request( const struct select_request *req ) fprintf( stderr, " flags=%d", req->flags ); dump_uint64( ", cookie=", &req->cookie ); dump_abstime( ", timeout=", &req->timeout ); + fprintf( stderr, ", size=%u", req->size ); fprintf( stderr, ", prev_apc=%04x", req->prev_apc ); dump_varargs_apc_result( ", result=", cur_size ); - dump_varargs_select_op( ", data=", cur_size ); + dump_varargs_select_op( ", data=", min(cur_size,req->size) ); + dump_varargs_context( ", context=", cur_size ); } static void dump_select_reply( const struct select_reply *req ) { dump_apc_call( " call=", &req->call ); fprintf( stderr, ", apc_handle=%04x", req->apc_handle ); + dump_varargs_context( ", context=", cur_size ); } static void dump_create_event_request( const struct create_event_request *req )

1 0

Michael Stefaniuc : oledb32: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: c0041d70c46be6f7a69a61c0143c9c603cd6760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0041d70c46be6f7a69a61c0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 16 00:08:28 2020 +0200 oledb32: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 8a7f2d134c..86a334bea0 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -72,8 +72,7 @@ static void destroy_datasource(struct datasource *data) CoTaskMemFree(data->propinfoset->rgPropertyInfos); CoTaskMemFree(data->propinfoset); } - if (data->description) - CoTaskMemFree(data->description); + CoTaskMemFree(data->description); if (data->provider) IDBProperties_Release(data->provider);

1 0

Zebediah Figura : winegstreamer: Remove some unused imports.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: ecac569df231d7a0f8b11ca7cf8803642986fefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecac569df231d7a0f8b11ca7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:58 2020 -0500 winegstreamer: Remove some unused imports. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 2364ac84dc..097edf273f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Zebediah Figura : winegstreamer: Delay-load mfplat.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 5d0e10b77c0ef262b059318f149841b6c999703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0e10b77c0ef262b059318f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:59 2020 -0500 winegstreamer: Delay-load mfplat. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 097edf273f..337c1086e6 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,6 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid ole32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfuuid +DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Alexandre Julliard : winebuild: Set page size to 4096 also on ARM64.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 593c38cb95fc18383664dc63cf397be5a7175be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593c38cb95fc18383664dc63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:40:56 2020 +0200 winebuild: Set page size to 4096 also on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index be87708048..669520711c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1015,19 +1015,7 @@ unsigned int get_alignment(unsigned int align) /* return the page size for the target CPU */ unsigned int get_page_size(void) { - switch(target_cpu) - { - case CPU_x86: - case CPU_x86_64: - case CPU_POWERPC: - case CPU_ARM: - return 0x1000; - case CPU_ARM64: - return 0x10000; - } - /* unreached */ - assert(0); - return 0; + return 0x1000; /* same on all platforms */ } /* return the size of a pointer on the target CPU */

1 0

Alexandre Julliard : ntdll: Load .so builtin modules without using libwine.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 0a3e42e2719e8306b67f14b5a4b3a868f336bb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a3e42e2719e8306b67f14b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 10:26:13 2020 +0200 ntdll: Load .so builtin modules without using libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 273 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 229 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3e42e2719e8306b67f…

1 0

Alexandre Julliard : ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 3935acd4dafce40a08417cf1edceb7607592eb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3935acd4dafce40a08417cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:00:43 2020 +0200 ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c67e1a3d2b..c32292d453 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -121,6 +121,7 @@ typedef struct _wine_modref LDR_MODULE ldr; dev_t dev; ino_t ino; + void *so_handle; int alloc_deps; int nDeps; struct _wine_modref **deps; @@ -585,7 +586,7 @@ static WINE_MODREF *find_so_module( void *handle ) LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); WINE_MODREF *wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); - if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle) return wm; + if (wm->so_handle == handle) return wm; } return NULL; } @@ -2806,7 +2807,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } } else if (!info.wm) @@ -2829,7 +2830,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } *pwm = info.wm; @@ -3760,7 +3761,7 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle ); + if (wm->so_handle) dlclose( wm->so_handle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Alexandre Julliard : winebuild: Add --fixup-ctors option to allow intercepting constructors in .so files.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 6c4046fef1fb4a78cfb649de34af7770ffe05024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c4046fef1fb4a78cfb649de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:21:23 2020 +0200 winebuild: Add --fixup-ctors option to allow intercepting constructors in .so files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 13 +++- tools/winebuild/spec32.c | 159 +++++++++++++++++++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 14 +++- 4 files changed, 182 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 65493ec37f..b30785b74a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -321,6 +321,7 @@ extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); extern void output_asm_relays16(void); extern void make_builtin_files( char *argv[] ); +extern void fixup_constructors( char *argv[] ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index db8587c3bd..d973a4e973 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -115,6 +115,7 @@ enum exec_mode_values MODE_IMPLIB, MODE_STATICLIB, MODE_BUILTIN, + MODE_FIXUP_CTORS, MODE_RESOURCES }; @@ -301,8 +302,9 @@ static const char usage_str[] = " --exe Build an executable from object files\n" " --implib Build an import library\n" " --staticlib Build a static library\n" -" --builtin Mark a library as a Wine builtin\n" " --resources Build a .o or .res file for the resource files\n\n" +" --builtin Mark a library as a Wine builtin\n" +" --fixup-ctors Fixup the constructors data after the module has been built\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -316,6 +318,7 @@ enum long_options_values LONG_OPT_CCCMD, LONG_OPT_EXTERNAL_SYMS, LONG_OPT_FAKE_MODULE, + LONG_OPT_FIXUP_CTORS, LONG_OPT_LARGE_ADDRESS_AWARE, LONG_OPT_LDCMD, LONG_OPT_NMCMD, @@ -341,6 +344,7 @@ static const struct option long_options[] = { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "fake-module", 0, 0, LONG_OPT_FAKE_MODULE }, + { "fixup-ctors", 0, 0, LONG_OPT_FIXUP_CTORS }, { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, @@ -511,6 +515,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_BUILTIN: set_exec_mode( MODE_BUILTIN ); break; + case LONG_OPT_FIXUP_CTORS: + set_exec_mode( MODE_FIXUP_CTORS ); + break; case LONG_OPT_ASCMD: as_command = strarray_fromstring( optarg, " " ); break; @@ -701,6 +708,10 @@ int main(int argc, char **argv) if (!argv[0]) fatal_error( "missing file argument for --builtin option\n" ); make_builtin_files( argv ); break; + case MODE_FIXUP_CTORS: + if (!argv[0]) fatal_error( "missing file argument for --fixup-ctors option\n" ); + fixup_constructors( argv ); + break; case MODE_RESOURCES: load_resources( argv, spec ); output_res_o_file( spec ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 631a467a5e..6e6f502e99 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1095,3 +1095,162 @@ void make_builtin_files( char *argv[] ) close( fd ); } } + +static void fixup_elf32( const char *name, int fd, void *header, size_t header_size ) +{ + struct + { + unsigned char e_ident[16]; + unsigned short e_type; + unsigned short e_machine; + unsigned int e_version; + unsigned int e_entry; + unsigned int e_phoff; + unsigned int e_shoff; + unsigned int e_flags; + unsigned short e_ehsize; + unsigned short e_phentsize; + unsigned short e_phnum; + unsigned short e_shentsize; + unsigned short e_shnum; + unsigned short e_shstrndx; + } *elf = header; + struct + { + unsigned int p_type; + unsigned int p_offset; + unsigned int p_vaddr; + unsigned int p_paddr; + unsigned int p_filesz; + unsigned int p_memsz; + unsigned int p_flags; + unsigned int p_align; + } *phdr; + struct + { + unsigned int d_tag; + unsigned int d_val; + } *dyn; + + unsigned int i, size; + + if (header_size < sizeof(*elf)) return; + if (elf->e_ident[6] != 1 /* EV_CURRENT */) return; + + size = elf->e_phnum * elf->e_phentsize; + phdr = xmalloc( size ); + lseek( fd, elf->e_phoff, SEEK_SET ); + if (read( fd, phdr, size ) != size) return; + + for (i = 0; i < elf->e_phnum; i++) + { + if (phdr->p_type == 2 /* PT_DYNAMIC */ ) break; + phdr = (void *)((char *)phdr + elf->e_phentsize); + } + if (i == elf->e_phnum) return; + + dyn = xmalloc( phdr->p_filesz ); + lseek( fd, phdr->p_offset, SEEK_SET ); + if (read( fd, dyn, phdr->p_filesz ) != phdr->p_filesz) return; + for (i = 0; i < phdr->p_filesz / sizeof(*dyn) && dyn[i].d_tag; i++) + { + switch (dyn[i].d_tag) + { + case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + } + } + lseek( fd, phdr->p_offset, SEEK_SET ); + write( fd, dyn, phdr->p_filesz ); +} + +static void fixup_elf64( const char *name, int fd, void *header, size_t header_size ) +{ + struct + { + unsigned char e_ident[16]; + unsigned short e_type; + unsigned short e_machine; + unsigned int e_version; + unsigned __int64 e_entry; + unsigned __int64 e_phoff; + unsigned __int64 e_shoff; + unsigned int e_flags; + unsigned short e_ehsize; + unsigned short e_phentsize; + unsigned short e_phnum; + unsigned short e_shentsize; + unsigned short e_shnum; + unsigned short e_shstrndx; + } *elf = header; + struct + { + unsigned int p_type; + unsigned int p_flags; + unsigned __int64 p_offset; + unsigned __int64 p_vaddr; + unsigned __int64 p_paddr; + unsigned __int64 p_filesz; + unsigned __int64 p_memsz; + unsigned __int64 p_align; + } *phdr; + struct + { + unsigned __int64 d_tag; + unsigned __int64 d_val; + } *dyn; + + unsigned int i, size; + + if (header_size < sizeof(*elf)) return; + if (elf->e_ident[6] != 1 /* EV_CURRENT */) return; + + size = elf->e_phnum * elf->e_phentsize; + phdr = xmalloc( size ); + lseek( fd, elf->e_phoff, SEEK_SET ); + if (read( fd, phdr, size ) != size) return; + + for (i = 0; i < elf->e_phnum; i++) + { + if (phdr->p_type == 2 /* PT_DYNAMIC */ ) break; + phdr = (void *)((char *)phdr + elf->e_phentsize); + } + if (i == elf->e_phnum) return; + + dyn = xmalloc( phdr->p_filesz ); + lseek( fd, phdr->p_offset, SEEK_SET ); + if (read( fd, dyn, phdr->p_filesz ) != phdr->p_filesz) return; + for (i = 0; i < phdr->p_filesz / sizeof(*dyn) && dyn[i].d_tag; i++) + { + switch (dyn[i].d_tag) + { + case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + } + } + lseek( fd, phdr->p_offset, SEEK_SET ); + write( fd, dyn, phdr->p_filesz ); +} + +/******************************************************************* + * fixup_constructors + */ +void fixup_constructors( char *argv[] ) +{ + int i, fd, size; + unsigned int header[64]; + + for (i = 0; argv[i]; i++) + { + if ((fd = open( argv[i], O_RDWR | O_BINARY )) == -1) fatal_perror( "Cannot open %s", argv[i] ); + size = read( fd, &header, sizeof(header) ); + if (size > 5) + { + if (!memcmp( header, "\177ELF\001", 5 )) fixup_elf32( argv[i], fd, header, size ); + else if (!memcmp( header, "\177ELF\002", 5 )) fixup_elf64( argv[i], fd, header, size ); + } + close( fd ); + } +} diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 29a17484ad..9c91c1a504 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -54,16 +54,22 @@ in .delay.a, a delayed import library is built. .BI \--staticlib Build a .a static library from object files. .TP -.BI \--builtin -Mark a PE module as a Wine builtin module, by adding the "Wine builtin -DLL" signature string after the DOS header. -.TP .B \--resources Generate a .o file containing all the input resources. This is useful when building with a PE compiler, since the PE binutils cannot handle multiple resource files as input. For a standard Unix build, the resource files are automatically included when building the spec file, so there's no need for an intermediate .o file. +.TP +.BI \--builtin +Mark a PE module as a Wine builtin module, by adding the "Wine builtin +DLL" signature string after the DOS header. +.TP +.BI \--fixup-ctors +Fixup constructors after a module has been built. This should be done +on the final .so module if its code contains constructors, to ensure +that Wine has a chance to initialize the module before the +constructors are executed. .SH OPTIONS .TP .BI \--as-cmd= as-command

1 0

Alexandre Julliard : winegcc: Fixup constructors after building a module.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: c30d30d328408a9031477e084377f8d7eef11e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c30d30d328408a9031477e08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:21:48 2020 +0200 winegcc: Fixup constructors after building a module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b2a4f9189e..0682e9aa9a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -936,6 +936,16 @@ static strarray *get_winebuild_args(struct options *opts) return spec_args; } +static void fixup_constructors( struct options *opts, const char *file ) +{ + strarray *args = get_winebuild_args( opts ); + + strarray_add( args, "--fixup-ctors" ); + strarray_add( args, file ); + spawn( opts->prefix, args, 0 ); + strarray_free( args ); +} + static void make_wine_builtin( struct options *opts, const char *file ) { strarray *args = get_winebuild_args( opts ); @@ -1354,8 +1364,6 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); - if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); - /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1371,6 +1379,9 @@ static void build(struct options* opts) } } + if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); + if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); + /* create the loader script */ if (generate_app_loader) create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name));

1 0