January 2018 - Wine-Devel - list.winehq.org

[PATCH] msi: Remove redundant comparison.
by Andrey Gusev Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msi/appsearch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index bb492f464f..693da18355 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -506,7 +506,7 @@ static LPWSTR get_ini_field(LPWSTR buf, int field) while ((end = strchrW(beg, ',')) && i < field) { beg = end + 1; - while (*beg && *beg == ' ') + while (*beg == ' ') beg++; i++; -- 2.13.6

2 1

[PATCH] schtasks: Make /change argument case insensitive.
by Jacek Caban Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 2 +- programs/schtasks/tests/schtasks.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] winhlp32: Remove redundant comparison.
by Andrey Gusev Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/winhlp32/winhelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 070803482b..2ac3d2ff24 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1666,7 +1666,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) option = *cmdline; if (option) cmdline++; - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; switch (option) { case 'i': -- 2.13.6

1 0

[PATCH] cmd: Remove redundant comparison.
by Andrey Gusev Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0609bb7f3f..14961d7922 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2173,7 +2173,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } /* Ensure line continues with variable */ - if (!*thisArg || *thisArg != '%') { + if (*thisArg != '%') { WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } -- 2.13.6

1 0

[PATCH] kernel32: Remove redundant comparison.
by Andrey Gusev Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 057b7338fc..ecadd435d4 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -560,7 +560,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, ++format; } /* Only numeric day form matters */ - if (*format && *format == 'd') + if (*format == 'd') { INT dcount = 1; while (*++format == 'd') dcount++; -- 2.13.6

1 0

[PATCH] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Jacek Caban Jan. 9, 2018

Jan. 9, 2018

From: Wei Xie <xiewei(a)deepin.com> Signed-off-by: Wei xie <xiewei(a)linuxdeepin.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- My changes: - don't test last error on success - fixed cert chain leak in tests - don't duplicate cert chain if we know that it's not needed dlls/wininet/internet.c | 15 ++++++++------- dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-)

2 1

Re: [PATCH 1/1] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW
by Wei Xie Jan. 9, 2018

Jan. 9, 2018

Because last error not set as 0 in vista and w2008, but others do it. If set last error as 0xdeadbeef in these two tests, the test will failed https://testbot.winehq.org/JobDetails.pl?Key=35144 ------------------ Original ------------------ From: "Jactry Zeng"<jactry92(a)gmail.com>; Date: Tue, Jan 9, 2018 04:28 PM To: "Wei Xie"<xiewei(a)deepin.com>; Cc: "wine-devel"<wine-devel(a)winehq.org>; Subject: Re: [PATCH 1/1] wininet/test: Check null pointer in InternetGetSecurityInfoByURLW Hi Wei, Thanks for contribution! I have a question about the tests: + + SetLastError(0); + res = pInternetGetSecurityInfoByURLA(url, &chain, NULL); + ok_(__FILE__,line)(res && GetLastError() == 0, + "InternetGetSecurityInfoByURLA failed returned: %x(%u), expected success\n", res, GetLastError()); + + SetLastError(0); + res = pInternetGetSecurityInfoByURLA(url, NULL, &flags); + ok_(__FILE__,line)(res && GetLastError() == 0, + "InternetGetSecurityInfoByURLA failed returned: %x(%u), expected success\n", res, GetLastError()); }else { Why not set last error as 0xdeadbeef in these two tests? 2018-01-08 15:57 GMT+08:00 Wei Xie <xiewei(a)deepin.com>: -- Regards, Jactry Zeng

1 0

[PATCH] shell32/tests: Drop progman DDE test workarounds for Windows <= 2000
by Alex Henrie Jan. 9, 2018

Jan. 9, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- We don't need them anymore, and Coverity is complaining about them. dlls/shell32/tests/progman_dde.c | 46 +++------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0bb4960ae1..62ed413ad0 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -35,8 +35,6 @@ #include "shlobj.h" static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); static void init_function_pointers(void) { @@ -44,10 +42,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName"); - pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); - pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); - if (!pReadCabinetState) - pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651); } static BOOL use_common(void) @@ -88,21 +82,7 @@ static BOOL full_title(void) CABINETSTATE cs; memset(&cs, 0, sizeof(cs)); - if (pReadCabinetState) - { - pReadCabinetState(&cs, sizeof(cs)); - } - else - { - HKEY key; - DWORD size; - - win_skip("ReadCabinetState is not available, reading registry directly\n"); - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); - size = sizeof(cs); - RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size); - RegCloseKey(key); - } + ReadCabinetState(&cs, sizeof(cs)); return (cs.fFullPathTitle == -1); } @@ -114,28 +94,8 @@ static void init_strings(void) char commonprograms[MAX_PATH]; char programs[MAX_PATH]; - if (pSHGetSpecialFolderPathA) - { - pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); - pSHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); - } - else - { - HKEY key; - DWORD size; - - /* Older Win9x and NT4 */ - - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(programs); - RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&programs, &size); - RegCloseKey(key); - - RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(commonprograms); - RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); - RegCloseKey(key); - } + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or -- 2.15.1

1 0

[PATCH] jscript/tests: Test for script object creation failure (Coverity)
by Nikolay Sivov Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/jscript/tests/run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index bd5e341545..887b264d8f 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2147,6 +2147,8 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * HRESULT hres; engine = create_script(); + if(!engine) + return E_FAIL; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -2191,6 +2193,8 @@ static void test_retval(void) HRESULT hres; engine = create_script(); + if(!engine) + return; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); -- 2.15.1

2 1

[v2 PATCH] mshtml/tests: Skip some tests if native XMLHTTP support is missing or disabled
by Nikolay Sivov Jan. 8, 2018

Jan. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: with improvements Jacek suggested dlls/mshtml/tests/dom.c | 7 ++++++- dlls/mshtml/tests/jstest.html | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b00346759f..2a4ae625bb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6683,7 +6683,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); - ok(V_VT(&var) == VT_DISPATCH, "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); + + if (V_VT(&var) == VT_EMPTY) { + win_skip("Native XMLHTTP support is missing or disabled.\n"); + return; + } factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index cce805032c..164593ee0d 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -1,10 +1,9 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> -function ok(b,m) { - return external.ok(b, m); -} - function broken(expr) { return external.broken(expr); } @@ -356,7 +355,11 @@ function test_text_node() { function test_xhr() { ok("XMLHttpRequest" in window, "XMLHttpRequest not found in window object\n"); - ok(typeof(XMLHttpRequest) === "object", "typeof(XMLHttpRequest) = " + typeof(XMLHttpRequest)); + + if (typeof(XMLHttpRequest) != "object") { + win_skip("XMLHTTPRequest is not available or disabled"); + return; + } var xhr = new XMLHttpRequest(); ok(typeof(xhr) === "object", "typeof(xhr) = " + typeof(xhr)); -- 2.15.1

2 1