wine/dlls/advpack/tests advpack.c

[Alexandre Julliard]

ChangeSet ID:	21387
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/22 05:58:25

Modified files:
	dlls/advpack/tests: advpack.c 

Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	Exit test after first TranslateInfString() failure, which seems to be
	NT3.51 specific.

Patch: http://cvs.winehq.org/patch.py?id=21387

Old revision  New revision  Changes     Path
 1.8           1.9           +9 -2       wine/dlls/advpack/tests/advpack.c

Index: wine/dlls/advpack/tests/advpack.c
diff -u -p wine/dlls/advpack/tests/advpack.c:1.8 wine/dlls/advpack/tests/advpack.c:1.9
--- wine/dlls/advpack/tests/advpack.c:1.8	22 Nov 2005 11:58:25 -0000
+++ wine/dlls/advpack/tests/advpack.c	22 Nov 2005 11:58:25 -0000
@@ -183,8 +183,15 @@ static void translateinfstring_test()
     /* try to open an inf file that doesn't exist */
     hr = pTranslateInfString("c:\\a.inf", "Options.NTx86", "Options.NTx86",
                              "InstallDir", buffer, MAX_PATH, &dwSize, NULL);
-    ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == E_INVALIDARG, 
-       "Expected 0x80070002 or E_INVALIDARG, got 0x%08x\n", (UINT)hr);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == E_INVALIDARG || 
+       hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND), 
+       "Expected E_INVALIDARG, 0x80070002 or 0x8007007e, got 0x%08x\n", (UINT)hr);
+
+    if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND))
+    {
+        trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()");
+        return;
+    }
 
     /* try a nonexistent section */
     buffer[0] = 0;