diff options
| author | Arnavion <arnavion@gmail.com> | 2015-02-10 22:14:22 -0800 |
|---|---|---|
| committer | Arnavion <arnavion@gmail.com> | 2015-02-10 22:14:22 -0800 |
| commit | 5a87d814cf87e817390cdf40aff3fe7a6ea4948f (patch) | |
| tree | 274273b6329781ba2d44c50f6765fcd7a5b78849 /plugins/sysinfo | |
| parent | ac54a2ed457d37a40be193bb0fea684f1dd0e197 (diff) | |
Call CoInitialize, CoInitializeSecurity and CoUninitialize from the main process, not from a DLL.
They're process-level functions and aren't meant to be called from DLLs. CoInitSecurity in particular fails with RPC_E_TOO_LATE even if no other call to CoCreateInstance has been made yet. Fixes sysinfo's WMI calls on Windows 8.1 and above.
Diffstat (limited to 'plugins/sysinfo')
| -rw-r--r-- | plugins/sysinfo/sysinfo.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/plugins/sysinfo/sysinfo.c b/plugins/sysinfo/sysinfo.c index 48dd16fc..c243de42 100644 --- a/plugins/sysinfo/sysinfo.c +++ b/plugins/sysinfo/sysinfo.c @@ -235,21 +235,10 @@ static char *query_wmi (QueryWmiType type) int i; gboolean atleast_one_appended = FALSE; - hr = CoInitializeEx (0, COINIT_APARTMENTTHREADED); - if (FAILED (hr)) - { - goto exit; - } - - /* If this is called after some other call to CoCreateInstance somewhere else in the process, this will fail with RPC_E_TOO_LATE. - * However if not, it *is* required to be called, so call it here but ignore any error returned. - */ - CoInitializeSecurity (NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL); - hr = CoCreateInstance (&CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (LPVOID *) &locator); if (FAILED (hr)) { - goto couninitialize; + goto exit; } namespaceName = SysAllocString (L"root\\CIMV2"); @@ -369,9 +358,6 @@ release_locator: locator->lpVtbl->Release (locator); SysFreeString (namespaceName); -couninitialize: - CoUninitialize (); - exit: if (result == NULL) { |