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

Zhiyi Zhang : comctl32/tests: Test button styles.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 1711a1cf5eb657342357c43007bb659c1da42eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1711a1cf5eb657342357c430… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:47 2020 +0800 comctl32/tests: Test button styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 01fbe206174c0113f947ba24129e88365de7d643) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/button.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 14071b2ecd..933db6e982 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2276,6 +2276,41 @@ static void test_bcm_get_ideal_size(void) DeleteObject(hfont); } +static void test_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + if (i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + expected_type = (i & ~BS_DEFPUSHBUTTON) | j; + else + expected_type = j; + + todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + ok(type == expected_type || broken(type == j), /* XP */ + "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -2298,6 +2333,7 @@ START_TEST(button) test_get_set_textmargin(); test_state(); test_bcm_get_ideal_size(); + test_style(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Zhiyi Zhang : comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: fb54d2a7e23d33b0919bb2667ebad26b5304f7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb54d2a7e23d33b0919bb266… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:58 2020 +0800 comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links. For Split Buttons and Command Links of common control version 6, setting BS_PUSHBUTTON and BS_DEFPUSHBUTTON style toggles their default bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47621 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 463482a8295fad657b7fa22ea145551f63547238) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 12 +++++++++--- dlls/comctl32/tests/button.c | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b615df4a16..4f7a3052b1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -847,8 +847,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case BM_SETSTYLE: - btn_type = wParam & BS_TYPEMASK; - style = (style & ~BS_TYPEMASK) | btn_type; + { + DWORD new_btn_type; + + new_btn_type= wParam & BS_TYPEMASK; + if (btn_type >= BS_SPLITBUTTON && new_btn_type <= BS_DEFPUSHBUTTON) + new_btn_type = (btn_type & ~BS_DEFPUSHBUTTON) | new_btn_type; + + style = (style & ~BS_TYPEMASK) | new_btn_type; SetWindowLongW( hWnd, GWL_STYLE, style ); /* Only redraw if lParam flag is set.*/ @@ -856,7 +862,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L InvalidateRect( hWnd, NULL, TRUE ); break; - + } case BM_CLICK: SendMessageW( hWnd, WM_LBUTTONDOWN, 0, 0 ); SendMessageW( hWnd, WM_LBUTTONUP, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 933db6e982..716850073f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2303,7 +2303,6 @@ static void test_style(void) else expected_type = j; - todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) ok(type == expected_type || broken(type == j), /* XP */ "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); }

1 0

Damjan Jovanovic : mshtml: Fix handling res protocol resource type ids without leading '#'.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 90aaf103ac8a41f9c34527fad31ab3fbf983a386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90aaf103ac8a41f9c34527fa… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:27 2020 +0200 mshtml: Fix handling res protocol resource type ids without leading '#'. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f9da9675f001ab5731212e8bd2b9d17c19adb16c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/protocol.c | 5 +++++ dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 0f06896c49..8677030c35 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -585,7 +585,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, *res_type++ = 0; if ((url_file = wcschr(res_type, '/'))) { + DWORD res_type_id; + WCHAR *endpoint; *url_file++ = 0; + res_type_id = wcstol(res_type, &endpoint, 10); + if(!*endpoint) + res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; res_type = (LPWSTR)RT_HTML; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 8f37d09c55..00ac8fdda4 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -596,6 +596,13 @@ static void test_res_protocol(void) IUnknown_Release(unk); + test_res_url("/blank.html"); + test_res_url("/123"); + test_res_url("/#23/blank.html"); + test_res_url("/#23/123"); + test_res_url("/23/blank.html"); + test_res_url("/23/123"); + test_res_url("/jstest.html"); test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html");

1 0

Damjan Jovanovic : mshtml: Support implicit RT_FILE resource type in res protocol.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 2e9c0a386545738e76dfcd781aecdb08f7ced82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9c0a386545738e76dfcd78… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Apr 24 18:37:44 2020 +0200 mshtml: Support implicit RT_FILE resource type in res protocol. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e8bca0eb4f3f2c9b3bbf9fc634242512f8759b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/protocol.c | 13 +++++++++---- dlls/mshtml/tests/protocol.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 8677030c35..a311d648f2 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -539,7 +539,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, HANDLE_PTR dwReserved) { InternetProtocol *This = impl_from_IInternetProtocol(iface); - WCHAR *url_dll, *url_file, *url, *mime, *res_type = (LPWSTR)RT_HTML, *ptr; + WCHAR *url_dll, *url_file, *url, *mime, *res_type, *alt_res_type = NULL, *ptr; DWORD grfBINDF = 0, len; BINDINFO bindinfo; HMODULE hdll; @@ -593,7 +593,8 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, res_type = MAKEINTRESOURCEW(res_type_id); }else { url_file = res_type; - res_type = (LPWSTR)RT_HTML; + res_type = MAKEINTRESOURCEW(RT_HTML); + alt_res_type = MAKEINTRESOURCEW(2110 /* RT_FILE */); } /* Ignore query and hash parts. */ @@ -613,12 +614,16 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); src = FindResourceW(hdll, url_file, res_type); + if(!src && alt_res_type) + src = FindResourceW(hdll, url_file, alt_res_type); if(!src) { LPWSTR endpoint = NULL; DWORD file_id = wcstol(url_file, &endpoint, 10); - if(endpoint == url_file+lstrlenW(url_file)) + if(!*endpoint) { src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); - + if(!src && alt_res_type) + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), alt_res_type); + } if(!src) { WARN("Could not find resource\n"); IInternetProtocolSink_ReportResult(pOIProtSink, diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 00ac8fdda4..0a28601b24 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -262,6 +262,30 @@ static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) CHECK_CALLED(ReportResult); } +static void test_res_url_fail(const WCHAR *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + HRESULT hres; + + wcscpy(url, res_url_base); + wcscat(url, url_suffix); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + expect_hr_win32err = TRUE; + hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); + ok(HRESULT_FACILITY(hres) == FACILITY_WIN32, + "%s: expected win32 error, got: %08x\n", debugstr_w(url_suffix), hres); + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportResult); + + IInternetProtocol_Release(protocol); +} + static void test_res_url(const char *url_suffix) { WCHAR url[INTERNET_MAX_URL_LENGTH]; @@ -604,6 +628,14 @@ static void test_res_protocol(void) test_res_url("/23/123"); test_res_url("/jstest.html"); + test_res_url("/jstest-rtfile.html"); + test_res_url("/#2110/jstest-rtfile.html"); + test_res_url("/2110/jstest-rtfile.html"); + + test_res_url_fail(L"/doesntexist/jstest-rtfile.html"); + test_res_url_fail(L"/2/jstest-rtfile.html"); + test_res_url_fail(L"/23/jstest-rtfile.html"); /* no fallback from explicit RT_HTML */ + test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 05bc836ac6..12e95b7456 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -28,6 +28,9 @@ asyncscriptload.js HTML "asyncscriptload.js" /* @makedep: jstest.html */ jstest.html HTML "jstest.html" +/* @makedep: jstest.html */ +jstest-rtfile.html 2110 "jstest.html" + /* @makedep: vbtest.html */ vbtest.html HTML "vbtest.html"

1 0

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

07 Aug '20

Module: wine Branch: stable Commit: 749d86ca7d21ab48e16301336e199b593ea241b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749d86ca7d21ab48e1630133… 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> (cherry picked from commit b1e91a36a75fd8ae27a999248aa034e69227bc02) Signed-off-by: Michael Stefaniuc <mstefani(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 43c4d9efef..8911a597eb 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 5cad22b7ee..f6c770c9b8 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

Nikolay Sivov : comctl32/listview: Only apply horizontal offset when setting header position.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 11865bb71b6342f76bd249f55aa44fd5607d9096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11865bb71b6342f76bd249f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 24 11:43:39 2020 +0300 comctl32/listview: Only apply horizontal offset when setting header position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d92906249fd4abd75d5d2ee2fba966855fac2e4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dd25908db..f1f09d201e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11086,7 +11086,6 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) rect = infoPtr->rcList; rect.left += origin.x; - rect.top += origin.y; hl.prc = &rect; hl.pwpos = &wp;

1 0

Mas Ahmad Muhammad : comdlg32: Enlarge list area in CHOOSE_FONT window.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 8b5268acf84c08dfd404ad45faac18fb6b225590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b5268acf84c08dfd404ad45… Author: Mas Ahmad Muhammad <m.charly81(a)gmail.com> Date: Mon Apr 27 17:51:21 2020 +0700 comdlg32: Enlarge list area in CHOOSE_FONT window. Signed-off-by: Mas Ahmad Muhammad <m.charly81(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf8a6eb2769d2c4ba5bb837d29db89f6b88706ae) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index a1689f4abe..a5d09faa56 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -245,34 +245,34 @@ FONT 8, "MS Shell Dlg" } -CHOOSE_FONT DIALOG 13, 54, 274, 147 +CHOOSE_FONT DIALOG 13, 54, 274, 169 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Font" FONT 8, "MS Shell Dlg" { LTEXT "&Font:",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb1, 6,13,94,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "Font St&yle:",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb2,108,13,64,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "&Size:",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb3,179,13,32,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Apply", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Effects",grp1,6,72,84,36,WS_GROUP - CHECKBOX "Stri&keout", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Underline", chx2, 10,94,78,10, BS_AUTOCHECKBOX - LTEXT "&Color:", stc4 ,6,114,80,9 - COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + GROUPBOX "Effects",grp1,6,92,84,36,WS_GROUP + CHECKBOX "Stri&keout", chx1, 10,102,78,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Underline", chx2, 10,114,78,10, BS_AUTOCHECKBOX + LTEXT "&Color:", stc4 ,6,134,80,9 + COMBOBOX cmb4,6,144,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + GROUPBOX "Sample",grp2,98,92,120,36,WS_GROUP + CTEXT "",stc5,103,101,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Scr&ipt:",stc7 ,98,134,40,9 + COMBOBOX cmb5,98,144,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP }

1 0

Damjan Jovanovic : shell32: Pass the executable's full path from SHELL_execute() to CreateProcess().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: b01a3d1da6a601479a315b418de2665cfaa5d724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01a3d1da6a601479a315b41… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Mar 22 13:46:23 2020 +0200 shell32: Pass the executable's full path from SHELL_execute() to CreateProcess(). Several older Microsoft installers, particularly those changing CDs during installation, break because they launch a child setup.exe, from a parent process also called setup.exe, which Wine finds in the wrong directory, as CreateProcess() first searches the parent executable's own directory, thus re-launching the parent itself instead of the child. Therefore CreateProcess() must be passed a full path from SHELL_execute(), so it launches the correct child. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8439 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9736fe499d0887bf92652ca32ba5195e7b0b0e9c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlexec.c | 8 ++++++++ dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d3ff821135..ce0b8f6d2b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1807,6 +1807,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; strcpyW(wcmd, wszApplicationName); + if (sei_tmp.lpDirectory) + { + LPCWSTR searchPath[] = { + sei_tmp.lpDirectory, + NULL + }; + PathFindOnPathW(wcmd, searchPath); + } retval = SHELL_quote_and_execute( wcmd, wszParameters, wszEmpty, wszApplicationName, NULL, &sei_tmp, sei, execfunc ); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f881e96b6e..3f67a79960 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2842,7 +2842,7 @@ static void test_directory(void) NULL, "test2.exe", params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2855,7 +2855,7 @@ static void test_directory(void) NULL, "test2.exe", params, "%TMPDIR%", NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); @@ -2872,9 +2872,9 @@ static void test_directory(void) NULL, strrchr(argv0, '\\') + 1, params, tmpdir, NULL); okShell(rc > 32, "returned %lu\n", rc); okChildInt("argcA", 4); - todo_wine okChildString("argvA0", path); + okChildString("argvA0", path); okChildString("argvA3", "Exec"); - todo_wine okChildPath("longPath", path); + okChildPath("longPath", path); DeleteFileA(path); }

1 0

Alex Henrie : mmdevapi: Report 100% volume in GetMasterVolumeLevelScalar stub.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 7d08c5781f5923c44d489254ff8811ea00e9230b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d08c5781f5923c44d489254… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 22 00:46:11 2020 -0600 mmdevapi: Report 100% volume in GetMasterVolumeLevelScalar stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31890 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3ea35e7ea1fce242d9242febe137de36add55ebb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 24d210a1c8..9214980120 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -159,7 +159,8 @@ static HRESULT WINAPI AEV_GetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *ifa if (!level) return E_POINTER; FIXME("stub\n"); - return E_NOTIMPL; + *level = 1.0; + return S_OK; } static HRESULT WINAPI AEV_SetChannelVolumeLevel(IAudioEndpointVolumeEx *iface, UINT chan, float leveldb, const GUID *ctx)

1 0

Ilia Mirkin : crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 2aa21a3be5e758dd6d66d0dc3e7b34a67a607b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa21a3be5e758dd6d66d0dc… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Thu Jan 23 20:01:24 2020 -0500 crypt32: Also check CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG. It appears that the untrusted root check should be skipped if this flag is set even if the ExtraPolicyPara one is not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48495 Signed-off-by: Ilia Mirkin <imirkin(a)alum.mit.edu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5011815d6236c14769c28c2391ac9fd2bfd82c7e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/chain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 396a563c04..935fd6e344 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3455,10 +3455,13 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { HTTPSPolicyCallbackData *sslPara = NULL; - DWORD checks = 0; + DWORD checks = 0, baseChecks = 0; if (pPolicyPara) + { + baseChecks = pPolicyPara->dwFlags; sslPara = pPolicyPara->pvExtraPolicyPara; + } if (TRACE_ON(chain)) dump_ssl_extra_chain_policy_para(sslPara); if (sslPara && sslPara->u.cbSize >= sizeof(HTTPSPolicyCallbackData)) @@ -3474,7 +3477,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT && - !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + !(checks & SECURITY_FLAG_IGNORE_UNKNOWN_CA) && + !(baseChecks & CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG)) { pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; find_element_with_error(pChainContext,

1 0