summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-29 21:43:42 +0100
committerMichael Stahl <mstahl@redhat.com>2013-12-03 20:41:00 +0100
commit97e4c624024dc2afbbbcfe13caf4470908c95390 (patch)
treea30e372ee787d6702f07471d104636cff39c23a0
parentba2c68241df89608cdf0fef335a9f158256c7146 (diff)
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. (cherry picked from commit b54d441ad728ffce8e543de10bd897f0900422b5)
-rw-r--r--winaccessibility/source/UAccCOM/UAccCOM.cxx4
-rw-r--r--winaccessibility/source/service/msaaservice_impl.cxx8
2 files changed, 0 insertions, 12 deletions
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 637b944af43f..b9e823d60fdd 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 5f3d5fc964f5..e5e1231c0df3 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 );