September 2018 - Wine-commits

Michael Stefaniuc : Release 3.0.3.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: f5ada74b31f54ee65e75fdf7c19499c12ae96378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ada74b31f54ee65e75fdf7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 29 22:24:29 2018 +0200 Release 3.0.3. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 378 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 196 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5ada74b31f54ee65e75…

1 0

Tag wine-3.0.3 : Alexandre Julliard : Release 3.0.3
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: refs/tags/wine-3.0.3 Tag: dc831787582cf83b8a75cddfaded82fcb0df8080 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dc831787582cf83b8a75cddfade… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:47:10 2018 +0200 Release 3.0.3

1 0

Jason Edmeades : cmd: Fix statements after 'else' inside for loops.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: ecdcf1ba42feaebbd8ed976efb397501eaa32950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecdcf1ba42feaebbd8ed976e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:29 2018 +0100 cmd: Fix statements after 'else' inside for loops. When inside a for loop, an 'if' statement is processed and the true part taken. Once all the commands in the true are processed, the else part is parsed, and a flag set to skip all commands in the else part. Unfortunately this flag is left on even when the if statement ends, meaning subsequent commands are also skipped. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6cb520476a79fd7ff5a67c1a1064de9c267fdbc1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 18 +++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 34 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7c2122e..160940e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1571,10 +1571,12 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* execute all appropriate commands */ curPosition = *cmdList; - WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d)\n", + WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d) processThese(%d)\n", *cmdList, (*cmdList)->prevDelim, - (*cmdList)->bracketDepth, myDepth); + (*cmdList)->bracketDepth, + myDepth, + processThese); /* Execute any statements appended to the line */ /* FIXME: Only if previous call worked for && or failed for || */ @@ -1613,6 +1615,18 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (*cmd) { WCMD_execute (cmd, (*cmdList)->redirects, cmdList, FALSE); } + } else { + /* Loop skipping all commands until we get back to the current + depth, including skipping commands and their subsequent + pipes (eg cmd | prog) */ + do { + *cmdList = (*cmdList)->nextcommand; + } while (*cmdList && + ((*cmdList)->bracketDepth > myDepth || + (*cmdList)->prevDelim)); + + /* After the else is complete, we need to now process subsequent commands */ + processThese = TRUE; } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; } else if (!processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f344de2..236238c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -418,6 +418,7 @@ if 1==1 (echo n1) else echo n2|echo n3 if 1==1 (echo o1) else echo o2&&echo o3 if 1==1 (echo p1) else echo p2||echo p3 if 1==1 (echo q1) else echo q2&echo q3 +echo --- echo --- chain else (if false) if 1==0 echo a1 else echo a2 if 1==0 echo b1|echo b2 else echo b3 @@ -1328,6 +1329,39 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- ifs inside for loops +for %%i in (test) do ( + echo a1 + if 1==1 ( + echo b1 + ) else ( + echo c1 + ) + echo d1 +) +for %%i in (test) do ( + echo a2 + if 1==1 ( + echo b2 + ) else echo c2 + echo d2 +) +for %%i in (test) do ( + echo a3 + if 1==0 ( + echo b3 + ) else echo c3 + echo d3 +) +for %%i in (test) do ( + echo a4 + if 1==0 ( + echo b4 + ) else ( + echo c4 + ) + echo d4 +) echo --- set /a goto :testseta diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index cab4a35..eb60620 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -428,6 +428,7 @@ n1 o1 p1 q1 +(a)todo_wine@--- --- chain else (if false) @todo_wine(a)j3 --- @@ -974,6 +975,19 @@ ErrorLevel 0 -1 1 3 +--- ifs inside for loops +a1 +b1 +d1 +a2 +b2 +d2 +a3 +c3 +d3 +a4 +c4 +d4 --- set /a ------ individual operations WINE_foo correctly 3

1 0

Piotr Caban : msi: Fix condition evaluation when comparing literal and integer.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: c32f85c5f41989d532cc730ff1d6f585111a9692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32f85c5f41989d532cc730f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 13:12:51 2018 +0200 msi: Fix condition evaluation when comparing literal and integer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7837ae20cdeabab661da7bb5dae24f5ffefe17ee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/tests/package.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 6ee6ab9..3a0d028 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2022953..cfd5489 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2071,6 +2071,10 @@ static void test_condition(void) ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "\"\"<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");

1 0

Austin English : winecfg: Recommend against overriding secur32.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: f16195d138d8180bdaee89b78378376fec01aa04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16195d138d8180bdaee89b7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 2 05:23:07 2018 +0200 winecfg: Recommend against overriding secur32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45344 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53cc1da18f3683197fa5e62c2f7d4f9d3ef39c51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/libraries.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index d414c75..f6d38c9 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -64,6 +64,7 @@ static const char * const builtin_only[] = "ntoskrnl.exe", "opengl32", "sane.ds", + "secur32", "twain_32", "unicows", "user32",

1 0

Alex Henrie : gdi32: Add DECLSPEC_HOTPATCH to GetDIBits.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 6f8db1d2cd5b4cbf4891cdf6feda7008374da024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8db1d2cd5b4cbf4891cdf6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 5 08:39:25 2018 +0200 gdi32: Add DECLSPEC_HOTPATCH to GetDIBits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 478a3d64ef7630f16e6c618375a76ad665c7cf63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2eb0e91..6936434 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1208,7 +1208,7 @@ BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) * Success: Number of scan lines copied from bitmap * Failure: 0 */ -INT WINAPI GetDIBits( +INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, /* [in] Handle to device context */ HBITMAP hbitmap, /* [in] Handle to bitmap */ UINT startscan, /* [in] First scan line to set in dest bitmap */

1 0

Vincent Povirk : mscoree: Use upgrade code to find installed Wine Mono version.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 1e871af6b317405a78ba0de0606012187e64b105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e871af6b317405a78ba0de0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:29 2018 -0500 mscoree: Use upgrade code to find installed Wine Mono version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb6e92d3287e9768b2e535c0b3fa159b19ec26cf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 42f8169..c4876fe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -669,8 +669,10 @@ static BOOL install_wine_mono(void) { BOOL is_wow64 = FALSE; HMODULE hmsi; + UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15]; + char productcodebuf[39]; UINT res; DWORD buffer_size; PROCESS_INFORMATION pi; @@ -681,7 +683,7 @@ static BOOL install_wine_mono(void) BOOL ret; static const char* mono_version = "4.7.1"; - static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; static const WCHAR argsW[] = @@ -703,11 +705,22 @@ static BOOL install_wine_mono(void) return FALSE; } - pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + pMsiEnumRelatedProductsA = (void*)GetProcAddress(hmsi, "MsiEnumRelatedProductsA"); - buffer_size = sizeof(versionstringbuf); + res = pMsiEnumRelatedProductsA(mono_upgrade_code, 0, 0, productcodebuf); - res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + if (res == ERROR_SUCCESS) + { + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(productcodebuf, "VersionString", versionstringbuf, &buffer_size); + } + else if (res != ERROR_NO_MORE_ITEMS) + { + ERR("MsiEnumRelatedProducts failed, err=%u\n", res); + } FreeLibrary(hmsi);

1 0

Hans Leidekker : webservices: Avoid a warning from HeapDestroy.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 5b835e75d95a8ca977615b0d4d3c19cf74901b75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b835e75d95a8ca977615b0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:44 2018 +0200 webservices: Avoid a warning from HeapDestroy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab2f25d40c4e72b8f156af43e615c028bd268db4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 080cc0d..b4f94af 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -215,7 +215,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR static void reset_heap( struct heap *heap ) { - HeapDestroy( heap->handle ); + if (heap->handle) HeapDestroy( heap->handle ); heap->handle = NULL; heap->max_size = heap->allocated = 0; }

1 0

Fabian Maurer : wrc: Don' t crash when parsing COMBOBOX element without style.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 56cc1b8af24488d9a7a972f0b6d234a9ec23cd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56cc1b8af24488d9a7a972f0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jul 20 17:33:12 2018 +0200 wrc: Don't crash when parsing COMBOBOX element without style. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0dfdbcf7b07d5f456a4669cf215f77135484e47) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wrc/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 0f73f90..8196e9f 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control defaultstyle |= LBS_NOTIFY | WS_BORDER; break; case CT_COMBOBOX: - if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) + if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) defaultstyle |= CBS_SIMPLE; break; case CT_STATIC:

1 0

Alex Henrie : gdi32: Fix memory leak on error in PATH_WidenPath (Coverity) .
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 47911f80251b002e2fd3f76fc1248cdb3f2e7531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47911f80251b002e2fd3f76f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 1 07:15:44 2018 -0600 gdi32: Fix memory leak on error in PATH_WidenPath (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c57461d299620f2e0fa3b9f02bdbe910de41e75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 51334b2..04fa678 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } }

1 0