Nicolas Le Cam : msi/tests: Fix MsiApplyMultiplePatches tests on Windows.
Alexandre Julliard
julliard at winehq.org
Mon May 4 09:06:37 CDT 2009
Module: wine
Branch: master
Commit: 2f3767222591573da1a8b8058d0514828071a5d0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3767222591573da1a8b8058d0514828071a5d0
Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Fri May 1 23:46:27 2009 +0200
msi/tests: Fix MsiApplyMultiplePatches tests on Windows.
---
dlls/msi/tests/package.c | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 35a22de..82b7110 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -11535,7 +11535,7 @@ static void test_MsiSetProperty(void)
static void test_MsiApplyMultiplePatches(void)
{
- UINT r;
+ UINT r, type = GetDriveType(NULL);
r = MsiApplyMultiplePatchesA(NULL, NULL, NULL);
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
@@ -11544,19 +11544,51 @@ static void test_MsiApplyMultiplePatches(void)
ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r);
r = MsiApplyMultiplePatchesA(";", NULL, NULL);
- ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
+ todo_wine
+ {
+ if (type == DRIVE_FIXED)
+ ok(r == ERROR_PATH_NOT_FOUND,
+ "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
+ else
+ ok(r == ERROR_INVALID_NAME,
+ "Expected ERROR_INVALID_NAME, got %u\n", r);
+ }
r = MsiApplyMultiplePatchesA(" ;", NULL, NULL);
- ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
+ todo_wine
+ {
+ if (type == DRIVE_FIXED)
+ ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED,
+ "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r);
+ else
+ ok(r == ERROR_INVALID_NAME,
+ "Expected ERROR_INVALID_NAME, got %u\n", r);
+ }
r = MsiApplyMultiplePatchesA(";;", NULL, NULL);
- ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
+ todo_wine
+ {
+ if (type == DRIVE_FIXED)
+ ok(r == ERROR_PATH_NOT_FOUND,
+ "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
+ else
+ ok(r == ERROR_INVALID_NAME,
+ "Expected ERROR_INVALID_NAME, got %u\n", r);
+ }
r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL);
- ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r);
+ todo_wine
+ {
+ if (type == DRIVE_FIXED)
+ ok(r == ERROR_PATH_NOT_FOUND,
+ "Expected ERROR_PATH_NOT_FOUND, got %u\n", r);
+ else
+ ok(r == ERROR_INVALID_NAME,
+ "Expected ERROR_INVALID_NAME, got %u\n", r);
+ }
r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL);
todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);
More information about the wine-cvs
mailing list