Skip to content
This repository has been archived by the owner. It is now read-only.

remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't … #681

Merged
merged 2 commits into from Aug 8, 2020
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't …
…check return value for CoInitialize
  • Loading branch information
withmorten committed Aug 7, 2020
commit ce0633a0c2370ad0e075ca5ae0a65bc7061cc65d
@@ -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