ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advpack: Fix a few failing tests in win95.

This commit is contained in:
James Hawkins 2008-04-19 00:01:56 -05:00 committed by Alexandre Julliard
parent 9f859b4519
commit b08f7fd803
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/advpack/tests/files.c
View File

@ -402,8 +402,10 @@ static void test_ExtractFiles(void)
/* extract all files in the cab to nonexistent destination directory */ /* extract all files in the cab to nonexistent destination directory */
hr = pExtractFiles("extract.cab", destFolder, 0, NULL, NULL, 0); hr = pExtractFiles("extract.cab", destFolder, 0, NULL, NULL, 0);
ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) ||
"Expected %d, got %d\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); 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\\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(!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"); 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) static void test_AdvInstallFile(void)
{ {
HRESULT hr; HRESULT hr;
HMODULE hmod;
char CURR_DIR[MAX_PATH]; char CURR_DIR[MAX_PATH];
char destFolder[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); GetCurrentDirectoryA(MAX_PATH, CURR_DIR);
lstrcpyA(destFolder, CURR_DIR); lstrcpyA(destFolder, CURR_DIR);