mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-23 01:29:16 +01:00
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitialize
This commit is contained in:
parent
504d004025
commit
ce0633a0c2
@ -1851,7 +1851,11 @@ void PlayMovieInWindow(int cmdShow, const char* szFile)
|
||||
MultiByteToWideChar(CP_ACP, 0, szFile, -1, wFileName, sizeof(wFileName) - 1);
|
||||
|
||||
// Initialize COM
|
||||
#ifdef FIX_BUGS // will also return S_FALSE if it has already been inited in the same thread
|
||||
CoInitialize(nil);
|
||||
#else
|
||||
JIF(CoInitialize(nil));
|
||||
#endif
|
||||
|
||||
// Get the interface for DirectShow's GraphBuilder
|
||||
JIF(CoCreateInstance(CLSID_FilterGraph, nil, CLSCTX_INPROC,
|
||||
@ -2225,7 +2229,9 @@ WinMain(HINSTANCE instance,
|
||||
{
|
||||
CloseClip();
|
||||
|
||||
CoUninitialize();
|
||||
#ifndef FIX_BUGS
|
||||
CoUninitialize(); // CoUninitialize should only be called at the shutdown of a program, and by then it doesn't matter
|
||||
#endif
|
||||
|
||||
if ( CMenuManager::OS_Language == LANG_FRENCH || CMenuManager::OS_Language == LANG_GERMAN )
|
||||
PlayMovieInWindow(cmdShow, "movies\\GTAtitlesGER.mpg");
|
||||
@ -2260,7 +2266,9 @@ WinMain(HINSTANCE instance,
|
||||
case GS_INIT_ONCE:
|
||||
{
|
||||
CloseClip();
|
||||
CoUninitialize();
|
||||
#ifndef FIX_BUGS
|
||||
CoUninitialize(); // CoUninitialize should only be called at the shutdown of a program, and by then it doesn't matter
|
||||
#endif
|
||||
|
||||
#ifdef FIX_BUGS
|
||||
// draw one frame because otherwise we'll end up looking at black screen for a while if vsync is on
|
||||
|
Loading…
Reference in New Issue
Block a user