Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verify CoInitialize call was successful (on Windows only).

Browse Source
This commit is contained in:
Shyotl
2015-05-16 01:47:24 -05:00
parent 48c0c6eb39
commit f827d77600
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llwindow/lldxhardware.cpp
View File

@@ -183,11 +183,11 @@ HRESULT GetVideoMemoryViaWMI( WCHAR* strInputDeviceID, DWORD* pdwAdapterRam )
SAFE_RELEASE( pVideoControllers[iController] ); SAFE_RELEASE( pVideoControllers[iController] );
} }
} }
SAFE_RELEASE(pEnumVideoControllers);
} }
if( pClassName ) if( pClassName )
SysFreeString( pClassName ); SysFreeString( pClassName );
SAFE_RELEASE( pEnumVideoControllers );
} }
if( pNamespace ) if( pNamespace )
@@ -449,7 +449,13 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
BOOL ok = FALSE; BOOL ok = FALSE;
HRESULT hr; HRESULT hr;
CoInitialize(NULL); hr = CoInitialize(NULL);
if (FAILED(hr))
{
LL_WARNS("AppInit") << "COM library initialization failed!" << LL_ENDL;
gWriteDebug("COM library initialization failed!\n");
return FALSE;
}
IDxDiagProvider *dx_diag_providerp = NULL; IDxDiagProvider *dx_diag_providerp = NULL;
IDxDiagContainer *dx_diag_rootp = NULL; IDxDiagContainer *dx_diag_rootp = NULL;
@@ -709,7 +715,13 @@ LLSD LLDXHardware::getDisplayInfo()
LLTimer hw_timer; LLTimer hw_timer;
HRESULT hr; HRESULT hr;
LLSD ret; LLSD ret;
CoInitialize(NULL); hr = CoInitialize(NULL);
if (FAILED(hr))
{
LL_WARNS("AppInit") << "COM library initialization failed!" << LL_ENDL;
gWriteDebug("COM library initialization failed!\n");
return ret;
}
IDxDiagProvider *dx_diag_providerp = NULL; IDxDiagProvider *dx_diag_providerp = NULL;
IDxDiagContainer *dx_diag_rootp = NULL; IDxDiagContainer *dx_diag_rootp = NULL;