November 2020 - Wine-Commits

Daniel Lehman : shcore: Return failure on Read past end of memory stream.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: f12a775b273163065db9de1845b6e9a05f7bbdaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f12a775b273163065db9de18… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 26 15:21:24 2020 -0800 shcore: Return failure on Read past end of memory stream. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 18 ++++++++------- dlls/shlwapi/tests/istream.c | 55 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index dc782e8be08..d5fce76eade 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -603,17 +603,19 @@ static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); if (stream->u.mem.position >= stream->u.mem.length) - length = 0; - else - length = stream->u.mem.length - stream->u.mem.position; - - length = buff_size > length ? length : buff_size; - if (length != 0) /* not at end of buffer and we want to read something */ { - memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); - stream->u.mem.position += length; /* adjust pointer */ + if (read_len) + *read_len = 0; + return S_FALSE; } + length = stream->u.mem.length - stream->u.mem.position; + if (buff_size < length) + length = buff_size; + + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; + if (read_len) *read_len = length; diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index d3e7dbb8810..84957ac8cd1 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -736,8 +736,10 @@ static void test_SHCreateMemStream(void) { static const BYTE initial[10]; IStream *stream, *stream2; + LARGE_INTEGER off; IUnknown *unk; char buff[10]; + ULONG i, num; HRESULT hr; stream = SHCreateMemStream(initial, 0); @@ -756,9 +758,56 @@ static void test_SHCreateMemStream(void) if (unk) IUnknown_Release(unk); - hr = IStream_Read(stream, buff, sizeof(buff), NULL); -todo_wine - ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x55, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x55, "expected 0x55, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x11, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = -sizeof(buff); + hr = IStream_Seek(stream, off, STREAM_SEEK_CUR, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x11, "expected 0x11, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); hr = IStream_Clone(stream, &stream2); todo_wine

1 0

Alexandre Julliard : windowscodecs: Build with msvcrt.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 0012c26fa6136cbf7080b3fc53f872c748fcbca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0012c26fa6136cbf7080b3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 30 21:02:21 2020 +0100 windowscodecs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 ++ dlls/windowscodecs/bitmap.c | 2 -- dlls/windowscodecs/bmpdecode.c | 2 -- dlls/windowscodecs/bmpencode.c | 2 -- dlls/windowscodecs/clsfactory.c | 2 -- dlls/windowscodecs/colorcontext.c | 2 -- dlls/windowscodecs/colortransform.c | 2 -- dlls/windowscodecs/converter.c | 2 -- dlls/windowscodecs/ddsformat.c | 3 --- dlls/windowscodecs/decoder.c | 3 --- dlls/windowscodecs/encoder.c | 3 --- dlls/windowscodecs/fliprotate.c | 2 -- dlls/windowscodecs/gifformat.c | 2 -- dlls/windowscodecs/icoformat.c | 2 -- dlls/windowscodecs/imgfactory.c | 2 -- dlls/windowscodecs/info.c | 13 +++++-------- dlls/windowscodecs/main.c | 1 - dlls/windowscodecs/metadatahandler.c | 2 -- dlls/windowscodecs/metadataquery.c | 15 +++++++-------- dlls/windowscodecs/palette.c | 2 -- dlls/windowscodecs/pngformat.c | 3 --- dlls/windowscodecs/propertybag.c | 9 +++------ dlls/windowscodecs/proxy.c | 2 -- dlls/windowscodecs/regsvr.c | 7 +++---- dlls/windowscodecs/scaler.c | 2 -- dlls/windowscodecs/tgaformat.c | 3 --- dlls/windowscodecs/unix_iface.c | 3 --- dlls/windowscodecs/wincodecs_private.h | 7 +++---- 28 files changed, 23 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0012c26fa6136cbf7080…

1 0

Esme Povirk : windowscodecs: Move ICNS encoding to the unix lib.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 769d88a39e8c2c6c1d4ec7e1cb96ad8baa4bb2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=769d88a39e8c2c6c1d4ec7e1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sun Nov 29 16:13:15 2020 -0600 windowscodecs: Move ICNS encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/encoder.c | 26 ++ dlls/windowscodecs/icnsencoder.c | 295 +++++++++++++ dlls/windowscodecs/icnsformat.c | 742 --------------------------------- dlls/windowscodecs/main.c | 14 + dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 4 + 8 files changed, 344 insertions(+), 744 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=769d88a39e8c2c6c1d4e…

1 0

Michael Stefaniuc : cmd: Use wide-char string literals.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 40ce3c5b60e1330d59f3551df222cc0a7a1b222b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40ce3c5b60e1330d59f3551d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:30 2020 +0100 cmd: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/directory.c | 21 ++++----- programs/cmd/wcmdmain.c | 116 ++++++++++++++++------------------------------- 2 files changed, 46 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40ce3c5b60e1330d59f3…

1 0

Michael Stefaniuc : cmd: Use wide-char string literals in builtins.c.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: a158bf7e9c322f03894a9990a1ea1aa48f12f1ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a158bf7e9c322f03894a9990… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:29 2020 +0100 cmd: Use wide-char string literals in builtins.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 386 +++++++++++++++++++----------------------------- 1 file changed, 149 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a158bf7e9c322f03894a…

1 0

Jacek Caban : server: Remove no longer needed free_console.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 23e7b859a11cfe715ffc1ef899149a026870f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23e7b859a11cfe715ffc1ef8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:42:02 2020 +0100 server: Remove no longer needed free_console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 +++++++----------------------- server/process.c | 4 +--- server/process.h | 1 - 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/server/console.c b/server/console.c index 295db7767b2..0e779c77816 100644 --- a/server/console.c +++ b/server/console.c @@ -55,7 +55,6 @@ struct console { struct object obj; /* object header */ int signaled; /* is console signaled */ - int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ struct screen_buffer *active; /* active screen buffer */ struct console_server *server; /* console server object */ @@ -513,7 +512,6 @@ static struct object *create_console(void) console->renderer = NULL; console->signaled = 0; - console->num_proc = 0; console->active = NULL; console->server = NULL; console->fd = NULL; @@ -635,20 +633,6 @@ static struct object *create_screen_buffer( struct console *console ) return &screen_buffer->obj; } -/* free the console for this process */ -int free_console( struct process *process ) -{ - struct console *console = process->console; - - if (!console) return 0; - - process->console = NULL; - console->num_proc--; - release_object( console ); - - return 1; -} - struct thread *console_get_renderer( struct console *console ) { return console->renderer; @@ -755,10 +739,7 @@ static struct object *create_console_connection( struct console *console ) } if (console) - { current->process->console = (struct console *)grab_object( console ); - console->num_proc++; - } return &connection->obj; } @@ -1072,10 +1053,7 @@ static int console_connection_ioctl( struct fd *fd, ioctl_code_t code, struct as if (!(process = get_process_from_id( pid ))) return 0; if (process->console) - { current->process->console = (struct console *)grab_object( process->console ); - process->console->num_proc++; - } else set_error( STATUS_ACCESS_DENIED ); release_object( process ); return !get_error(); @@ -1200,7 +1178,13 @@ static struct object *console_connection_open_file( struct object *obj, unsigned static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { - free_console( process ); + struct console *console = process->console; + + if (console) + { + process->console = NULL; + release_object( console ); + } return 1; } diff --git a/server/process.c b/server/process.c index 5b3e29e5dfd..4a366b4d3b0 100644 --- a/server/process.c +++ b/server/process.c @@ -915,9 +915,7 @@ static void process_killed( struct process *process ) if (process->exe_file) release_object( process->exe_file ); process->idle_event = NULL; process->exe_file = NULL; - - /* close the console attached to this process, if any */ - free_console( process ); + assert( !process->console ); while ((ptr = list_head( &process->rawinput_devices ))) { diff --git a/server/process.h b/server/process.h index b4f3660d89a..374eda65b6b 100644 --- a/server/process.h +++ b/server/process.h @@ -132,7 +132,6 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console *console ); /* process tracing mechanism to use */

1 0

Jacek Caban : mshtml: Update to Wine Gecko 2.47.2.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 70567d9f2d32fa3f052609051e9913344f24c42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=70567d9f2d32fa3f05260905… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 16:56:52 2020 +0100 mshtml: Update to Wine Gecko 2.47.2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 67d61ea0d22..cfc51155f57 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -45,13 +45,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47.1" +#define GECKO_VERSION "2.47.2" #ifdef __i386__ #define GECKO_ARCH "x86" -#define GECKO_SHA "f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051" +#define GECKO_SHA "e520ce7336cd420cd09c91337d87e74bb420300fd5cbc6f724c1802766b6a61d" #elif defined(__x86_64__) #define GECKO_ARCH "x86_64" -#define GECKO_SHA "69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a" +#define GECKO_SHA "0596761024823ff3c21f13e1cd5cd3e89dccc698294d62974d8930aeda86ce45" #else #define GECKO_ARCH "" #define GECKO_SHA "???" diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index af83b6a4380..a621007b0cc 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47.1\"") +cpp_quote("#define GECKO_VERSION \"2.47.2\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl";

1 0

Francois Gouget : msxml3/tests: Fix the spelling of a test string.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 251a2b955a04dce6b8c5ab1f9f529f193ec52a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=251a2b955a04dce6b8c5ab1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 30 16:23:19 2020 +0100 msxml3/tests: Fix the spelling of a test string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e27754d457a..e94a2c88a81 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5877,7 +5877,7 @@ static void test_xmlTypes(void) } /* CData Section */ - str = SysAllocString(L"[1]*2=3; &gee thats not right!"); + str = SysAllocString(L"[1]*2=3; &gee that is not right!"); hr = IXMLDOMDocument_createCDATASection(doc, str, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); @@ -5904,7 +5904,7 @@ static void test_xmlTypes(void) hr = IXMLDOMCDATASection_get_xml(pCDataSec, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee thats not right!]]>" ), "incorrect cdata xml\n"); + ok( !lstrcmpW( str, L"<![CDATA[[1]*2=3; &gee that is not right!]]>" ), "incorrect cdata xml\n"); SysFreeString(str); /* test lastChild */

1 0

Kevin Puetz : winebuild: Find WinMain/wWinMain in static libraries.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 48cccee394e998ce2a686357f332a80189cca6a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cccee394e998ce2a686357… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:28 2020 -0600 winebuild: Find WinMain/wWinMain in static libraries. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b37aec9cf6f..572b4d74ae7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -405,12 +405,16 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { /* __wine_spec_exe_wentry always calls wmain */ add_spec_extra_ld_symbol("wmain"); + if (spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + add_spec_extra_ld_symbol("wWinMain"); return "__wine_spec_exe_wentry"; } else { /* __wine_spec_exe_entry always calls main */ add_spec_extra_ld_symbol("main"); + if (spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + add_spec_extra_ld_symbol("WinMain"); return "__wine_spec_exe_entry"; } }

1 0

Kevin Puetz : winebuild: Select all __wine_spec_exe* entry inside winebuild.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: a1078d47707eaa1e7fc574bd5a080c8360056ba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1078d47707eaa1e7fc574bd… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:26 2020 -0600 winebuild: Select all __wine_spec_exe* entry inside winebuild. Override --entry in winegcc only when it applies to any compiler (e.g. kernel drivers or msvcrt) but leave spec details to winebuild. Forward -municode so winebuild will know which to use. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 9 +++++++-- tools/winegcc/winegcc.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03715af9563..26a0539c500 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dda..b1e6d115717 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,12 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) + return "__wine_spec_exe16_entry"; + else if (spec->unicode_app) + return "__wine_spec_exe_wentry"; + else + return "__wine_spec_exe_entry"; } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +452,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e9707a73774..6decb02ee04 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1255,8 +1255,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1268,6 +1266,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

1 0