From 426cc7fe3f04cd25f02f4ff8dc26c4dd28d1a11c Mon Sep 17 00:00:00 2001 From: Saulius Krasuckas Date: Tue, 22 Nov 2005 11:58:25 +0000 Subject: [PATCH] Exit test after first TranslateInfString() failure, which seems to be NT3.51 specific. --- dlls/advpack/tests/advpack.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 24b7537e6f2..675b4b5fbed 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -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; -- 2.11.4.GIT