May 2007 - Wine-Commits - list.winehq.org

Rob Shearman : ole32: Add tests for in-process registered class objects not being visible from different apartments .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: e93c82e643b7b23489793a7410f31594ee72fa56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93c82e643b7b23489793a741… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:58:12 2007 +0100 ole32: Add tests for in-process registered class objects not being visible from different apartments. --- dlls/ole32/tests/compobj.c | 162 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f07c95e..e568fb4 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -60,6 +60,12 @@ static const IID IID_IWineTest = 0x4fd0, {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ +static const CLSID CLSID_WineOOPTest = { + 0x5201163f, + 0x8164, + 0x4fd0, + {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} +}; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ static LONG cLocks; @@ -643,12 +649,6 @@ static void test_CoMarshalInterThreadInterfaceInStream(void) static void test_CoRegisterClassObject(void) { - static const CLSID CLSID_WineOOPTest = { - 0x5201163f, - 0x8164, - 0x4fd0, - {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} - }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ DWORD cookie; HRESULT hr; IClassFactory *pcf; @@ -719,6 +719,155 @@ static void test_CoRegisterClassObject(void) CoUninitialize(); } +static HRESULT get_class_object(CLSCTX clsctx) +{ + HRESULT hr; + IClassFactory *pcf; + + hr = CoGetClassObject(&CLSID_WineOOPTest, clsctx, NULL, &IID_IClassFactory, + (void **)&pcf); + + if (SUCCEEDED(hr)) + IClassFactory_Release(pcf); + + return hr; +} + +static DWORD CALLBACK get_class_object_thread(LPVOID pv) +{ + CLSCTX clsctx = (CLSCTX)(DWORD_PTR)pv; + HRESULT hr; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = get_class_object(clsctx); + + CoUninitialize(); + + return hr; +} + +static DWORD CALLBACK register_class_object_thread(LPVOID pv) +{ + HRESULT hr; + DWORD cookie; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); + + CoUninitialize(); + + return hr; +} + +static DWORD CALLBACK revoke_class_object_thread(LPVOID pv) +{ + DWORD cookie = (DWORD_PTR)pv; + HRESULT hr; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoRevokeClassObject(cookie); + + CoUninitialize(); + + return hr; +} + +static void test_registered_object_thread_affinity(void) +{ + HRESULT hr; + DWORD cookie; + HANDLE thread; + DWORD tid; + DWORD exitcode; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + /* CLSCTX_INPROC_SERVER */ + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + thread = CreateThread(NULL, 0, get_class_object_thread, (LPVOID)CLSCTX_INPROC_SERVER, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + todo_wine + ok(hr == REGDB_E_CLASSNOTREG, "CoGetClassObject on inproc object " + "registered in different thread should return REGDB_E_CLASSNOTREG " + "instead of 0x%08x\n", hr); + + hr = get_class_object(CLSCTX_INPROC_SERVER); + ok(hr == S_OK, "CoGetClassObject on inproc object registered in same " + "thread should return S_OK instead of 0x%08x\n", hr); + + thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + todo_wine + ok(hr == S_OK, "CoRegisterClassObject with same CLSID but in different thread should return S_OK instead of 0x%08x\n", hr); + + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + /* CLSCTX_LOCAL_SERVER */ + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + thread = CreateThread(NULL, 0, get_class_object_thread, (LPVOID)CLSCTX_LOCAL_SERVER, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "CoGetClassObject on local server object " + "registered in different thread should return S_OK " + "instead of 0x%08x\n", hr); + + hr = get_class_object(CLSCTX_LOCAL_SERVER); + ok(hr == S_OK, "CoGetClassObject on local server object registered in same " + "thread should return S_OK instead of 0x%08x\n", hr); + + thread = CreateThread(NULL, 0, revoke_class_object_thread, (LPVOID)cookie, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + todo_wine + ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); + + thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "CoRegisterClassObject with same CLSID but in different " + "thread should return S_OK instead of 0x%08x\n", hr); + + hr = CoRevokeClassObject(cookie); + todo_wine + ok_ole_success(hr, "CoRevokeClassObject"); + + CoUninitialize(); +} + static DWORD CALLBACK free_libraries_thread(LPVOID p) { CoFreeUnusedLibraries(); @@ -792,5 +941,6 @@ START_TEST(compobj) test_CoMarshalInterface(); test_CoMarshalInterThreadInterfaceInStream(); test_CoRegisterClassObject(); + test_registered_object_thread_affinity(); test_CoFreeUnusedLibraries(); }

1 0

Rob Shearman : ole32: Revoke registered class objects when the apartment they were registered in is destroyed , not when the last CoUninitialize is called.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: d76ab14479d922aef075d8b05b237bff08e92300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76ab14479d922aef075d8b05… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:57:31 2007 +0100 ole32: Revoke registered class objects when the apartment they were registered in is destroyed, not when the last CoUninitialize is called. --- dlls/ole32/compobj.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f90b0ea..b9669f2 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -77,7 +77,7 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ */ static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); -static void COM_RevokeAllClasses(void); +static void COM_RevokeAllClasses(struct apartment *apt); static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ @@ -121,6 +121,7 @@ typedef struct tagRegisteredClass { struct list entry; CLSID classIdentifier; + OXID apartment_id; LPUNKNOWN classObject; DWORD runContext; DWORD connectFlags; @@ -361,6 +362,9 @@ DWORD apartment_release(struct apartment *apt) TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); + /* Release the references to the registered class objects */ + COM_RevokeAllClasses(apt); + /* no locking is needed for this apartment, because no other thread * can access it at this point */ @@ -955,9 +959,6 @@ void WINAPI CoUninitialize(void) RunningObjectTableImpl_UnInitialize(); - /* Release the references to the registered class objects */ - COM_RevokeAllClasses(); - /* This will free the loaded COM Dlls */ CoFreeAllLibraries(); @@ -1621,6 +1622,21 @@ static HRESULT COM_GetRegisteredClassObject( return hr; } +static void COM_RevokeAllClasses(struct apartment *apt) +{ + RegisteredClass *curClass, *cursor; + + EnterCriticalSection( &csRegisteredClassList ); + + LIST_FOR_EACH_ENTRY_SAFE(curClass, cursor, &RegisteredClassList, RegisteredClass, entry) + { + if (curClass->apartment_id == apt->oxid) + CoRevokeClassObject(curClass->dwCookie); + } + + LeaveCriticalSection( &csRegisteredClassList ); +} + /****************************************************************************** * CoRegisterClassObject [OLE32.@] * @@ -1657,6 +1673,7 @@ HRESULT WINAPI CoRegisterClassObject( RegisteredClass* newClass; LPUNKNOWN foundObject; HRESULT hr; + APARTMENT *apt; TRACE("(%s,%p,0x%08x,0x%08x,%p)\n", debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister); @@ -1664,7 +1681,8 @@ HRESULT WINAPI CoRegisterClassObject( if ( (lpdwRegister==0) || (pUnk==0) ) return E_INVALIDARG; - if (!COM_CurrentApt()) + apt = COM_CurrentApt(); + if (!apt) { ERR("COM was not initialized\n"); return CO_E_NOTINITIALIZED; @@ -1699,6 +1717,7 @@ HRESULT WINAPI CoRegisterClassObject( return E_OUTOFMEMORY; newClass->classIdentifier = *rclsid; + newClass->apartment_id = apt->oxid; newClass->runContext = dwClsContext; newClass->connectFlags = flags; newClass->pMarshaledData = NULL; @@ -2384,20 +2403,6 @@ HRESULT WINAPI CoFileTimeNow( FILETIME *lpFileTime ) return S_OK; } -static void COM_RevokeAllClasses(void) -{ - EnterCriticalSection( &csRegisteredClassList ); - - while (list_head(&RegisteredClassList)) - { - RegisteredClass *curClass = LIST_ENTRY(list_head(&RegisteredClassList), - RegisteredClass, entry); - CoRevokeClassObject(curClass->dwCookie); - } - - LeaveCriticalSection( &csRegisteredClassList ); -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] *

1 0

Rob Shearman : ole32: Add test for registered class becoming invalid when apartment is destroyed .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 4cbca9ac3a7d38e5f16bc235864b5f692c35d183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbca9ac3a7d38e5f16bc2358… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:56:43 2007 +0100 ole32: Add test for registered class becoming invalid when apartment is destroyed. --- dlls/ole32/tests/compobj.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 43891e6..f07c95e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -651,6 +651,7 @@ static void test_CoRegisterClassObject(void) }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ DWORD cookie; HRESULT hr; + IClassFactory *pcf; pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -699,6 +700,22 @@ static void test_CoRegisterClassObject(void) hr = CoRevokeClassObject(cookie); ok_ole_success(hr, "CoRevokeClassObject"); + /* test whether registered class becomes invalid when apartment is destroyed */ + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + CoUninitialize(); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, + &IID_IClassFactory, (void **)&pcf); + ok(hr == REGDB_E_CLASSNOTREG, "object registered in an apartment shouldn't accessible after it is destroyed\n"); + + /* crashes with at least win9x DCOM! */ + if (0) + hr = CoRevokeClassObject(cookie); + CoUninitialize(); }

1 0

Misha Koshelev : msi: automation: Display errors on create_automation_object failure.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 891f7febcafa42b1f20d3fa34858726bd91c07f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891f7febcafa42b1f20d3fa34… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:52:53 2007 -0500 msi: automation: Display errors on create_automation_object failure. --- dlls/msi/automation.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d73c5e5..6325e4c 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -670,11 +670,13 @@ static HRESULT WINAPI ViewImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) + if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; } + else + ERR("Failed to create Record object, hresult 0x%08x\n", hr); } else if (ret == ERROR_NO_MORE_ITEMS) V_DISPATCH(pVarResult) = NULL; @@ -732,11 +734,13 @@ static HRESULT WINAPI DatabaseImpl_Invoke( VariantClear(&varg0); if (ret == ERROR_SUCCESS) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) + if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; } + else + ERR("Failed to create View object, hresult 0x%08x\n", hr); } else { @@ -859,11 +863,13 @@ static HRESULT WINAPI SessionImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0))) + if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; } + else + ERR("Failed to create Database object, hresult 0x%08x\n", hr); } else { @@ -1059,7 +1065,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( } V_VT(pVarResult) = VT_DISPATCH; - if (SUCCEEDED(create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, StringListImpl_Invoke, StringListImpl_Free, sizeof(StringListData)))) + if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, StringListImpl_Invoke, StringListImpl_Free, sizeof(StringListData)))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; @@ -1074,6 +1080,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( sldata->pszStrings[idx] = SysAllocString(szProductBuf); } } + else + ERR("Failed to create StringList object, hresult 0x%08x\n", hr); } break;

1 0

Rob Shearman : ole32: CoGetClassObject shouldn't return REGDB_E_KEYMISSING, so convert it to REGDB_E_CLASSNOTREG.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: af2c3496850c3fff490f431975f007a92bcc009f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2c3496850c3fff490f43197… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:55:38 2007 +0100 ole32: CoGetClassObject shouldn't return REGDB_E_KEYMISSING, so convert it to REGDB_E_CLASSNOTREG. --- dlls/ole32/compobj.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3e3eef7..f90b0ea 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2024,8 +2024,11 @@ HRESULT WINAPI CoGetClassObject( { if (hres == REGDB_E_CLASSNOTREG) ERR("class %s not registered\n", debugstr_guid(rclsid)); - else + else if (hres == REGDB_E_KEYMISSING) + { WARN("class %s not registered as in-proc server\n", debugstr_guid(rclsid)); + hres = REGDB_E_CLASSNOTREG; + } } if (SUCCEEDED(hres)) @@ -2051,8 +2054,11 @@ HRESULT WINAPI CoGetClassObject( { if (hres == REGDB_E_CLASSNOTREG) ERR("class %s not registered\n", debugstr_guid(rclsid)); - else + else if (hres == REGDB_E_KEYMISSING) + { WARN("class %s not registered in-proc handler\n", debugstr_guid(rclsid)); + hres = REGDB_E_CLASSNOTREG; + } } if (SUCCEEDED(hres))

1 0

Misha Koshelev : msi: automation: Clear all VT_BSTR variants returned by DispGetParam.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 3a424aca589e1130a29632e859263ec1b81b168d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a424aca589e1130a29632e85… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:52:37 2007 -0500 msi: automation: Clear all VT_BSTR variants returned by DispGetParam. --- dlls/msi/automation.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 025b4a9..d73c5e5 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -560,7 +560,9 @@ static HRESULT WINAPI RecordImpl_Invoke( if (FAILED(hr)) return hr; hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) return hr; - if ((ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) + ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1)); + VariantClear(&varg1); + if (ret != ERROR_SUCCESS) { ERR("MsiRecordSetString returned %d\n", ret); return DISP_E_EXCEPTION; @@ -726,7 +728,9 @@ static HRESULT WINAPI DatabaseImpl_Invoke( hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) + ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle); + VariantClear(&varg0); + if (ret == ERROR_SUCCESS) { if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) { @@ -803,6 +807,7 @@ static HRESULT WINAPI SessionImpl_Invoke( } if (ret != ERROR_SUCCESS) ERR("MsiGetProperty returned %d\n", ret); + VariantClear(&varg0); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -811,7 +816,10 @@ static HRESULT WINAPI SessionImpl_Invoke( VariantClear(&varg0); return hr; } - if ((ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) + ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1)); + VariantClear(&varg0); + VariantClear(&varg1); + if (ret != ERROR_SUCCESS) { ERR("MsiSetProperty returned %d\n", ret); return DISP_E_EXCEPTION; @@ -870,6 +878,7 @@ static HRESULT WINAPI SessionImpl_Invoke( hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; ret = MsiDoActionW(This->msiHandle, V_BSTR(&varg0)); + VariantClear(&varg0); V_VT(pVarResult) = VT_I4; switch (ret) { @@ -926,6 +935,7 @@ static HRESULT WINAPI SessionImpl_Invoke( ERR("MsiGetFeatureState returned %d\n", ret); V_I4(pVarResult) = msiInstallStateUnknown; } + VariantClear(&varg0); } break; @@ -941,6 +951,7 @@ static HRESULT WINAPI SessionImpl_Invoke( ERR("MsiGetFeatureState returned %d\n", ret); V_I4(pVarResult) = msiInstallStateUnknown; } + VariantClear(&varg0); } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -949,7 +960,9 @@ static HRESULT WINAPI SessionImpl_Invoke( VariantClear(&varg0); return hr; } - if ((ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) + ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1)); + VariantClear(&varg0); + if (ret != ERROR_SUCCESS) { ERR("MsiSetFeatureState returned %d\n", ret); return DISP_E_EXCEPTION; @@ -992,9 +1005,15 @@ static HRESULT WINAPI InstallerImpl_Invoke( hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + VariantClear(&varg0); + return hr; + } V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) + ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle); + VariantClear(&varg0); + if (ret == ERROR_SUCCESS) { if (SUCCEEDED(create_session(msiHandle, (IDispatch *)This, &pDispatch))) { @@ -1016,6 +1035,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = MsiQueryProductStateW(V_BSTR(&varg0)); + VariantClear(&varg0); } break;

1 0

Misha Koshelev : msi/tests: automation: Simplify ok_exception.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: ab2669a750400b743cabc4a66cc7019318b4601f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2669a750400b743cabc4a66… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:52:07 2007 -0500 msi/tests: automation: Simplify ok_exception. --- dlls/msi/tests/automation.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 86af1d6..2678163 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -261,7 +261,6 @@ static void create_database(const CHAR *name, const msi_table *tables, int num_t /* ok-like statement which takes two unicode strings as arguments */ static CHAR string1[MAX_PATH], string2[MAX_PATH]; -static UINT len; #define ok_w2(format, szString1, szString2) \ \ @@ -286,16 +285,8 @@ static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0 ok_w2("Exception source was \"%s\" but expected to be \"%s\"\n", excepinfo.bstrSource, szSource); \ \ ok(excepinfo.bstrDescription != NULL, "Exception description was NULL\n"); \ - if (excepinfo.bstrDescription && lstrcmpW(excepinfo.bstrDescription, szDescription) != 0) \ - { \ - len = WideCharToMultiByte(CP_ACP, 0, excepinfo.bstrDescription, -1, string1, MAX_PATH, NULL, NULL); \ - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ - \ - len = WideCharToMultiByte(CP_ACP, 0, szDescription, -1, string2, MAX_PATH, NULL, NULL); \ - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ - \ - ok(0, "Exception description was \"%s\" but expected to be \"%s\"\n", string1, string2); \ - } \ + if (excepinfo.bstrDescription) \ + ok_w2("Exception description was \"%s\" but expected to be \"%s\"\n", excepinfo.bstrDescription, szDescription); \ } static DISPID get_dispid( IDispatch *disp, const char *name )

1 0

Misha Koshelev : msi/tests: automation: Add test for Installer:: RegistryValue.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 87a46493cfd8827ad8b2a1215f5aa27ccc66c4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a46493cfd8827ad8b2a1215… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:51:36 2007 -0500 msi/tests: automation: Add test for Installer::RegistryValue. --- dlls/msi/tests/automation.c | 195 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 189 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index b5ce434..86af1d6 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -267,12 +267,8 @@ static UINT len; \ if (lstrcmpW(szString1, szString2) != 0) \ { \ - len = WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ -\ - len = WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ -\ + WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ ok(0, format, string1, string2); \ } @@ -517,6 +513,74 @@ static HRESULT Installer_CreateRecord(int count, IDispatch **pRecord) return hr; } +static HRESULT Installer_RegistryValue(HKEY hkey, LPCWSTR szKey, BOOL *pBool) +{ + VARIANT varresult; + VARIANTARG vararg[3]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_I4; + V_I4(&vararg[2]) = (int)hkey; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szKey); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_EMPTY; + + hr = invoke(pInstaller, "RegistryValue", DISPATCH_METHOD, &dispparams, &varresult, VT_BOOL); + *pBool = V_BOOL(&varresult); + VariantClear(&varresult); + return hr; +} + +static HRESULT Installer_RegistryValueW(HKEY hkey, LPCWSTR szKey, LPCWSTR szValue, LPWSTR szString) +{ + VARIANT varresult; + VARIANTARG vararg[3]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_I4; + V_I4(&vararg[2]) = (int)hkey; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szKey); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szValue); + + hr = invoke(pInstaller, "RegistryValue", DISPATCH_METHOD, &dispparams, &varresult, VT_BSTR); + lstrcpyW(szString, V_BSTR(&varresult)); + VariantClear(&varresult); + return hr; +} + +static HRESULT Installer_RegistryValueI(HKEY hkey, LPCWSTR szKey, int iValue, LPWSTR szString, VARTYPE vtResult) +{ + VARIANT varresult; + VARIANTARG vararg[3]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_I4; + V_I4(&vararg[2]) = (int)hkey; + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szKey); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = iValue; + + hr = invoke(pInstaller, "RegistryValue", DISPATCH_METHOD, &dispparams, &varresult, vtResult); + if (vtResult == VT_BSTR) lstrcpyW(szString, V_BSTR(&varresult)); + VariantClear(&varresult); + return hr; +} + static HRESULT Installer_OpenPackage(LPCWSTR szPackagePath, int options, IDispatch **pSession) { VARIANT varresult; @@ -1053,6 +1117,122 @@ static void test_Session(IDispatch *pSession) ok(myint == INSTALLSTATE_ADVERTISED, "Feature request state was %d but expected %d\n", myint, INSTALLSTATE_ADVERTISED); } +/* delete key and all its subkeys */ +static DWORD delete_key( HKEY hkey ) +{ + char name[MAX_PATH]; + DWORD ret; + + while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) + { + HKEY tmp; + if (!(ret = RegOpenKeyExA( hkey, name, 0, KEY_ENUMERATE_SUB_KEYS, &tmp ))) + { + ret = delete_key( tmp ); + RegCloseKey( tmp ); + } + if (ret) break; + } + if (ret != ERROR_NO_MORE_ITEMS) return ret; + RegDeleteKeyA( hkey, "" ); + return 0; +} + +static void test_Installer_RegistryValue(void) +{ + static const DWORD qw[2] = { 0x12345678, 0x87654321 }; + static const WCHAR szKey[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t',0 }; + static const WCHAR szOne[] = { 'O','n','e',0 }; + static const WCHAR szTwo[] = { 'T','w','o',0 }; + static const WCHAR szThree[] = { 'T','h','r','e','e',0 }; + static const WCHAR szFour[] = { 'F','o','u','r',0 }; + static const WCHAR szBlank[] = { 0 }; + WCHAR szString[MAX_PATH]; + HKEY hkey, hkey_sub; + HRESULT hr; + BOOL bRet; + + /* Delete keys */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, szKey, &hkey )) delete_key( hkey ); + + /* Does our key exist? Shouldn't; two different ways to check */ + todo_wine { + hr = Installer_RegistryValue(HKEY_CURRENT_USER, szKey, &bRet); + ok(SUCCEEDED(hr), "Installer_RegistryValue failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n"); + + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); + ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + } + + /* Create key */ + ok(!RegCreateKeyW( HKEY_CURRENT_USER, szKey, &hkey ), "RegCreateKeyW failed\n"); + + ok(!RegSetValueExW(hkey,szOne,0,REG_SZ, (const BYTE *)szOne, sizeof(szOne)), + "RegSetValueExW failed\n"); + ok(!RegSetValueExW(hkey,szTwo,0,REG_DWORD, (const BYTE *)qw, 4), + "RegSetValueExW failed\n"); + ok(!RegSetValueExW(hkey,szThree,0,REG_BINARY, (const BYTE *)qw, 4), + "RegSetValueExW failed\n"); + ok(!RegSetValueExW(hkey,NULL,0,REG_SZ, (const BYTE *)szOne, sizeof(szOne)), + "RegSetValueExW failed\n"); + + ok(!RegCreateKeyW( hkey, szFour, &hkey_sub ), "RegCreateKeyW failed\n"); + + todo_wine { + /* Does our key exist? It should, and make sure we retrieve the correct default value */ + bRet = FALSE; + hr = Installer_RegistryValue(HKEY_CURRENT_USER, szKey, &bRet); + ok(SUCCEEDED(hr), "Installer_RegistryValue failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n"); + + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, NULL, szString); + ok(SUCCEEDED(hr), "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok_w2("Default registry value \"%s\" does not match expected \"%s\"\n", szString, szOne); + + /* Get value of key */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szOne, szString); + ok(SUCCEEDED(hr), "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, szOne); + + /* Get string class name for the key */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 0, szString, VT_BSTR); + ok(SUCCEEDED(hr), "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szBlank); + + /* Get name of a value by positive number (RegEnumValue like), valid index */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 2, szString, VT_BSTR); + ok(SUCCEEDED(hr), "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szTwo); + + /* Get name of a value by positive number (RegEnumValue like), invalid index */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, 10, szString, VT_EMPTY); + ok(SUCCEEDED(hr), "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + + /* Get name of a subkey by negative number (RegEnumValue like), valid index */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, -1, szString, VT_BSTR); + ok(SUCCEEDED(hr), "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, szFour); + + /* Get name of a subkey by negative number (RegEnumValue like), invalid index */ + memset(szString, 0, sizeof(szString)); + hr = Installer_RegistryValueI(HKEY_CURRENT_USER, szKey, -10, szString, VT_EMPTY); + ok(SUCCEEDED(hr), "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + } + + /* clean up */ + delete_key(hkey); +} + static void test_Installer(void) { static WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; @@ -1104,6 +1284,9 @@ static void test_Installer(void) DeleteFileA(msifile); + /* Installer::RegistryValue */ + test_Installer_RegistryValue(); + /* Installer::Products */ hr = Installer_Products(&pStringList); ok(SUCCEEDED(hr), "Installer_Products failed, hresult 0x%08x\n", hr);

1 0

Misha Koshelev : msi: automation: Output FIXMEs for unknown member names.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: de8e566ebe74eaa4855e372e74358fa38897f1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e566ebe74eaa4855e372e7… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:51:07 2007 -0500 msi: automation: Output FIXMEs for unknown member names. --- dlls/msi/automation.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dc85ead..025b4a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -279,10 +279,21 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( DISPID* rgDispId) { AutomationObject *This = (AutomationObject *)iface; + HRESULT hr; TRACE("(%p/%p)->(%p,%p,%d,%d,%p)\n", iface, This, riid, rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG; - return ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); + hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); + if (hr == DISP_E_UNKNOWNNAME) + { + int idx; + for (idx=0; idx<cNames; idx++) + { + if (rgDispId[idx] == DISPID_UNKNOWN) + FIXME("Unknown member %s, clsid %s\n", debugstr_w(rgszNames[idx]), debugstr_guid(This->clsid)); + } + } + return hr; } /* Maximum number of allowed function parameters+1 */

1 0

Misha Koshelev : msi: automation: Use proper parameter names.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 757e617ec2bdfc7f8351fbedc3e4c78d58278a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=757e617ec2bdfc7f8351fbedc… Author: Misha Koshelev <mk144210(a)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); \ } \ }

1 0