Skip to content

W
wine-cw
Commit b74b8776 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

shlwapi/tests: Fix two tests on win8.

parent 78984cf4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/shlwapi/tests/assoc.c
View file @ b74b8776
...@@ -78,7 +78,8 @@ static void test_getstring_bad(void) ...@@ -78,7 +78,8 @@ static void test_getstring_bad(void)
hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL,
&len); &len);
ok(hr == E_FAIL || ok(hr == E_FAIL ||
hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ ||
hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */
"Unexpected result : %08x\n", hr); "Unexpected result : %08x\n", hr);
hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL,
&len); &len);
...@@ -133,7 +134,8 @@ static void test_getstring_basic(void) ...@@ -133,7 +134,8 @@ static void test_getstring_basic(void)
hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL,
&len); &len);
ok(hr == S_FALSE || ok(hr == S_FALSE ||
hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), /* Win9x/NT4 */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win9x/NT4 */ ||
hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */
"Unexpected result : %08x\n", hr); "Unexpected result : %08x\n", hr);
if (hr != S_FALSE) if (hr != S_FALSE)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment