From 3262d6deff04de8c168230b02087fa71cbc69e63 Mon Sep 17 00:00:00 2001
From: Chris Davis <chrisdavis@outlook.com>
Date: Wed, 26 May 2021 14:12:50 -0700
Subject: [PATCH] CPowerRenameManager::s_fileOpWorkerThread should initialize
 COM as STA instead of MTA.  Also, CPowerRenameManager::_PerformFileOperation
 should return S_OK instead of 0. (#11476)

---
 src/modules/powerrename/lib/PowerRenameManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/powerrename/lib/PowerRenameManager.cpp b/src/modules/powerrename/lib/PowerRenameManager.cpp
index 7b20b5dd52..c48f70c62d 100644
--- a/src/modules/powerrename/lib/PowerRenameManager.cpp
+++ b/src/modules/powerrename/lib/PowerRenameManager.cpp
@@ -646,7 +646,7 @@ HRESULT CPowerRenameManager::_PerformFileOperation()
         _OnRenameCompleted();
     }
 
-    return 0;
+    return S_OK;
 }
 
 HRESULT CPowerRenameManager::_CreateFileOpWorkerThread()
@@ -676,7 +676,7 @@ HRESULT CPowerRenameManager::_CreateFileOpWorkerThread()
 
 DWORD WINAPI CPowerRenameManager::s_fileOpWorkerThread(_In_ void* pv)
 {
-    if (SUCCEEDED(CoInitializeEx(NULL, 0)))
+    if (SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)))
     {
         WorkerThreadData* pwtd = reinterpret_cast<WorkerThreadData*>(pv);
         if (pwtd)