Misha Koshelev : msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as
native.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 5 05:48:14 CDT 2007
Module: wine
Branch: master
Commit: 8b2d0d3e34b49cfe64bf1b72847234cb7a448979
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2d0d3e34b49cfe64bf1b72847234cb7a448979
Author: Misha Koshelev <mk144210 at bcm.edu>
Date: Mon Jun 4 09:25:47 2007 -0500
msi: suminfo: Return ERROR_UNKNOWN_PROPERTY as native.
---
dlls/msi/suminfo.c | 12 ++++++------
dlls/msi/tests/suminfo.c | 14 +++++---------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index f7f5787..c9344c8 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -529,16 +529,16 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType,
TRACE("%ld %d %p %p %p %p %p\n", handle, uiProperty, puiDataType,
piValue, pftValue, str, pcchValueBuf);
- si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
- if( !si )
- return ERROR_INVALID_HANDLE;
-
if ( uiProperty >= MSI_MAX_PROPS )
{
- *puiDataType = VT_EMPTY;
- return ret;
+ if (puiDataType) *puiDataType = VT_EMPTY;
+ return ERROR_UNKNOWN_PROPERTY;
}
+ si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO );
+ if( !si )
+ return ERROR_INVALID_HANDLE;
+
prop = &si->property[uiProperty];
if( puiDataType )
diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c
index fbd5081..a254b56 100644
--- a/dlls/msi/tests/suminfo.c
+++ b/dlls/msi/tests/suminfo.c
@@ -99,15 +99,11 @@ static void test_suminfo(void)
r = MsiSummaryInfoGetProperty(hsuminfo, 0, NULL, NULL, NULL, 0, NULL);
ok(r == ERROR_SUCCESS, "getpropcount failed\n");
- /* Page faults in wine */
- if (0)
- {
- r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL);
- ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
-
- r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL);
- ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
- }
+ r = MsiSummaryInfoGetProperty(hsuminfo, -1, NULL, NULL, NULL, 0, NULL);
+ ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
+
+ r = MsiSummaryInfoGetProperty(hsuminfo, PID_SECURITY+1, NULL, NULL, NULL, 0, NULL);
+ ok(r == ERROR_UNKNOWN_PROPERTY, "MsiSummaryInfoGetProperty wrong error\n");
type = -1;
r = MsiSummaryInfoGetProperty(hsuminfo, 0, &type, NULL, NULL, 0, NULL);
More information about the wine-cvs
mailing list