COM cleanup is not needed and can hang the exit

walbourn · Dec 11, 2024 · 192c130 · 192c130
1 parent 5727466
commit 192c130
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/d3d11game_win32/Main.cpp b/d3d11game_win32/Main.cpp
@@ -105,8 +105,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
     g_game.reset();
 
-    CoUninitialize();
-
     return static_cast<int>(msg.wParam);
 }
 

diff --git a/d3d11game_win32_dr/Main.cpp b/d3d11game_win32_dr/Main.cpp
@@ -105,8 +105,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
     g_game.reset();
 
-    CoUninitialize();
-
     return static_cast<int>(msg.wParam);
 }
 

diff --git a/d3d12game_win32/Main.cpp b/d3d12game_win32/Main.cpp
@@ -46,8 +46,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     if (FAILED(CoInitializeEx(nullptr, COINITBASE_MULTITHREADED)))
         return 1;
 #else
-    Microsoft::WRL::Wrappers::RoInitializeWrapper initialize(RO_INIT_MULTITHREADED);
-    if (FAILED(initialize))
+    if (FAILED(RoInitialize(COINITBASE_MULTITHREADED)))
         return 1;
 #endif
 

diff --git a/d3d12game_win32_dr/Main.cpp b/d3d12game_win32_dr/Main.cpp
@@ -46,8 +46,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     if (FAILED(CoInitializeEx(nullptr, COINITBASE_MULTITHREADED)))
         return 1;
 #else
-    Microsoft::WRL::Wrappers::RoInitializeWrapper initialize(RO_INIT_MULTITHREADED);
-    if (FAILED(initialize))
+    if (FAILED(RoInitialize(COINITBASE_MULTITHREADED)))
         return 1;
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
         g_game.reset();
-        CoUninitialize();
         return static_cast<int>(msg.wParam);
     }
@@ Expand Down @@