James Hawkins : advpack: Fix a few failing tests in win95.
Alexandre Julliard
julliard at winehq.org
Mon Apr 21 07:46:10 CDT 2008
Module: wine
Branch: master
Commit: b08f7fd80301f53443facf70db4e7aa5e1a63240
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08f7fd80301f53443facf70db4e7aa5e1a63240
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sat Apr 19 00:01:56 2008 -0500
advpack: Fix a few failing tests in win95.
---
dlls/advpack/tests/files.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c
index 0f82fa8..530c3b2 100644
--- a/dlls/advpack/tests/files.c
+++ b/dlls/advpack/tests/files.c
@@ -402,8 +402,10 @@ static void test_ExtractFiles(void)
/* extract all files in the cab to nonexistent destination directory */
hr = pExtractFiles("extract.cab", destFolder, 0, NULL, NULL, 0);
- ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND),
- "Expected %d, got %d\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr);
+ ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) ||
+ hr == E_FAIL, /* win95 */
+ "Expected %08x or %08x, got %08x\n", E_FAIL,
+ HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr);
ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n");
ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n");
ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n");
@@ -470,9 +472,19 @@ static void test_ExtractFiles(void)
static void test_AdvInstallFile(void)
{
HRESULT hr;
+ HMODULE hmod;
char CURR_DIR[MAX_PATH];
char destFolder[MAX_PATH];
+ hmod = LoadLibrary("setupapi.dll");
+ if (!hmod)
+ {
+ skip("setupapi.dll not present\n");
+ return;
+ }
+
+ FreeLibrary(hmod);
+
GetCurrentDirectoryA(MAX_PATH, CURR_DIR);
lstrcpyA(destFolder, CURR_DIR);
More information about the wine-cvs
mailing list