From b54d441ad728ffce8e543de10bd897f0900422b5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 29 Nov 2013 21:43:42 +0100 Subject: Revert "winaccessibility: let CoCreateInstance calls find the components" This only works partially: the ClassObjects are only registered on the main thread; CoCreateInstance on other threads still fails. This reverts commit 29c6216af8c502f220bb84857d3dda901ddfd234. --- winaccessibility/source/UAccCOM/UAccCOM.cxx | 4 ---- winaccessibility/source/service/msaaservice_impl.cxx | 8 -------- 2 files changed, 12 deletions(-) diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 6a8a86bb7333..4cf9f10003c1 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -67,14 +67,10 @@ extern "C" if (dwReason == DLL_PROCESS_ATTACH) { _Module.Init(ObjectMap, hInstance, &LIBID_UACCCOMLib); - _Module.RegisterClassObjects(CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE); DisableThreadLibraryCalls(hInstance); } else if (dwReason == DLL_PROCESS_DETACH) - { - _Module.RevokeClassObjects(); _Module.Term(); - } return TRUE; // ok } diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 6dc1b250bf42..950ef9b66cae 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -267,14 +267,6 @@ Reference< XInterface > SAL_CALL create_MSAAServiceImpl( Reference< XComponentCo } } - // load UAccCOM library so its DllMain can register its COM components - static HMODULE h = LoadLibrary("UAccCOM.dll"); - if (!h) - { - assert(false); - return 0; - } - Reference< XMSAAService > xAccMgr( new MSAAServiceImpl() ); AccessBridgeUpdateOldTopWindows( xAccMgr ); -- cgit v1.2.3