Module: wine Branch: master Commit: 757e617ec2bdfc7f8351fbedc3e4c78d58278a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=757e617ec2bdfc7f8351fbedc3...
Author: Misha Koshelev mk144210@bcm.edu Date: Mon May 7 17:49:17 2007 -0500
msi: automation: Use proper parameter names.
This fixes the parameter names to match native as they are required by some scripting languages and by the exceptions that are thrown.
---
dlls/msi/msiserver.idl | 30 +++++++++++++++--------------- dlls/msi/tests/automation.c | 5 +---- 2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 09ea7c7..7b14feb 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -45,8 +45,8 @@ library WindowsInstaller methods: [id(DISPID_INSTALLER_OPENPACKAGE)] Session* OpenPackage( - [in] VARIANT Path, - [in, optional, defaultvalue(0)] long OptionalOption); + [in] VARIANT PackagePath, + [in, optional, defaultvalue(0)] long Options); }
[ uuid(000C1093-0000-0000-C000-000000000046) ] @@ -55,10 +55,10 @@ library WindowsInstaller properties: methods: [id(DISPID_RECORD_STRINGDATA), propget] - BSTR StringData([in] long FieldNumber); + BSTR StringData([in] long Field); [id(DISPID_RECORD_STRINGDATA), propput] void StringData( - [in] long FieldNumber, + [in] long Field, [in] BSTR rhs); }
@@ -96,7 +96,7 @@ library WindowsInstaller properties: methods: [id(DISPID_VIEW_EXECUTE)] - void Execute([in, optional, defaultvalue(0)] Record *OptionalRecord); + void Execute([in, optional, defaultvalue(0)] Record *Params); [id(DISPID_VIEW_FETCH)] Record* Fetch(); [id(DISPID_VIEW_CLOSE)] @@ -109,7 +109,7 @@ library WindowsInstaller properties: methods: [id(DISPID_DATABASE_OPENVIEW)] - View* OpenView([in] BSTR QueryString); + View* OpenView([in] BSTR Sql); }
typedef enum { @@ -166,33 +166,33 @@ library WindowsInstaller [id(DISPID_SESSION_INSTALLER), propget] Installer *Installer(); [id(DISPID_SESSION_PROPERTY), propget] - BSTR Property([in] BSTR PropertyName); + BSTR Property([in] BSTR Name); [id(DISPID_SESSION_PROPERTY), propput] void Property( - [in] BSTR PropertyName, + [in] BSTR Name, [in] BSTR rhs); [id(DISPID_SESSION_LANGUAGE), propget] long Language(); [id(DISPID_SESSION_MODE), propget] - VARIANT_BOOL Mode([in] MsiRunMode runMode); + VARIANT_BOOL Mode([in] MsiRunMode Flag); [id(DISPID_SESSION_MODE), propput] void Mode( - [in] MsiRunMode runMode, + [in] MsiRunMode Flag, [in] VARIANT_BOOL rhs); [id(DISPID_SESSION_DATABASE), propget] Database* Database(); [id(DISPID_SESSION_DOACTION)] - MsiDoActionStatus DoAction([in] BSTR ActionString); + MsiDoActionStatus DoAction([in] BSTR Action); [id(DISPID_SESSION_FEATURECURRENTSTATE), propget] - MsiInstallState FeatureCurrentState([in] BSTR FeatureName); + MsiInstallState FeatureCurrentState([in] BSTR Feature); [id(DISPID_SESSION_FEATUREREQUESTSTATE), propget] - MsiInstallState FeatureRequestState([in] BSTR FeatureName); + MsiInstallState FeatureRequestState([in] BSTR Feature); [id(DISPID_SESSION_FEATUREREQUESTSTATE), propput] void FeatureRequestState( - [in] BSTR FeatureName, + [in] BSTR Feature, [in] MsiInstallState rhs); [id(DISPID_SESSION_SETINSTALLLEVEL)] - void SetInstallLevel([in] long InstallLevel); + void SetInstallLevel([in] long Level); }
[ uuid(000C109F-0000-0000-C000-000000000046) ] diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 91e7b9a..d51b824 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -298,10 +298,7 @@ static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0 len = WideCharToMultiByte(CP_ACP, 0, szDescription, -1, string2, MAX_PATH, NULL, NULL); \ ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ \ - todo_wine { \ - /* Our parameter names are different so the descriptions will not match */ \ - ok(0, "Exception description was "%s" but expected to be "%s"\n", string1, string2); \ - } \ + ok(0, "Exception description was "%s" but expected to be "%s"\n", string1, string2); \ } \ }