=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: shlwapi/tests: Fix two tests on win8 .

Alexandre Julliard julliard at winehq.org
Tue Dec 11 14:41:14 CST 2012


Module: wine
Branch: master
Commit: b74b8776c02f54e50748e74a9267a6edef2c05e0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b74b8776c02f54e50748e74a9267a6edef2c05e0

Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Dec 10 23:37:13 2012 +0100

shlwapi/tests: Fix two tests on win8.

---

 dlls/shlwapi/tests/assoc.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c
index a6f5e2d..389a9f5 100644
--- a/dlls/shlwapi/tests/assoc.c
+++ b/dlls/shlwapi/tests/assoc.c
@@ -78,7 +78,8 @@ 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_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ ||
+       hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */
        "Unexpected result : %08x\n", hr);
     hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL,
                            &len);
@@ -133,7 +134,8 @@ static void test_getstring_basic(void)
     hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL,
                            &len);
     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);
     if (hr != S_FALSE)
     {




More information about the wine-cvs mailing list