Merge pull request #11475 from shuffle2/comdef

windows: replace comdef dependency with winrt
dolphin-emu · Jan 23, 2023 · a8a4b9c · a8a4b9c
2 parents c798b3a + c338f9e
commit a8a4b9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Source/Core/AudioCommon/WASAPIStream.cpp b/Source/Core/AudioCommon/WASAPIStream.cpp
@@ -7,7 +7,6 @@
 
 // clang-format off
 #include <Audioclient.h>
-#include <comdef.h>
 #include <mmdeviceapi.h>
 #include <devpkey.h>
 #include <functiondiscoverykeys_devpkey.h>

diff --git a/Source/Core/Common/HRWrap.cpp b/Source/Core/Common/HRWrap.cpp
@@ -3,15 +3,13 @@
 
 #include "HRWrap.h"
 
-#include <comdef.h>
-#include "Common/StringUtil.h"
+#include <winrt/base.h>
 
 namespace Common
 {
 std::string GetHResultMessage(HRESULT hr)
 {
-  // See https://stackoverflow.com/a/7008111
-  _com_error err(hr);
-  return TStrToUTF8(err.ErrorMessage());
+  auto err = winrt::hresult_error(hr);
+  return winrt::to_string(err.message());
 }
 }  // namespace Common