James Hawkins : msi: MsiSetMode returns a UINT system error code, not a BOOL.
Alexandre Julliard
julliard at winehq.org
Fri Dec 4 09:11:27 CST 2009
Module: wine
Branch: master
Commit: 7d3e6643127b56549778784f7b57f62217fa95f6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3e6643127b56549778784f7b57f62217fa95f6
Author: James Hawkins <truiken at gmail.com>
Date: Thu Dec 3 21:11:49 2009 -0800
msi: MsiSetMode returns a UINT system error code, not a BOOL.
---
dlls/msi/install.c | 15 +++------------
dlls/msi/tests/automation.c | 4 ++--
include/msiquery.h | 2 +-
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index 1a535eb..b1d741a 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -717,19 +717,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
/***********************************************************************
* MsiSetMode (MSI.@)
*/
-BOOL WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
+UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
{
- switch (iRunMode)
- {
- case MSIRUNMODE_RESERVED11:
- case MSIRUNMODE_WINDOWS9X:
- case MSIRUNMODE_RESERVED14:
- case MSIRUNMODE_RESERVED15:
- return FALSE;
- default:
- FIXME("%d %d %d\n", hInstall, iRunMode, fState);
- }
- return TRUE;
+ FIXME("%d %d %d\n", hInstall, iRunMode, fState);
+ return ERROR_SUCCESS;
}
/***********************************************************************
diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 29a7cd2..b792fa7 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -1713,12 +1713,12 @@ static void test_Session(IDispatch *pSession)
/* Session::Mode, put */
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE);
- todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool);
ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr);
ok(bool, "Reboot at end session mode is %d, expected 1\n", bool);
hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */
- todo_wine ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
+ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr);
/* Session::Database, get */
hr = Session_Database(pSession, &pDatabase);
diff --git a/include/msiquery.h b/include/msiquery.h
index 6a1bfa4..2ea8320 100644
--- a/include/msiquery.h
+++ b/include/msiquery.h
@@ -301,7 +301,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT);
UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*);
BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE);
-BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL);
+UINT WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL);
UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);
More information about the wine-cvs
mailing list