Hans Leidekker : msi: Remove a workaround for missing Windows Script interfaces.
Alexandre Julliard
julliard at winehq.org
Tue May 1 13:12:13 CDT 2012
Module: wine
Branch: master
Commit: 52738e4f93314d1ae17c992a0d08bdfc6beea844
URL: http://source.winehq.org/git/wine.git/?a=commit;h=52738e4f93314d1ae17c992a0d08bdfc6beea844
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue May 1 12:38:27 2012 +0200
msi: Remove a workaround for missing Windows Script interfaces.
---
dlls/msi/script.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/script.c b/dlls/msi/script.c
index 27bbee1..e157c6d 100644
--- a/dlls/msi/script.c
+++ b/dlls/msi/script.c
@@ -88,10 +88,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function
DISPID dispid;
CLSID clsid;
VARIANT var;
-
- /* Return success by default (if Windows Script not installed) - not native behavior. This
- * should be here until we implement wine scripting. */
- DWORD ret = ERROR_SUCCESS;
+ DWORD ret = ERROR_INSTALL_FAILURE;
CoInitialize(NULL);
@@ -126,9 +123,6 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function
goto done;
}
- /* If we got this far, Windows Script is installed, so don't return success by default anymore */
- ret = ERROR_INSTALL_FAILURE;
-
/* Get the IActiveScriptParse engine interface */
hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse);
if (FAILED(hr)) goto done;
More information about the wine-cvs
mailing list