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

Bernhard Übelacker : cmd: Fix crash in if condition parsing.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: b1e91a36a75fd8ae27a999248aa034e69227bc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e91a36a75fd8ae27a99924… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun May 3 17:05:24 2020 +0200 cmd: Fix crash in if condition parsing. Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1870e5688d..70ccddebc1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2819f7fa99..16843e4087 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len;

1 0

Bernhard Übelacker : cmd/tests: Test that the if command is not influenced by a previous one.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: c358de84c8a767bc36a1d05017243eda11215962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c358de84c8a767bc36a1d050… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun May 3 17:05:25 2020 +0200 cmd/tests: Test that the if command is not influenced by a previous one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 2 files changed, 9 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4bf37a35bb..73b0917c27 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1013,6 +1013,13 @@ if /i not (a)==(b) ( ) else ( echo comparison operators surrounded by brackets seem to be broken ) +if defined windir echo windir is defined +if not defined windir echo windir is defined +if not exist %windir% ( + echo windir does not exist +) else ( + echo windir does exist +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5bcd29b917..fb84de2f5d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -699,6 +699,8 @@ comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work +windir is defined +windir does exist --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

Nikolay Sivov : comctl32/header: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 6dbe2b5348c8bb553de5642550ea5d33f171a4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbe2b5348c8bb553de56425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:57 2020 +0300 comctl32/header: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c70960484a..085549fed6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,7 @@ static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(const HEADER_INFO *infoPtr, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(const HEADER_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, const RECT *rect); -static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static const WCHAR themeClass[] = L"Header"; static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,9 +146,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - static const WCHAR emptyString[] = {0}; - - LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + const WCHAR *pszText = phdi->pszText != NULL ? phdi->pszText : L""; if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else

1 0

Nikolay Sivov : comctl32/propsheet: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 30db9fa830702d9e3975bd58799c0b15b6557047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30db9fa830702d9e3975bd58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:58 2020 +0300 comctl32/propsheet: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 05ab4aa48d..1604b9e961 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -139,8 +139,7 @@ typedef struct * Defines and global variables */ -static const WCHAR PropSheetInfoStr[] = - {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 }; +static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -546,7 +545,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, { WCHAR szTitle[256]; const WCHAR *pTitle; - static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -555,7 +553,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, else if (*p) pTitle = p; else - pTitle = pszNull; + pTitle = L"(null)"; } else pTitle = lppsp->pszTitle;

1 0

Nikolay Sivov : comctl32/tab: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2bd02f9aae8b6d15a94ab80e02e2f23a415feda7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd02f9aae8b6d15a94ab80e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:59 2020 +0300 comctl32/tab: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tab.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f8a54935ca..3bb5310d1f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -152,7 +152,7 @@ typedef struct #define TAB_HOTTRACK_TIMER 1 #define TAB_HOTTRACK_TIMER_INTERVAL 100 /* milliseconds */ -static const WCHAR themeClass[] = { 'T','a','b',0 }; +static const WCHAR themeClass[] = L"Tab"; static inline TAB_ITEM* TAB_GetItem(const TAB_INFO *infoPtr, INT i) { @@ -1013,7 +1013,6 @@ static void TAB_SetupScrolling( TAB_INFO* infoPtr, const RECT* clientRect) { - static const WCHAR emptyW[] = { 0 }; INT maxRange = 0; if (infoPtr->needsScrolling) @@ -1044,7 +1043,7 @@ static void TAB_SetupScrolling( */ if (infoPtr->hwndUpDown==0) { - infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, emptyW, + infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, L"", WS_VISIBLE | WS_CHILD | UDS_HORZ, controlPos.left, controlPos.top, controlPos.right - controlPos.left,

1 0

Nikolay Sivov : comctl32: Move MRU functions to another file.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 964cb1ba414fab246d84483644b23e414b344571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964cb1ba414fab246d844836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:12:00 2020 +0300 comctl32: Move MRU functions to another file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/comctl32undoc.c | 1184 ----------------------------------------- dlls/comctl32/commctrl.c | 962 +++++++++++++++++++++++++++++++++ 3 files changed, 962 insertions(+), 1185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964cb1ba414fab246d84…

1 0

Jacek Caban : winegcc: Add entry symbol underscore when building linker command.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 346cbb6f266f2e3aa1559981404dfc57dc738e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=346cbb6f266f2e3aa1559981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:19:23 2020 +0200 winegcc: Add entry symbol underscore when building linker command. 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, 6 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d38ca97488..a5bc0f4576 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1185,14 +1185,9 @@ static void build(struct options* opts) if (!opts->entry_point) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_DriverEntry(a)8" : "DriverEntry"; + 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->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"; - } + entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; else if (!is_pe && !opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; } @@ -1297,7 +1292,10 @@ 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)); + if (is_pe && entry_point) + strarray_add(link_args, strmake("-Wl,--entry,%s%s", + is_pe && opts->target_cpu == CPU_x86 ? "_" : "", + entry_point)); strarray_add(link_args, spec_o_name);

1 0

Jacek Caban : winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 78ce43f01772bc1ddafdf217cb1390f7e7c8c9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ce43f01772bc1ddafdf217… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:19:43 2020 +0200 winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used. Linkers don't agree on its default. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a5bc0f4576..95797e6b63 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1292,6 +1292,9 @@ 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 && opts->use_msvcrt && !entry_point && (opts->shared || opts->win16_app)) + entry_point = opts->target_cpu == CPU_x86 ? "DllMainCRTStartup(a)12" : "DllMainCRTStartup"; + if (is_pe && entry_point) strarray_add(link_args, strmake("-Wl,--entry,%s%s", is_pe && opts->target_cpu == CPU_x86 ? "_" : "",

1 0

Jacek Caban : winegcc: Make mingw a separated platform from msvc.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2dee9b98747cbbfe05641e7056d8cf4f908bdad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dee9b98747cbbfe05641e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:26 2020 +0200 winegcc: Make mingw a separated platform from msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 24 +++++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index cc5d67977f..0fe9b04b00 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -273,7 +273,7 @@ static char* try_lib_path(const char* dir, const char* pre, static file_type guess_lib_type(enum target_platform platform, const char* dir, const char* library, const char *suffix, char** file) { - if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN) + if (platform != PLATFORM_WINDOWS && platform != PLATFORM_MINGW && platform != PLATFORM_CYGWIN) { /* Unix shared object */ if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index cb4778fa09..9c70011a90 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -49,6 +49,7 @@ enum target_platform PLATFORM_ANDROID, PLATFORM_SOLARIS, PLATFORM_WINDOWS, + PLATFORM_MINGW, PLATFORM_CYGWIN }; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 95797e6b63..2be8b508fb 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -181,14 +181,15 @@ static const struct enum target_platform platform; } platform_names[] = { - { "macos", PLATFORM_APPLE }, - { "darwin", PLATFORM_APPLE }, - { "android", PLATFORM_ANDROID }, - { "solaris", PLATFORM_SOLARIS }, - { "cygwin", PLATFORM_CYGWIN }, - { "mingw32", PLATFORM_WINDOWS }, - { "windows", PLATFORM_WINDOWS }, - { "winnt", PLATFORM_WINDOWS } + { "macos", PLATFORM_APPLE }, + { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, + { "solaris", PLATFORM_SOLARIS }, + { "cygwin", PLATFORM_CYGWIN }, + { "mingw32", PLATFORM_MINGW }, + { "windows-gnu", PLATFORM_MINGW }, + { "windows", PLATFORM_WINDOWS }, + { "winnt", PLATFORM_MINGW } }; struct options @@ -258,7 +259,7 @@ static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) static enum target_platform build_platform = PLATFORM_CYGWIN; #elif defined(_WIN32) -static enum target_platform build_platform = PLATFORM_WINDOWS; +static enum target_platform build_platform = PLATFORM_MINGW; #else static enum target_platform build_platform = PLATFORM_UNSPECIFIED; #endif @@ -487,6 +488,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) break; case PLATFORM_WINDOWS: + case PLATFORM_MINGW: case PLATFORM_CYGWIN: if (opts->shared || opts->win16_app) { @@ -729,7 +731,7 @@ static void compile(struct options* opts, const char* lang) break; } - if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) + if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW) goto no_compat_defines; if (opts->processor != proc_cpp) @@ -1043,7 +1045,7 @@ static void build(struct options* opts) int generate_app_loader = 1; 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); + int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW); unsigned int j; /* NOTE: for the files array we'll use the following convention:

1 0

Jacek Caban : winegcc: Use libgcc only on mingw target.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 66aa39d95986f19f9c4ba172d8d910908dcb03cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aa39d95986f19f9c4ba172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:48 2020 +0200 winegcc: Use libgcc only on mingw target. It's not available for msvc, but we get all we need from importlibs there. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2be8b508fb..95e3913500 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1282,7 +1282,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->use_msvcrt) && is_pe) + if ((opts->nodefaultlibs || opts->use_msvcrt) && opts->target_platform == PLATFORM_MINGW) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0