Internal. Use CoInitializeEx

guojun0x0 · Jul 11, 2020 · 3d06c82 · 3d06c82
1 parent 611d621
commit 3d06c82
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/src/ConEmu/LoadImg.cpp b/src/ConEmu/LoadImg.cpp
@@ -80,7 +80,7 @@ static GdipCreateBitmapFromHBITMAP_t GdipCreateBitmapFromHBITMAP = NULL;
 //
 //			if (!gbMStreamCoInitialized)
 //			{
-//				HRESULT hr = CoInitialize(NULL);
+//				HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 //				gbMStreamCoInitialized = TRUE;
 //			}
 //		};
@@ -99,7 +99,7 @@ static GdipCreateBitmapFromHBITMAP_t GdipCreateBitmapFromHBITMAP = NULL;
 //
 //			if (!gbMStreamCoInitialized)
 //			{
-//				HRESULT hr = CoInitialize(NULL);
+//				HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 //				gbMStreamCoInitialized = TRUE;
 //			}
 //		};

diff --git a/src/ConEmuBg/ConEmuBg.cpp b/src/ConEmuBg/ConEmuBg.cpp
@@ -629,8 +629,9 @@ struct GDIPlusDecoder
 		}
 
 		bool result = false;
-		HRESULT hrCoInitialized = CoInitialize(NULL);
+		HRESULT hrCoInitialized = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 		bCoInitialized = SUCCEEDED(hrCoInitialized);
+		_ASSERTE(bCoInitialized);
 		//wchar_t FullPath[MAX_PATH*2+15]; FullPath[0] = 0;
 		hGDIPlus = LoadLibraryW(L"GdiPlus.dll");
 

diff --git a/src/ConEmuTh/Display.cpp b/src/ConEmuTh/Display.cpp
@@ -532,7 +532,8 @@ DWORD WINAPI CeFullPanelInfo::DisplayThread(LPVOID lpvParam)
 {
 	MSG msg;
 	HANDLE hReady = (HANDLE)lpvParam;
-	const bool comInitialized = SUCCEEDED(CoInitialize(NULL));
+	const bool comInitialized = SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
+	_ASSERTE(comInitialized);
 	_ASSERTE(gpImgCache);
 	gnConEmuFadeMsg = RegisterWindowMessage(CONEMUMSG_PNLVIEWFADE);
 	gnConEmuSettingsMsg = RegisterWindowMessage(CONEMUMSG_PNLVIEWSETTINGS);

diff --git a/src/ConEmuTh/ImgCache.cpp b/src/ConEmuTh/ImgCache.cpp
@@ -57,7 +57,7 @@ CImgCache::CImgCache(HMODULE hSelf)
 	*mpsz_ModuleSlash = 0;
 
 	// Prepare root storage file pathname
-	SetCacheLocation(nullptr); // Use %TEMP% by default
+	SetCacheLocation(NULL); // Use %TEMP% by default
 
 	LoadModules();
 

diff --git a/src/ConEmuTh/ImgCache.h b/src/ConEmuTh/ImgCache.h
@@ -190,7 +190,7 @@ class CImgLoader : public CQueueProcessor<IMAGE_CACHE_INFO*>
 		{
 			if (!mb_comInitialized)
 			{
-				mb_comInitialized = SUCCEEDED(CoInitialize(NULL));
+				mb_comInitialized = SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED));
 			}
 			return S_OK;
 		}

diff --git a/src/ConEmuTh/Modules/gdip/gdip.cpp b/src/ConEmuTh/Modules/gdip/gdip.cpp
@@ -193,7 +193,7 @@ struct GDIPlusDecoder
 		nErrNumber = 0;
 		//pszPluginKey = pInit->pRegKey;
 		//ReloadConfig();
-		HRESULT hrCoInitialized = CoInitialize(NULL);
+		HRESULT hrCoInitialized = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 		bCoInitialized = SUCCEEDED(hrCoInitialized);
 		wchar_t FullPath[MAX_PATH*2+15]; FullPath[0] = 0;
 		//if (ghModule)

diff --git a/src/ConEmuTh/Modules/ico/ico.cpp b/src/ConEmuTh/Modules/ico/ico.cpp
@@ -784,7 +784,7 @@ struct ICODecoder
 	BOOL Init(struct CET_Init* pInit)
 	{
 		pInit->pContext = this;
-		HRESULT hrCoInitialized = CoInitialize(NULL);
+		HRESULT hrCoInitialized = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 		gbCoInitialized = SUCCEEDED(hrCoInitialized);
 		Gdiplus::GdiplusStartupInput gdiplusStartupInput;
 		Gdiplus::Status lRc = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);

diff --git a/src/ConEmuTh/QueueProcessor.h b/src/ConEmuTh/QueueProcessor.h
@@ -601,7 +601,7 @@ class CQueueProcessor
 		{
 			return mb_TerminateRequested;
 		};
-		// Здесь потомок может выполнить CoInitialize например
+		// Здесь потомок может выполнить CoInitializeEx например
 		virtual HRESULT OnThreadStarted()
 		{
 			return S_OK;