January 2020 - Wine-Commits

Francois Gouget : testbot/LogUtils: Return the ParseWineTestReport() results as a single object.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: tools Branch: master Commit: 6ec52659bfe20bf07c37841ad669e0b31a446b07 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6ec52659bfe20bf07c37841… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 24 09:52:35 2020 +0100 testbot/LogUtils: Return the ParseWineTestReport() results as a single object. Rename the variable holding it to $LogInfo for consistency with the other functions as it plays the same role and may eventually carry the same information. Store the extra errors in the $LogInfo->{Extra} field and rename _AddError() to _AddExtra() to match and avoid confusion with _AddLogError(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 10 +-- testbot/bin/WineRunTask.pl | 18 +++--- testbot/bin/WineRunWineTest.pl | 18 +++--- testbot/lib/WineTestBot/LogUtils.pm | 125 +++++++++++++++++++++--------------- 4 files changed, 95 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=6ec52659bfe20bf07c3…

1 0

Jacek Caban : winegcc: Use Wine crt when linking builtin EXEs.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: c6e6771fab4b6ae864a4315389d3aa298469e43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6e6771fab4b6ae864a43153… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 21 20:03:24 2020 +0100 winegcc: Use Wine crt when linking builtin EXEs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7320216a24..21853d6fb3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -384,7 +384,6 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch static strarray *get_link_args( struct options *opts, const char *output_name ) { - int use_wine_crt = opts->wine_builtin && opts->shared; strarray *link_args = get_translator( opts ); strarray *flags = strarray_alloc(); @@ -438,8 +437,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); 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->nodefaultlibs || opts->wine_builtin) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || opts->wine_builtin) strarray_add( flags, "-nostartfiles" ); if (opts->subsystem) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); strarray_add( flags, "-Wl,--nxcompat" ); @@ -1097,6 +1096,13 @@ static void build(struct options* opts) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) entry_point = opts->target_cpu == CPU_x86 ? "_DriverEntry(a)8" : "DriverEntry"; + else if(opts->wine_builtin && !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"; + } } else if (!opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; @@ -1190,7 +1196,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->shared) && is_pe) + if ((opts->nodefaultlibs || opts->wine_builtin) && is_pe) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0

Vladimir Panteleev : kernel32/tests: Fix GetLastError() checks in environment tests.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: b0acb5982a677a5e848f7e417299a1b6e3eadbe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0acb5982a677a5e848f7e41… Author: Vladimir Panteleev <git(a)vladimir.panteleev.md> Date: Thu Jan 23 15:05:41 2020 +0000 kernel32/tests: Fix GetLastError() checks in environment tests. Lack of SetLastError() calls caused tests to compare stale errors, instead of the effects of the tested (immediately previously called) functions. Add SetLastError calls, and fix a broken test (copy check from A to W tests). Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/environ.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 44a6a0cff0..128a5fdbe5 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -131,6 +131,7 @@ static void test_GetSetEnvironmentVariableA(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyA(buf, "foo"); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -163,16 +164,19 @@ static void test_GetSetEnvironmentVariableA(void) name, ret_size, GetLastError(), buf); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, NULL, 0); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(NULL, buf, lstrlenA(value) + 1); ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA("", buf, lstrlenA(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", @@ -233,6 +237,7 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should erase existing variable\n"); lstrcpyW(buf, fooW); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n"); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, @@ -255,25 +260,31 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); + SetLastError(0); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, - "should not find variable but ret_size=%d GetLastError=%d\n", + ok(ret_size == 0 && + ((GetLastError() == 0 && lstrcmpW(buf, empty_strW) == 0) || + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), + "should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); ok(lstrcmpW(buf, empty_strW) == 0, "should copy an empty string\n"); /* Test the limits */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, NULL, 0); - ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, + ok(ret_size == 0 && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); if (0) /* Both tests crash on Vista */ { + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(NULL, buf, lstrlenW(value) + 1); ok(ret_size == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND, "should not find variable but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); + SetLastError(0xdeadbeef); ret = SetEnvironmentVariableW(NULL, NULL); ok(ret == FALSE && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ENVVAR_NOT_FOUND), "should fail with NULL, NULL but ret=%d and GetLastError=%d\n", @@ -342,6 +353,7 @@ static void test_ExpandEnvironmentStringsA(void) ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2)); ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf2, ret_size); + SetLastError(0xdeadbeef); ret_size1 = GetWindowsDirectoryA(buf1,256); ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n"); ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf)); @@ -374,6 +386,7 @@ static void test_GetComputerName(void) int name_len; size = 0; + SetLastError(0xdeadbeef); ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); @@ -433,6 +446,7 @@ static void test_GetComputerNameExA(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -452,6 +466,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -468,6 +483,7 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -484,12 +500,14 @@ static void test_GetComputerNameExA(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExA(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(ret == 0, "Expected 0, got %d\n", ret); @@ -520,6 +538,7 @@ static void test_GetComputerNameExW(void) } size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsDomain, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -530,6 +549,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsFullyQualified, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -540,6 +560,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameDnsHostname, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -550,6 +571,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, (LPWSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error); @@ -560,6 +582,7 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); size = 0; + SetLastError(0xdeadbeef); ret = pGetComputerNameExW(ComputerNameNetBIOS, NULL, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d\n", error);

1 0

Zebediah Figura : msctf/tests: Fix some test failures on Windows 10.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

Module: wine Branch: master Commit: c55e8822ae3bbb8b1d3ab9b363214e4ad2f478d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55e8822ae3bbb8b1d3ab9b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 23 13:35:57 2020 -0600 msctf/tests: Fix some test failures on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f8ec492f7f..81e692d1d2 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2406,6 +2406,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = FOCUS_SAVE; test_PrevFocus = FOCUS_SAVE; test_OnSetFocus = SINK_SAVE; @@ -2422,11 +2423,13 @@ static void test_AssociateFocus(void) ok(olddm == dm1, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(olddm); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ test_OnSetFocus = SINK_IGNORE; /* OnSetFocus fires a couple of times on Win7 */ test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; SetFocus(wnd2); processPendingMessages(); + test_OnInitDocumentMgr = test_OnPushContext = SINK_OPTIONAL; /* Win10 1709+ */ SetFocus(wnd1); processPendingMessages(); @@ -2444,6 +2447,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; @@ -2454,8 +2458,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = FOCUS_IGNORE; test_PrevFocus = FOCUS_IGNORE; DestroyWindow(wnd1); + test_OnPopContext = SINK_OPTIONAL; /* Win10 1709+ */ DestroyWindow(wnd2); - test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnPopContext = SINK_IGNORE; /* Vista+, twice Win10 1709+ */ test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); test_CurrentFocus = NULL;

1 0

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

Jan. 23, 2020

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

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

Jan. 23, 2020

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 : include: Add wWinMain declaration.
by Alexandre Julliard Jan. 23, 2020

Jan. 23, 2020

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

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

Jan. 23, 2020

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

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

Jan. 23, 2020

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

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

Jan. 23, 2020

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