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

Alexandre Julliard : winegcc: Use the CRT startup code also for non-PE builds.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 3622b9ab153ce792aa3add8d3aa71b487edfda9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3622b9ab153ce792aa3add8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 16:06:22 2020 +0200 winegcc: Use the CRT startup code also for non-PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d663103186..7d55e19866 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1187,19 +1187,16 @@ static void build(struct options* opts) /* set default entry point, if needed */ if (!opts->entry_point) { - if (is_pe) + if (opts->subsystem && !strcmp( opts->subsystem, "native" )) + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_DriverEntry(a)8" : "DriverEntry"; + else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) { - if (opts->subsystem && !strcmp( opts->subsystem, "native" )) - entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; - else if(opts->use_msvcrt && !opts->shared && !opts->win16_app) - { - if (opts->unicode_app) - entry_point = opts->target_cpu == CPU_x86 ? "_wmainCRTStartup" : "wmainCRTStartup"; - else - entry_point = opts->target_cpu == CPU_x86 ? "_mainCRTStartup" : "mainCRTStartup"; - } + if (opts->unicode_app) + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_wmainCRTStartup" : "wmainCRTStartup"; + else + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_mainCRTStartup" : "mainCRTStartup"; } - else if (!opts->shared && opts->unicode_app) + else if (!is_pe && !opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point;

1 0

Jacek Caban : include: Fix DECLSPEC_NORETURN usage.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 944ef25f1f1047fc617e19aa6847c5867702a927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944ef25f1f1047fc617e19aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 18:27:22 2020 +0200 include: Fix DECLSPEC_NORETURN usage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/eh.h | 4 ++-- include/msvcrt/process.h | 10 +++++----- include/msvcrt/stdlib.h | 8 ++++---- include/wine/exception.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index 9f070e3953..4e23a9e5e5 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -40,8 +40,8 @@ terminate_function __cdecl set_terminate(terminate_function func); unexpected_function __cdecl set_unexpected(unexpected_function func); _se_translator_function __cdecl set_se_translator(_se_translator_function func); -void __cdecl terminate(void) DECLSPEC_NORETURN; -void __cdecl unexpected(void) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl terminate(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl unexpected(void); #include <poppack.h> diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 80be0e5bf6..2307b7990d 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -31,8 +31,8 @@ typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*); uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*); intptr_t __cdecl _cwait(int*,intptr_t,int); -void __cdecl _endthread(void) DECLSPEC_NORETURN; -void __cdecl _endthreadex(unsigned int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthread(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl _endthreadex(unsigned int); intptr_t WINAPIV _execl(const char*,const char*,...); intptr_t WINAPIV _execle(const char*,const char*,...); intptr_t WINAPIV _execlp(const char*,const char*,...); @@ -53,9 +53,9 @@ intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* cons void __cdecl _c_exit(void); void __cdecl _cexit(void); -void __cdecl _exit(int) DECLSPEC_NORETURN; -void __cdecl abort(void) DECLSPEC_NORETURN; -void __cdecl exit(int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); +_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); _ACRTIMP DECLSPEC_NORETURN void __cdecl quick_exit(int); int __cdecl system(const char*); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 2ce4789350..ef60428a6a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -182,9 +182,9 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); -void __cdecl _Exit(int) DECLSPEC_NORETURN; -void __cdecl _exit(int) DECLSPEC_NORETURN; -void __cdecl abort(void) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl _Exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl _exit(int); +_ACRTIMP DECLSPEC_NORETURN void __cdecl abort(void); int __cdecl abs(int); int __cdecl atexit(void (__cdecl *)(void)); double __cdecl atof(const char*); @@ -198,7 +198,7 @@ div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif lldiv_t __cdecl lldiv(__int64,__int64); -void __cdecl exit(int) DECLSPEC_NORETURN; +_ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*); __msvcrt_long __cdecl labs(__msvcrt_long); diff --git a/include/wine/exception.h b/include/wine/exception.h index 90ce30d6a2..4bf4c7e6d9 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -105,9 +105,9 @@ typedef struct { int reg; } __wine_jmp_buf; extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTION_REGISTRATION_RECORD *frame ) DECLSPEC_HIDDEN; -extern void __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; -extern void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; +extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) DECLSPEC_HIDDEN; extern DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context,

1 0

Ziqing Hui : windowscodecs: Implement stub for DdsDecoder.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 9e81463de9af736ed53efb4abb57c75e60caaed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e81463de9af736ed53efb4a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 15 18:42:07 2020 +0800 windowscodecs: Implement stub for DdsDecoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 227 ++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 23 +++ dlls/windowscodecs/tests/ddsformat.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 7 files changed, 262 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e81463de9af736ed53e…

1 0

Alexandre Julliard : ntdll: Support loading builtin modules that don't use a constructor.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 6ac357667ee3f4739fff45d03f88e1bc19bd079a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac357667ee3f4739fff45d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 19:37:44 2020 +0200 ntdll: Support loading builtin modules that don't use a constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9329dd2a9b..1e50e2b663 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1780,6 +1780,7 @@ static void load_builtin_callback( void *module, const char *filename ) if (!module) { ERR("could not map image for %s\n", debugstr_us(builtin_load_info->filename) ); + builtin_load_info->status = STATUS_NO_MEMORY; return; } if (!(nt = RtlImageNtHeader( module ))) @@ -2555,6 +2556,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, static const WCHAR soW[] = {'.','s','o',0}; DWORD len; void *handle; + const IMAGE_NT_HEADERS *nt; struct builtin_load_info info, *prev_info; ANSI_STRING unix_name; UNICODE_STRING win_name = *nt_name; @@ -2581,7 +2583,6 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, prev_info = builtin_load_info; builtin_load_info = &info; handle = dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW ); - builtin_load_info = prev_info; RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); if (!handle) @@ -2589,15 +2590,39 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (so_name) { ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); - return STATUS_PROCEDURE_NOT_FOUND; + info.status = STATUS_PROCEDURE_NOT_FOUND; + } + else + { + WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); + info.status = STATUS_INVALID_IMAGE_FORMAT; } - WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); - return STATUS_INVALID_IMAGE_FORMAT; } if (info.status != STATUS_SUCCESS) goto failed; - if (!info.wm) + if (!info.wm && (nt = dlsym( handle, "__wine_spec_nt_header" ))) + { + HMODULE module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); + if ((info.wm = get_modref( module ))) /* already loaded */ + { + TRACE( "Found %s at %p for builtin %s\n", + debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, + debugstr_us(nt_name) ); + if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; + dlclose( handle ); + } + else + { + __wine_dll_register( nt, NULL ); + if (!info.wm) goto failed; + 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; + } + } + else if (!info.wm) { /* The constructor wasn't called, this means the .so is already * loaded under a different name. Try to find the wm for it. */ @@ -2620,11 +2645,13 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, info.wm->ldr.SectionHandle = handle; } + builtin_load_info = prev_info; *pwm = info.wm; return STATUS_SUCCESS; failed: - dlclose( handle ); + builtin_load_info = prev_info; + if (handle) dlclose( handle ); return info.status; }

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DDS format.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 66a82d2595e5c8cc4f9bb5fe542baa750da04a32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a82d2595e5c8cc4f9bb5fe… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 15 18:41:43 2020 +0800 windowscodecs/tests: Add tests for DDS format. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/ddsformat.c | 121 +++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 3f9c9184e6..1450f056e9 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ bitmap.c \ bmpformat.c \ converter.c \ + ddsformat.c \ gifformat.c \ icoformat.c \ info.c \ diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c new file mode 100644 index 0000000000..97fb9f7c11 --- /dev/null +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -0,0 +1,121 @@ +/* + * Copyright 2020 Ziqing Hui + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "wincodec.h" +#include "wine/test.h" + +/* 4x4 DDS image */ +static BYTE test_dds_image[] = { + 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x44, 0x58, 0x54, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xF5, 0xA7, 0x08, 0x69, 0x74, 0xC0, 0xBF, 0xD7 +}; + +static IWICImagingFactory *factory = NULL; + +static IWICStream *create_stream(const void *image_data, UINT image_size) +{ + HRESULT hr; + IWICStream *stream = NULL; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + ok(SUCCEEDED(hr), "CreateStream failed, hr=%x\n", hr); + if (FAILED(hr)) goto fail; + + hr = IWICStream_InitializeFromMemory(stream, (BYTE *)image_data, image_size); + ok(SUCCEEDED(hr), "InitializeFromMemory failed, hr=%x\n", hr); + if (FAILED(hr)) goto fail; + + return stream; + +fail: + if (stream) IWICStream_Release(stream); + return NULL; +} + +static IWICBitmapDecoder *create_decoder(IWICStream *stream) +{ + HRESULT hr; + IWICBitmapDecoder *decoder = NULL; + GUID guidresult; + + hr = CoCreateInstance(&CLSID_WICDdsDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void **)&decoder); + if (FAILED(hr)) { + win_skip("Dds decoder is not supported\n"); + return NULL; + } + + memset(&guidresult, 0, sizeof(guidresult)); + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), "Unexpected container format\n"); + + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Decoder Initialize failed, hr=%x\n", hr); + if (hr != S_OK) { + IWICBitmapDecoder_Release(decoder); + return NULL; + } + + return decoder; +} + +static void test_dds_decoder(void) +{ + IWICStream *stream = NULL; + IWICBitmapDecoder *decoder = NULL; + + stream = create_stream(test_dds_image, sizeof(test_dds_image)); + if (!stream) goto end; + + todo_wine decoder = create_decoder(stream); + if (!decoder) goto end; + +end: + if (decoder) IWICBitmapDecoder_Release(decoder); + if (stream) IWICStream_Release(stream); +} + +START_TEST(ddsformat) +{ + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) goto end; + + test_dds_decoder(); + +end: + if(factory) IWICImagingFactory_Release(factory); + CoUninitialize(); +}

1 0

Alexandre Julliard : winepath: Avoid CR characters in output.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 4c391c1454ea5fcac0ac5d793651f3c20383ef6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c391c1454ea5fcac0ac5d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 22:04:38 2020 +0200 winepath: Avoid CR characters in output. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48937 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/winepath.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 81944829dd..17cfdc1d2e 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -24,6 +24,8 @@ #include <windows.h> #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <io.h> #include "wine/debug.h" @@ -140,6 +142,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int i; int separator; + setmode( fileno(stdout), O_BINARY ); /* avoid crlf */ + outputformats = parse_options(argv); if (outputformats & PRINT0)

1 0

Alexandre Julliard : winecrt0: Remove constructor support for exe and native modules.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: 2ba1b7fd3b3db0c76f9d97e5142caf3fc947d72c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba1b7fd3b3db0c76f9d97e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 20:03:13 2020 +0200 winecrt0: Remove constructor support for exe and native modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 - dlls/winecrt0/drv_entry.c | 41 ----------------------------------------- dlls/winecrt0/exe_entry.c | 8 +------- dlls/winecrt0/exe_wentry.c | 8 +------- 4 files changed, 2 insertions(+), 56 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 675002e938..909959dcb6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -6,7 +6,6 @@ C_SRCS = \ delay_load.c \ dll_entry.c \ dll_main.c \ - drv_entry.c \ exception.c \ exe16_entry.c \ exe_entry.c \ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c deleted file mode 100644 index c7d39922e1..0000000000 --- a/dlls/winecrt0/drv_entry.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Default entry point for a native driver - * - * Copyright 2005 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#if 0 -#pragma makedep unix -#endif - -#include <stdarg.h> -#include "windef.h" -#include "winternl.h" -#include "wine/library.h" -#include "crt0_private.h" - -struct _DRIVER_OBJECT; -extern NTSTATUS WINAPI DriverEntry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ); - -NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ) -{ - BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); - - if (needs_init) _init( 0, NULL, NULL ); - return DriverEntry( obj, path ); - /* there is no detach routine so we can't call destructors */ -} diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 803d56e10e..93a323f42a 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "crt0_private.h" extern int __cdecl main( int argc, char *argv[] ); @@ -96,12 +95,7 @@ static char **build_argv( const char *src, int *ret_argc ) DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) { int argc; - BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); char **argv = build_argv( GetCommandLineA(), &argc ); - DWORD ret; - if (needs_init) _init( argc, argv, NULL ); - ret = main( argc, argv ); - if (needs_init) _fini(); - ExitProcess( ret ); + ExitProcess( main( argc, argv )); } diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index b01bfd6210..0524dce99a 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "crt0_private.h" extern int __cdecl wmain( int argc, WCHAR *argv[] ); @@ -96,12 +95,7 @@ static WCHAR **build_argv( const WCHAR *src, int *ret_argc ) DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) { int argc; - BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE); WCHAR **argv = build_argv( GetCommandLineW(), &argc ); - DWORD ret; - if (needs_init) _init( 0, NULL, NULL ); - ret = wmain( argc, argv ); - if (needs_init) _fini(); - ExitProcess( ret ); + ExitProcess( wmain( argc, argv )); }

1 0

Alexandre Julliard : msvcrt: Build the CRT startup code also for non-PE builds.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: a2e1e499ade0c99ece2a7e4b9b28e4ca6c24ae22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e1e499ade0c99ece2a7e4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 16:27:55 2020 +0200 msvcrt: Build the CRT startup code also for non-PE builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 9 +++------ dlls/msvcrt/crt_winmain.c | 4 ---- dlls/msvcrt/crt_wmain.c | 9 +++------ dlls/msvcrt/crt_wwinmain.c | 4 ---- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index fa325d64b3..8e4a00bac7 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #if _MSVCR_VER >= 140 #define _UCRT #endif @@ -34,13 +32,14 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" int __cdecl main(int argc, char **argv, char **env); static const IMAGE_NT_HEADERS *get_nt_header( void ) { - extern IMAGE_DOS_HEADER __ImageBase; - return (const IMAGE_NT_HEADERS *)((char *)&__ImageBase + __ImageBase.e_lfanew); + IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)NtCurrentTeb()->Peb->ImageBaseAddress; + return (const IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); } int __cdecl mainCRTStartup(void) @@ -65,5 +64,3 @@ int __cdecl mainCRTStartup(void) exit(ret); return ret; } - -#endif diff --git a/dlls/msvcrt/crt_winmain.c b/dlls/msvcrt/crt_winmain.c index 27e0283cbf..fda3d12f68 100644 --- a/dlls/msvcrt/crt_winmain.c +++ b/dlls/msvcrt/crt_winmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -54,5 +52,3 @@ int __cdecl main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } - -#endif diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 6bc20e2e0f..6a51a1741b 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #if _MSVCR_VER >= 140 #define _UCRT #endif @@ -34,13 +32,14 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" int __cdecl wmain(int argc, WCHAR **argv, WCHAR **env); static const IMAGE_NT_HEADERS *get_nt_header( void ) { - extern IMAGE_DOS_HEADER __ImageBase; - return (const IMAGE_NT_HEADERS *)((char *)&__ImageBase + __ImageBase.e_lfanew); + IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)NtCurrentTeb()->Peb->ImageBaseAddress; + return (const IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); } int __cdecl wmainCRTStartup(void) @@ -65,5 +64,3 @@ int __cdecl wmainCRTStartup(void) exit(ret); return ret; } - -#endif diff --git a/dlls/msvcrt/crt_wwinmain.c b/dlls/msvcrt/crt_wwinmain.c index 2c53b744b5..b50f728025 100644 --- a/dlls/msvcrt/crt_wwinmain.c +++ b/dlls/msvcrt/crt_wwinmain.c @@ -22,8 +22,6 @@ #pragma makedep implib #endif -#ifdef __MINGW32__ - #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -56,5 +54,3 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } - -#endif

1 0

Alexandre Julliard : winegcc: Only use a constructor for dll modules.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: b336a084d650b9d0e59fc2a1120229794c3c3327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b336a084d650b9d0e59fc2a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 17:52:04 2020 +0200 winegcc: Only use a constructor for dll modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7d55e19866..b2a4f9189e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -532,20 +532,10 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( link_args, "-Wl,-Bsymbolic" ); if (!opts->noshortwchar && opts->target_cpu == CPU_ARM) strarray_add( flags, "-Wl,--no-wchar-size-warning" ); - - /* Try all options first - this is likely to succeed on modern compilers */ - if (!try_link( opts->prefix, link_args, "-Wl,-z,defs -Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) - { + if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) strarray_add( flags, "-Wl,-z,defs" ); - strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); - } - else /* otherwise figure out which ones are allowed */ - { - if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) - strarray_add( flags, "-Wl,-z,defs" ); - if (!try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init,-fini,_wine_spec_fini" )) - strarray_add( flags, "-Wl,-init,__wine_spec_init,-fini,__wine_spec_fini" ); - } + if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" )) + strarray_add( flags, "-Wl,-init,__wine_spec_init" ); strarray_addall( link_args, flags ); return link_args;

1 0

Alexandre Julliard : winebuild: Only generate a constructor for dll modules.
by Alexandre Julliard April 15, 2020

April 15, 2020

Module: wine Branch: master Commit: a4677fa23aceabd0158edd816baa43c5f163dd64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4677fa23aceabd0158edd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 15 17:49:09 2020 +0200 winebuild: Only generate a constructor for dll modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- tools/winebuild/spec32.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 81f7678eae..db8587c3bd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -386,7 +386,7 @@ static void set_exec_mode( enum exec_mode_values mode ) static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; - if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "__wine_spec_drv_entry"; + if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; return "__wine_spec_exe_entry"; } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ecfe4c5011..631a467a5e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -680,7 +680,8 @@ void output_module( DLLSPEC *spec ) output( "\n\t.data\n" ); output( "\t.align %d\n", get_alignment(get_ptr_size()) ); - output( "%s\n", asm_globl("__wine_spec_nt_header") ); + output( "\t.globl %s\n", asm_name("__wine_spec_nt_header") ); + output( "%s:\n", asm_name("__wine_spec_nt_header") ); output( ".L__wine_spec_rva_base:\n" ); output( "\t.long 0x4550\n" ); /* Signature */ @@ -749,13 +750,16 @@ void output_module( DLLSPEC *spec ) output_data_directories( data_dirs ); - output( "\n\t%s\n", get_asm_string_section() ); - output( "%s\n", asm_globl("__wine_spec_file_name") ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); + if (spec->characteristics & IMAGE_FILE_DLL) + { + output( "\n\t%s\n", get_asm_string_section() ); + output( "%s\n", asm_globl("__wine_spec_file_name") ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); + output_asm_constructor( "__wine_spec_init_ctor" ); + } + if (target_platform == PLATFORM_APPLE) output( "\t.lcomm %s,4\n", asm_name("_end") ); - - output_asm_constructor( "__wine_spec_init_ctor" ); }

1 0