shlwapi/tests: Fix a test failure on Windows 10.

AssocQueryString() can return S_FALSE with the size of the required buffer. Signed-off-by: Francois Gouget <fgouget@free.fr> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shlwapi/tests: Fix a test failure on Windows 10.
637799db · Francois Gouget · Alexandre Julliard · cecc496e · 637799db
Commit 637799db authored Mar 17, 2016 by Francois Gouget Committed by Alexandre Julliard Mar 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

assoc.c dlls/shlwapi/tests/assoc.c +4 -2

No files found.
--- a/dlls/shlwapi/tests/assoc.c
+++ b/dlls/shlwapi/tests/assoc.c
@@ -102,9 +102,11 @@ static void test_getstring_bad(void)
    hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len);
    ok(hr == E_FAIL ||
       hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ ||
-       hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */
+       hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ ||
+       hr == S_FALSE, /* Win10 */
       "Unexpected result : %08x\n", hr);
-    ok(len == 0xdeadbeef, "got %u\n", len);
+    ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len == 0xdeadbeef,
+       "got hr=%08x and len=%u\n", hr, len);

    len = 0xdeadbeef;
    hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len);