Module: wine Branch: master Commit: aa9f4beb65553e3a4d815fc669a59efe2eb02fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9f4beb65553e3a4d815fc669...
Author: Misha Koshelev mk144210@bcm.edu Date: Fri May 11 14:08:08 2007 -0500
msi: automation: Return DISP_E_MEMBERNOTFOUND if flags are incorrect.
---
dlls/msi/automation.c | 36 ++++++++++++++++++++++++++++++------ dlls/msi/tests/automation.c | 8 ++++---- 2 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d871fa2..ec0706a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -597,6 +597,7 @@ static HRESULT WINAPI RecordImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
default: @@ -637,6 +638,7 @@ static HRESULT WINAPI StringListImpl_Invoke( V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = SysAllocString(data->pszStrings[V_I4(&varg0)]); } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_STRINGLIST_COUNT: @@ -644,6 +646,7 @@ static HRESULT WINAPI StringListImpl_Invoke( V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = data->iCount; } + else return DISP_E_MEMBERNOTFOUND; break;
default: @@ -696,6 +699,7 @@ static HRESULT WINAPI ViewImpl_Invoke( else MsiViewExecute(This->msiHandle, 0); } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_VIEW_FETCH: @@ -720,6 +724,7 @@ static HRESULT WINAPI ViewImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_VIEW_CLOSE: @@ -727,6 +732,7 @@ static HRESULT WINAPI ViewImpl_Invoke( { MsiViewClose(This->msiHandle); } + else return DISP_E_MEMBERNOTFOUND; break;
default: @@ -784,6 +790,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
default: @@ -829,6 +836,7 @@ static HRESULT WINAPI SessionImpl_Invoke( IDispatch_AddRef(data->pInstaller); V_DISPATCH(pVarResult) = data->pInstaller; } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_PROPERTY: @@ -866,6 +874,7 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_LANGUAGE: @@ -874,6 +883,7 @@ static HRESULT WINAPI SessionImpl_Invoke( V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = langId; } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_MODE: @@ -893,6 +903,7 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_DATABASE: @@ -914,6 +925,7 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_DOACTION: @@ -954,6 +966,7 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_EVALUATECONDITION: @@ -963,16 +976,20 @@ static HRESULT WINAPI SessionImpl_Invoke( V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = MsiEvaluateConditionW(This->msiHandle, V_BSTR(&varg0)); } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_SETINSTALLLEVEL: - hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); - if (FAILED(hr)) return hr; - if ((ret = MsiSetInstallLevel(This->msiHandle, V_I4(&varg0))) != ERROR_SUCCESS) - { - ERR("MsiSetInstallLevel returned %d\n", ret); - return DISP_E_EXCEPTION; + if (wFlags & DISPATCH_METHOD) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiSetInstallLevel(This->msiHandle, V_I4(&varg0))) != ERROR_SUCCESS) + { + ERR("MsiSetInstallLevel returned %d\n", ret); + return DISP_E_EXCEPTION; + } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_FEATURECURRENTSTATE: @@ -988,6 +1005,7 @@ static HRESULT WINAPI SessionImpl_Invoke( V_I4(pVarResult) = msiInstallStateUnknown; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_SESSION_FEATUREREQUESTSTATE: @@ -1017,6 +1035,7 @@ static HRESULT WINAPI SessionImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
default: @@ -1137,6 +1156,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_INSTALLER_OPENPACKAGE: @@ -1168,6 +1188,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( return DISP_E_EXCEPTION; } } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_INSTALLER_REGISTRYVALUE: @@ -1257,6 +1278,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( msi_free(szString); RegCloseKey(hkey); } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_INSTALLER_PRODUCTSTATE: @@ -1266,6 +1288,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = MsiQueryProductStateW(V_BSTR(&varg0)); } + else return DISP_E_MEMBERNOTFOUND; break;
case DISPID_INSTALLER_PRODUCTS: @@ -1306,6 +1329,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( else ERR("Failed to create StringList object, hresult 0x%08x\n", hr); } + else return DISP_E_MEMBERNOTFOUND; break;
default: diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e0240fd..c197c87 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -449,11 +449,11 @@ static void test_dispatch(void) /* Test invoking a method as a DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT */ VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
/* Test invoking a read-only property as DISPATCH_PROPERTYPUT or as a DISPATCH_METHOD */ name = (WCHAR *)szProductState; @@ -463,12 +463,12 @@ static void test_dispatch(void) dispparams.rgvarg = NULL; dispparams.cArgs = 0; hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr);
dispparams.rgvarg = NULL; dispparams.cArgs = 0; hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); }
/* invocation helper function */