James Hawkins : msi: Return the result of the call to OpenSourceKey.
Alexandre Julliard
julliard at winehq.org
Mon Feb 25 06:51:24 CST 2008
Module: wine
Branch: master
Commit: 08172ad1c49b2bf4314cd2a00e19a39c913942fd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=08172ad1c49b2bf4314cd2a00e19a39c913942fd
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sun Feb 24 20:08:14 2008 -0600
msi: Return the result of the call to OpenSourceKey.
---
dlls/msi/source.c | 2 +-
dlls/msi/tests/source.c | 21 ++++++---------------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/dlls/msi/source.c b/dlls/msi/source.c
index 3ffa5d8..ca4a8ea 100644
--- a/dlls/msi/source.c
+++ b/dlls/msi/source.c
@@ -1016,7 +1016,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE);
if (rc != ERROR_SUCCESS)
- return ERROR_UNKNOWN_PRODUCT;
+ return rc;
OpenMediaSubkey(sourcekey,&mediakey,TRUE);
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index d2e3b02..d4a1e3b 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -2024,11 +2024,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, 1, "label", "prompt");
- todo_wine
- {
- ok(r == ERROR_BAD_CONFIGURATION,
- "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
- }
+ ok(r == ERROR_BAD_CONFIGURATION,
+ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -2158,11 +2155,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, usersid,
MSIINSTALLCONTEXT_USERMANAGED,
MSICODE_PRODUCT, 1, "label", "prompt");
- todo_wine
- {
- ok(r == ERROR_BAD_CONFIGURATION,
- "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
- }
+ ok(r == ERROR_BAD_CONFIGURATION,
+ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(userkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@@ -2199,11 +2193,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, NULL,
MSIINSTALLCONTEXT_MACHINE,
MSICODE_PRODUCT, 1, "label", "prompt");
- todo_wine
- {
- ok(r == ERROR_BAD_CONFIGURATION,
- "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
- }
+ ok(r == ERROR_BAD_CONFIGURATION,
+ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
res = RegCreateKeyA(prodkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
More information about the wine-cvs
mailing list