Commit 04505f71 authored by Misha Koshelev's avatar Misha Koshelev Committed by Alexandre Julliard

msi: script: Change all tabs to spaces to conform to msi formatting.

parent 937b6430
...@@ -111,21 +111,21 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function ...@@ -111,21 +111,21 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function
/* Create the scripting engine */ /* Create the scripting engine */
if ((type & 7) == msidbCustomActionTypeJScript) if ((type & 7) == msidbCustomActionTypeJScript)
hr = CLSIDFromProgID(szJScript, &clsid); hr = CLSIDFromProgID(szJScript, &clsid);
else if ((type & 7) == msidbCustomActionTypeVBScript) else if ((type & 7) == msidbCustomActionTypeVBScript)
hr = CLSIDFromProgID(szVBScript, &clsid); hr = CLSIDFromProgID(szVBScript, &clsid);
else { else {
ERR("Unknown script type %d\n", type); ERR("Unknown script type %d\n", type);
goto done; goto done;
} }
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Could not find CLSID for Windows Script\n"); ERR("Could not find CLSID for Windows Script\n");
goto done; goto done;
} }
hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IActiveScript, (void **)&pActiveScript); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IActiveScript, (void **)&pActiveScript);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Could not instantiate class for Windows Script\n"); ERR("Could not instantiate class for Windows Script\n");
goto done; goto done;
} }
/* If we got this far, Windows Script is installed, so don't return success by default anymore */ /* If we got this far, Windows Script is installed, so don't return success by default anymore */
...@@ -156,29 +156,29 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function ...@@ -156,29 +156,29 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function
/* Call a function if necessary through the IDispatch interface */ /* Call a function if necessary through the IDispatch interface */
if (function != NULL && strlenW(function) > 0) { if (function != NULL && strlenW(function) > 0) {
TRACE("Calling function %s\n", debugstr_w(function)); TRACE("Calling function %s\n", debugstr_w(function));
hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch); hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch);
if (FAILED(hr)) goto done; if (FAILED(hr)) goto done;
hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, (WCHAR **)&function, 1,LOCALE_USER_DEFAULT, &dispid); hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, (WCHAR **)&function, 1,LOCALE_USER_DEFAULT, &dispid);
if (FAILED(hr)) goto done; if (FAILED(hr)) goto done;
hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparamsNoArgs, &var, NULL, NULL); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparamsNoArgs, &var, NULL, NULL);
if (FAILED(hr)) goto done; if (FAILED(hr)) goto done;
/* Check return value, if it's not IDOK we failed */ /* Check return value, if it's not IDOK we failed */
hr = VariantChangeType(&var, &var, 0, VT_I4); hr = VariantChangeType(&var, &var, 0, VT_I4);
if (FAILED(hr)) goto done; if (FAILED(hr)) goto done;
if (V_I4(&var) == IDOK) if (V_I4(&var) == IDOK)
ret = ERROR_SUCCESS; ret = ERROR_SUCCESS;
else ret = ERROR_INSTALL_FAILURE; else ret = ERROR_INSTALL_FAILURE;
VariantClear(&var); VariantClear(&var);
} else { } else {
/* If no function to be called, MSI behavior is to succeed */ /* If no function to be called, MSI behavior is to succeed */
ret = ERROR_SUCCESS; ret = ERROR_SUCCESS;
} }
done: done:
...@@ -187,9 +187,9 @@ done: ...@@ -187,9 +187,9 @@ done:
if (pDispatch) IDispatch_Release(pDispatch); if (pDispatch) IDispatch_Release(pDispatch);
if (pActiveScript) IActiveScriptSite_Release(pActiveScript); if (pActiveScript) IActiveScriptSite_Release(pActiveScript);
if (pActiveScriptSite && if (pActiveScriptSite &&
pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession);
if (pActiveScriptSite && if (pActiveScriptSite &&
pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller);
if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite); if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite);
CoUninitialize(); /* must call even if CoInitialize failed */ CoUninitialize(); /* must call even if CoInitialize failed */
...@@ -258,21 +258,21 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, ...@@ -258,21 +258,21 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface,
/* Determine the kind of pointer that is requested, and make sure placeholder is valid */ /* Determine the kind of pointer that is requested, and make sure placeholder is valid */
if (dwReturnMask & SCRIPTINFO_ITYPEINFO) { if (dwReturnMask & SCRIPTINFO_ITYPEINFO) {
if (!ppti) return E_INVALIDARG; if (!ppti) return E_INVALIDARG;
*ppti = NULL; *ppti = NULL;
} }
if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { if (dwReturnMask & SCRIPTINFO_IUNKNOWN) {
if (!ppiunkItem) return E_INVALIDARG; if (!ppiunkItem) return E_INVALIDARG;
*ppiunkItem = NULL; *ppiunkItem = NULL;
} }
/* Are we looking for the session object? */ /* Are we looking for the session object? */
if (!strcmpW(szSession, pstrName)) { if (!strcmpW(szSession, pstrName)) {
if (dwReturnMask & SCRIPTINFO_ITYPEINFO) if (dwReturnMask & SCRIPTINFO_ITYPEINFO)
return load_type_info(This->pSession, ppti, &DIID_Session, 0); return load_type_info(This->pSession, ppti, &DIID_Session, 0);
else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) {
IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem); IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem);
return S_OK; return S_OK;
} }
} }
...@@ -296,33 +296,33 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptTerminate(IActiveScriptSite* i ...@@ -296,33 +296,33 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptTerminate(IActiveScriptSite* i
static HRESULT WINAPI MsiActiveScriptSite_OnStateChange(IActiveScriptSite* iface, SCRIPTSTATE ssScriptState) static HRESULT WINAPI MsiActiveScriptSite_OnStateChange(IActiveScriptSite* iface, SCRIPTSTATE ssScriptState)
{ {
switch (ssScriptState) { switch (ssScriptState) {
case SCRIPTSTATE_UNINITIALIZED: case SCRIPTSTATE_UNINITIALIZED:
TRACE("State: Uninitialized.\n"); TRACE("State: Uninitialized.\n");
break; break;
case SCRIPTSTATE_INITIALIZED: case SCRIPTSTATE_INITIALIZED:
TRACE("State: Initialized.\n"); TRACE("State: Initialized.\n");
break; break;
case SCRIPTSTATE_STARTED: case SCRIPTSTATE_STARTED:
TRACE("State: Started.\n"); TRACE("State: Started.\n");
break; break;
case SCRIPTSTATE_CONNECTED: case SCRIPTSTATE_CONNECTED:
TRACE("State: Connected.\n"); TRACE("State: Connected.\n");
break; break;
case SCRIPTSTATE_DISCONNECTED: case SCRIPTSTATE_DISCONNECTED:
TRACE("State: Disconnected.\n"); TRACE("State: Disconnected.\n");
break; break;
case SCRIPTSTATE_CLOSED: case SCRIPTSTATE_CLOSED:
TRACE("State: Closed.\n"); TRACE("State: Closed.\n");
break; break;
default: default:
ERR("Unknown State: %d\n", ssScriptState); ERR("Unknown State: %d\n", ssScriptState);
break; break;
} }
return S_OK; return S_OK;
...@@ -338,7 +338,7 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface ...@@ -338,7 +338,7 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface
hr = IActiveScriptError_GetExceptionInfo(pscripterror, &exception); hr = IActiveScriptError_GetExceptionInfo(pscripterror, &exception);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
ERR("script error: %s\n", debugstr_w(exception.bstrDescription)); ERR("script error: %s\n", debugstr_w(exception.bstrDescription));
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment