Kaydet (Commit) b54d441a authored tarafından Michael Stahl's avatar Michael Stahl

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.
üst d0e8e6e3
...@@ -67,14 +67,10 @@ extern "C" ...@@ -67,14 +67,10 @@ extern "C"
if (dwReason == DLL_PROCESS_ATTACH) if (dwReason == DLL_PROCESS_ATTACH)
{ {
_Module.Init(ObjectMap, hInstance, &LIBID_UACCCOMLib); _Module.Init(ObjectMap, hInstance, &LIBID_UACCCOMLib);
_Module.RegisterClassObjects(CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE);
DisableThreadLibraryCalls(hInstance); DisableThreadLibraryCalls(hInstance);
} }
else if (dwReason == DLL_PROCESS_DETACH) else if (dwReason == DLL_PROCESS_DETACH)
{
_Module.RevokeClassObjects();
_Module.Term(); _Module.Term();
}
return TRUE; // ok return TRUE; // ok
} }
......
...@@ -267,14 +267,6 @@ Reference< XInterface > SAL_CALL create_MSAAServiceImpl( Reference< XComponentCo ...@@ -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() ); Reference< XMSAAService > xAccMgr( new MSAAServiceImpl() );
AccessBridgeUpdateOldTopWindows( xAccMgr ); AccessBridgeUpdateOldTopWindows( xAccMgr );
......
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