January 2020 - Wine-commits

Alexandre Julliard : unicode: Remove case mappings that don't round-trip.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 4b5c67ee0b3773b93cb0456a13f2822b7793617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b5c67ee0b3773b93cb0456a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 16:54:05 2020 +0100 unicode: Remove case mappings that don't round-trip. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 20 ++++----- dlls/ntdll/tests/rtlstr.c | 2 - libs/port/casemap.c | 103 +++++++++++++++++-------------------------- loader/l_intl.nls | Bin 6726 -> 6566 bytes tools/make_unicode | 15 +++++++ 5 files changed, 64 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b5c67ee0b3773b93cb0…

1 0

Alexandre Julliard : unicode: Use existing helpers to build the sortkeys table.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: a08821186ac4a1755be1144ec7df7fc033ef9975 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08821186ac4a1755be1144e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 17:26:45 2020 +0100 unicode: Use existing helpers to build the sortkeys table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/collation.c | 176 ++++++++++++++++---------------------------- libs/port/collation.c | 176 ++++++++++++++++---------------------------- tools/make_unicode | 59 +++------------ 3 files changed, 139 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a08821186ac4a1755be1…

1 0

Alexandre Julliard : unicode: Specify a bit width instead of a format when dumping arrays.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 9c3a25b855f4feafa82f905e58b9f01bcaf33fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3a25b855f4feafa82f905e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 23 17:39:07 2020 +0100 unicode: Specify a bit width instead of a format when dumping arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 87 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c3a25b855f4feafa82f…

1 0

Jeff Smith : gdiplus/tests: Add another GdipGetPathGradientCenterPoint test.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 3a092fb616480bd10948405d50b923ae39bf10e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a092fb616480bd10948405d… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jan 22 11:03:26 2020 -0600 gdiplus/tests: Add another GdipGetPathGradientCenterPoint test. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bb645ffef9..c67ab74708 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1299,6 +1299,7 @@ static void test_pathgradientcenterpoint(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status; + GpPath* path; GpPathGradient *grad; GpPointF point; @@ -1346,6 +1347,26 @@ static void test_pathgradientcenterpoint(void) status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); + + status = GdipCreatePath(FillModeWinding, &path); + expect(Ok, status); + + status = GdipAddPathEllipse(path, 0, 0, 100, 50); + expect(Ok, status); + + status = GdipCreatePathGradientFromPath(path, &grad); + expect(Ok, status); + + status = GdipGetPathGradientCenterPoint(grad, &point); + expect(Ok, status); + todo_wine expectf(700.0/13.0, point.X); + expectf(25.0, point.Y); + + status = GdipDeletePath(path); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)grad); + expect(Ok, status); } static void test_pathgradientpresetblend(void)

1 0

Jeff Smith : gdiplus: Calculate centroid of path as default center of path gradient.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 1802ca5e344ba7d6ffb9805bdc46c23e115fb3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1802ca5e344ba7d6ffb9805b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jan 22 11:03:27 2020 -0600 gdiplus: Calculate centroid of path as default center of path gradient. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 16 ++++++++++------ dlls/gdiplus/tests/brush.c | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index e321dcaa60..ff0b009559 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -574,7 +574,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradient **grad) { - GpRectF bounds; + INT i; + REAL sum_x = 0, sum_y = 0; if(!path || !grad) return InvalidParameter; @@ -582,8 +583,6 @@ static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradi if (path->pathdata.Count < 2) return OutOfMemory; - GdipGetPathWorldBounds(path, &bounds, NULL, NULL); - *grad = heap_alloc_zero(sizeof(GpPathGradient)); if (!*grad) { @@ -613,9 +612,14 @@ static GpStatus create_path_gradient(GpPath *path, ARGB centercolor, GpPathGradi (*grad)->centercolor = centercolor; (*grad)->wrap = WrapModeClamp; (*grad)->gamma = FALSE; - /* FIXME: this should be set to the "centroid" of the path by default */ - (*grad)->center.X = bounds.X + bounds.Width / 2; - (*grad)->center.Y = bounds.Y + bounds.Height / 2; + for (i=0; i<path->pathdata.Count; i++) + { + sum_x += path->pathdata.Points[i].X; + sum_y += path->pathdata.Points[i].Y; + } + (*grad)->center.X = sum_x / path->pathdata.Count; + (*grad)->center.Y = sum_y / path->pathdata.Count; + (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; (*grad)->surroundcolors[0] = 0xffffffff; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index c67ab74708..b8067c735c 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1342,8 +1342,8 @@ static void test_pathgradientcenterpoint(void) status = GdipGetPathGradientCenterPoint(grad, &point); expect(Ok, status); - todo_wine expectf(1.0, point.X); - todo_wine expectf(4.0/3.0, point.Y); + expectf(1.0, point.X); + expectf(4.0/3.0, point.Y); status = GdipDeleteBrush((GpBrush*)grad); expect(Ok, status); @@ -1359,7 +1359,7 @@ static void test_pathgradientcenterpoint(void) status = GdipGetPathGradientCenterPoint(grad, &point); expect(Ok, status); - todo_wine expectf(700.0/13.0, point.X); + expectf(700.0/13.0, point.X); expectf(25.0, point.Y); status = GdipDeletePath(path);

1 0

Dmitry Timoshkov : gdiplus: If the font unit is not pixels scaling should not be applied.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: b7ca0bc0434eacb6932deb14012759690c64714e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ca0bc0434eacb6932deb14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 23 14:35:39 2020 +0800 gdiplus: If the font unit is not pixels scaling should not be applied. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e485e5c99f..c52fa65445 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2276,6 +2276,12 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + /* If the font unit is not pixels scaling should not be applied */ + if (font->unit != UnitPixel && font->unit != UnitWorld) + { + rel_width /= graphics->scale; + rel_height /= graphics->scale; + } get_log_fontW(font, graphics, &lfw); lfw.lfHeight = -gdip_round(font_height * rel_height);

1 0

Jacek Caban : include: Add wWinMain declaration.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 22a9b47429d5babd7048b24cee9d6aae42bd2c39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a9b47429d5babd7048b24c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 19:50:28 2020 +0100 include: Add wWinMain declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 655eb48f0f..3062d3b6ad 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -3136,6 +3136,7 @@ static FORCEINLINE HANDLE WINAPI GetCurrentThreadEffectiveToken(void) /* WinMain(entry point) must be declared in winbase.h. */ /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int); +int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); #ifdef __WINESRC__ /* shouldn't be here, but is nice for type checking */

1 0

Jacek Caban : makedep: Link importlib object files into module only when it's explicitly imported.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 3ad95e03b810906dce87231fd12aa9a1d8f4aad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad95e03b810906dce87231f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 19:51:30 2020 +0100 makedep: Link importlib object files into module only when it's explicitly imported. To prevent msvcrt linking its own importlib into DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput8/Makefile.in | 2 +- tools/makedep.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 3b046d61d4..ae65fd4d93 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 0ede9f0fb1..5f0dce97ca 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput diff --git a/tools/makedep.c b/tools/makedep.c index 6d1500534d..4cc0e784c7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2193,6 +2193,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *name = get_base_name( imports.str[i] ); const char *lib = NULL; + /* skip module's own importlib, its object files will be linked directly */ + if (make->importlib && !strcmp( make->importlib, imports.str[i] )) continue; + for (j = 0; j < top_makefile->subdirs.count; j++) { const struct makefile *submake = top_makefile->submakes[j]; @@ -3070,7 +3073,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &make->unixobj_files, strmake( "%s.o", obj )); - else if (!is_dll_src) + else if (!is_dll_src && (!(source->file->flags & FLAG_C_IMPLIB) || (make->importlib && strarray_exists( &make->imports, make->importlib )))) strarray_add( &make->object_files, strmake( "%s.o", obj )); else strarray_add( &make->clean_files, strmake( "%s.o", obj ));

1 0

Jacek Caban : winegcc: Add support for -Wl,--entry argument.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 618ac5f32a8c05beec5a499b49741f4b3cebd9ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=618ac5f32a8c05beec5a499b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 19:52:05 2020 +0100 winegcc: Add support for -Wl,--entry argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7f32a38788..7320216a24 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -219,6 +219,7 @@ struct options const char* isysroot; const char* lib_suffix; const char* subsystem; + const char* entry_point; const char* prelink; strarray* prefix; strarray* lib_dirs; @@ -439,16 +440,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->unicode_app) strarray_add( flags, "-municode" ); if (opts->nodefaultlibs || use_wine_crt) strarray_add( flags, "-nodefaultlibs" ); if (opts->nostartfiles || use_wine_crt) strarray_add( flags, "-nostartfiles" ); - - if (opts->subsystem) - { - strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); - if (!strcmp( opts->subsystem, "native" )) - { - const char *entry = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; - strarray_add( flags, strmake( "-Wl,--entry,%s", entry )); - } - } + if (opts->subsystem) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); strarray_add( flags, "-Wl,--nxcompat" ); @@ -957,7 +949,7 @@ static void build(struct options* opts) const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; - const char* crt_lib = NULL; + const char *crt_lib = NULL, *entry_point = NULL; int fake_module = 0; int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); unsigned int j; @@ -1098,6 +1090,19 @@ static void build(struct options* opts) } if (!opts->nostdlib && !is_pe) add_library(opts, lib_dirs, files, "wine"); + /* set default entry point, if needed */ + if (!opts->entry_point) + { + if (is_pe) + { + if (opts->subsystem && !strcmp( opts->subsystem, "native" )) + entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; + } + else if (!opts->shared && opts->unicode_app) + entry_point = "__wine_spec_exe_wentry"; + } + else entry_point = opts->entry_point; + /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); @@ -1133,14 +1138,15 @@ static void build(struct options* opts) strarray_add(spec_args, output_name); strarray_add(spec_args, "--subsystem"); strarray_add(spec_args, opts->gui_app ? "windows" : "console"); - if (opts->unicode_app) - { - strarray_add(spec_args, "--entry"); - strarray_add(spec_args, "__wine_spec_exe_wentry"); - } if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } + if (entry_point) + { + strarray_add(spec_args, "--entry"); + strarray_add(spec_args, entry_point); + } + if (opts->subsystem) { strarray_add(spec_args, "--subsystem"); @@ -1196,6 +1202,8 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); + if (is_pe && entry_point) strarray_add(link_args, strmake("-Wl,--entry,%s", entry_point)); + strarray_add(link_args, spec_o_name); if (is_pe) @@ -1677,6 +1685,11 @@ int main(int argc, char **argv) opts.subsystem = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--entry") && j < Wl->size - 1) + { + opts.entry_point = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-delayload") && j < Wl->size - 1) { strarray_add( opts.delayimports, Wl->base[++j] );

1 0

Jacek Caban : msvcrt: Provide EXE entry points in importlib.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: bb9fb27bc4c265e751b88b1d8d4c835438e7fc5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb9fb27bc4c265e751b88b1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 19:58:50 2020 +0100 msvcrt: Provide EXE entry points in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/Makefile.in | 5 ++++ dlls/msvcrt/crt_gccmain.c | 31 ++++++++++++++++++++++++ dlls/msvcrt/crt_main.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_winmain.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_wmain.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/crt_wwinmain.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 272 insertions(+) diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index d0237fd891..0b8fdf19c7 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -6,6 +6,11 @@ DELAYIMPORTS = advapi32 user32 C_SRCS = \ console.c \ cpp.c \ + crt_gccmain.c \ + crt_main.c \ + crt_winmain.c \ + crt_wmain.c \ + crt_wwinmain.c \ ctype.c \ data.c \ dir.c \ diff --git a/dlls/msvcrt/crt_gccmain.c b/dlls/msvcrt/crt_gccmain.c new file mode 100644 index 0000000000..ed25f385d1 --- /dev/null +++ b/dlls/msvcrt/crt_gccmain.c @@ -0,0 +1,31 @@ +/* + * __main entry point + * + * Copyright 2019 Jacek Caban for CodeWeavers + * + * 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 implib +#endif + +#ifdef __MINGW32__ + +/* mingw compilers emit call to __main() when main() function is defined. + * it's used by crt to call global constructors and register global destructors. */ +void __cdecl __main(void) {} + +#endif diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c new file mode 100644 index 0000000000..7502f30075 --- /dev/null +++ b/dlls/msvcrt/crt_main.c @@ -0,0 +1,59 @@ +/* + * mainCRTStartup default entry point + * + * Copyright 2019 Jacek Caban for CodeWeavers + * + * 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 implib +#endif + +#ifdef __MINGW32__ + +#include "msvcrt.h" + +#include "windef.h" +#include "winbase.h" + +/* FIXME: Use msvcrt headers once we move to PE file */ +void __cdecl exit(int); +void __cdecl __getmainargs(int *, char ***, char ***, int, int *); +void __cdecl __set_app_type(int); + +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); +} + +int __cdecl mainCRTStartup(void) +{ + int argc, new_mode = 0, ret; + char **argv, **env; + + __getmainargs(&argc, &argv, &env, 0, &new_mode); + __set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? 2 : 1); + + ret = main(argc, argv, env); + + exit(ret); + return ret; +} + +#endif diff --git a/dlls/msvcrt/crt_winmain.c b/dlls/msvcrt/crt_winmain.c new file mode 100644 index 0000000000..27e0283cbf --- /dev/null +++ b/dlls/msvcrt/crt_winmain.c @@ -0,0 +1,58 @@ +/* + * main default entry point for exe files + * + * 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 implib +#endif + +#ifdef __MINGW32__ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +int __cdecl main( int argc, char *argv[] ) +{ + STARTUPINFOA info; + char *cmdline = GetCommandLineA(); + int bcount = 0; + BOOL in_quotes = FALSE; + + while (*cmdline) + { + if ((*cmdline == '\t' || *cmdline == ' ') && !in_quotes) break; + else if (*cmdline == '\\') bcount++; + else if (*cmdline == '\"') + { + if (!(bcount & 1)) in_quotes = !in_quotes; + bcount = 0; + } + else bcount = 0; + cmdline++; + } + while (*cmdline == '\t' || *cmdline == ' ') cmdline++; + + GetStartupInfoA( &info ); + 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 new file mode 100644 index 0000000000..0588d5bdce --- /dev/null +++ b/dlls/msvcrt/crt_wmain.c @@ -0,0 +1,59 @@ +/* + * wmainCRTStartup default entry point + * + * Copyright 2019 Jacek Caban for CodeWeavers + * + * 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 implib +#endif + +#ifdef __MINGW32__ + +#include "msvcrt.h" + +#include "windef.h" +#include "winbase.h" + +/* FIXME: Use msvcrt headers once we move to PE file */ +void __cdecl exit(int); +void __cdecl __wgetmainargs(int *, WCHAR ***, WCHAR ***, int, int *); +void __cdecl __set_app_type(int); + +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); +} + +int __cdecl wmainCRTStartup(void) +{ + int argc, new_mode = 0, ret; + WCHAR **argv, **env; + + __wgetmainargs(&argc, &argv, &env, 0, &new_mode); + __set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? 2 : 1); + + ret = wmain(argc, argv, env); + + exit(ret); + return ret; +} + +#endif diff --git a/dlls/msvcrt/crt_wwinmain.c b/dlls/msvcrt/crt_wwinmain.c new file mode 100644 index 0000000000..2c53b744b5 --- /dev/null +++ b/dlls/msvcrt/crt_wwinmain.c @@ -0,0 +1,60 @@ +/* + * main default entry point for Unicode exe files + * + * 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 implib +#endif + +#ifdef __MINGW32__ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); + +int __cdecl wmain( int argc, WCHAR *argv[] ) +{ + STARTUPINFOW info; + WCHAR *cmdline = GetCommandLineW(); + int bcount = 0; + BOOL in_quotes = FALSE; + + while (*cmdline) + { + if ((*cmdline == '\t' || *cmdline == ' ') && !in_quotes) break; + else if (*cmdline == '\\') bcount++; + else if (*cmdline == '\"') + { + if (!(bcount & 1)) in_quotes = !in_quotes; + bcount = 0; + } + else bcount = 0; + cmdline++; + } + while (*cmdline == '\t' || *cmdline == ' ') cmdline++; + + GetStartupInfoW( &info ); + if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; + return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); +} + +#endif

1 0