James Hawkins : msi: Return ERROR_UNKNOWN_PATCH if dwOptions contains MSICODE_PATCH.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 08:05:17 CST 2008
Module: wine
Branch: master
Commit: d37ac289db2b43c515d2694a06f52a08ccff0c82
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37ac289db2b43c515d2694a06f52a08ccff0c82
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Tue Feb 19 02:08:55 2008 -0600
msi: Return ERROR_UNKNOWN_PATCH if dwOptions contains MSICODE_PATCH.
---
dlls/msi/source.c | 2 +-
dlls/msi/tests/source.c | 15 ++++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/source.c b/dlls/msi/source.c
index 887c702..f129c5f 100644
--- a/dlls/msi/source.c
+++ b/dlls/msi/source.c
@@ -413,7 +413,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
if (dwOptions & MSICODE_PATCH)
{
FIXME("Unhandled options MSICODE_PATCH\n");
- return ERROR_FUNCTION_FAILED;
+ return ERROR_UNKNOWN_PATCH;
}
if (szUserSid)
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index 90d4b0c..f25b476 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -1452,23 +1452,16 @@ static void test_MsiSourceListSetInfo(void)
r = MsiSourceListSetInfoA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PATCH,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path");
- todo_wine
- {
- ok(r == ERROR_UNKNOWN_PATCH,
- "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
- }
+ ok(r == ERROR_UNKNOWN_PATCH,
+ "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
/* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */
r = MsiSourceListSetInfoA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path");
- todo_wine
- {
- ok(r == ERROR_UNKNOWN_PATCH,
- "Expected ERROR_SUCCESS, got %d\n", r);
- }
-
+ ok(r == ERROR_UNKNOWN_PATCH,
+ "Expected ERROR_SUCCESS, got %d\n", r);
/* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */
r = MsiSourceListSetInfoA(prodcode, NULL,
MSIINSTALLCONTEXT_USERUNMANAGED,
More information about the wine-cvs
mailing list