ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace WIL with WRL

This commit is contained in:
oltolm 2024-08-13 21:33:10 +02:00
parent f957d08b3c
commit 5cb9ac0b3a
8 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Source/Core/AudioCommon/WASAPIStream.cpp
View File

@ -2,15 +2,18 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "AudioCommon/WASAPIStream.h"
#include "Common/ScopeGuard.h"
#ifdef _MSC_VER
#ifdef _WIN32
// clang-format off
#include <initguid.h>
#include <Audioclient.h>
#include <mmdeviceapi.h>
#include <devpkey.h>
#include <functiondiscoverykeys_devpkey.h>
#include <wil/resource.h>
#include <propvarutil.h>
#include <wrl/client.h>
// clang-format on
#include <thread>
@ -28,8 +31,9 @@ using Microsoft::WRL::ComPtr;
WASAPIStream::WASAPIStream()
{
if (SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED)))
m_coinitialize.activate();
m_coinitialize = true;
m_need_data_event = CreateEvent(NULL, FALSE, FALSE, NULL);
m_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
m_format.Format.nChannels = 2;
m_format.Format.nSamplesPerSec = GetMixer()->GetSampleRate();
@ -47,6 +51,10 @@ WASAPIStream::~WASAPIStream()
m_running.store(false, std::memory_order_relaxed);
if (m_thread.joinable())
m_thread.join();
if (m_need_data_event != NULL)
CloseHandle(m_need_data_event);
if (m_coinitialize)
CoUninitialize();
}
bool WASAPIStream::IsValid()
@ -84,21 +92,22 @@ static void ForEachNamedDevice(const std::function<bool(ComPtr<IMMDevice>, std::
if (result != RPC_E_CHANGED_MODE && !HandleWinAPI("Failed to call CoInitialize", result))
return;
wil::unique_couninitialize_call cleanup;
if (FAILED(result))
cleanup.release(); // CoUninitialize must be matched with each successful CoInitialize call, so
// don't call it if initialize fails
Common::ScopeGuard result_guard([result] {
if (SUCCEEDED(result))
CoUninitialize(); // CoUninitialize must be matched with each successful CoInitialize call,
// so don't call it if initialize fails
});
ComPtr<IMMDeviceEnumerator> enumerator;
result = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(enumerator.GetAddressOf()));
IID_PPV_ARGS(&enumerator));
if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
return;
ComPtr<IMMDeviceCollection> devices;
result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, devices.GetAddressOf());
result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &devices);
if (!HandleWinAPI("Failed to get available devices", result))
return;
@ -109,19 +118,20 @@ static void ForEachNamedDevice(const std::function<bool(ComPtr<IMMDevice>, std::
for (u32 i = 0; i < count; i++)
{
ComPtr<IMMDevice> device;
devices->Item(i, device.GetAddressOf());
devices->Item(i, &device);
if (!HandleWinAPI("Failed to get device " + std::to_string(i), result))
continue;
ComPtr<IPropertyStore> device_properties;
result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
result = device->OpenPropertyStore(STGM_READ, &device_properties);
if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
continue;
wil::unique_prop_variant device_name;
device_properties->GetValue(PKEY_Device_FriendlyName, device_name.addressof());
PROPVARIANT device_name = {};
result = device_properties->GetValue(PKEY_Device_FriendlyName, &device_name);
Common::ScopeGuard device_name_guard([&] { PropVariantClear(&device_name); });
if (!callback(std::move(device), TStrToUTF8(device_name.pwszVal)))
break;
@ -160,7 +170,7 @@ bool WASAPIStream::Init()
{
ASSERT(m_enumerator == nullptr);
HRESULT result = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(m_enumerator.GetAddressOf()));
IID_PPV_ARGS(&m_enumerator));
if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
return false;
@ -178,7 +188,7 @@ bool WASAPIStream::SetRunning(bool running)
if (Config::Get(Config::MAIN_WASAPI_DEVICE) == "default")
{
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, &device);
}
else
{
@ -189,7 +199,7 @@ bool WASAPIStream::SetRunning(bool running)
{
ERROR_LOG_FMT(AUDIO, "Can't find device '{}', falling back to default",
Config::Get(Config::MAIN_WASAPI_DEVICE));
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, &device);
}
}
@ -199,21 +209,21 @@ bool WASAPIStream::SetRunning(bool running)
// Show a friendly name in the log
ComPtr<IPropertyStore> device_properties;
result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
result = device->OpenPropertyStore(STGM_READ, &device_properties);
if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
return false;
wil::unique_prop_variant device_name;
device_properties->GetValue(PKEY_Device_FriendlyName, device_name.addressof());
PROPVARIANT device_name = {};
result = device_properties->GetValue(PKEY_Device_FriendlyName, &device_name);
Common::ScopeGuard device_name_guard([&] { PropVariantClear(&device_name); });
INFO_LOG_FMT(AUDIO, "Using audio endpoint '{}'", TStrToUTF8(device_name.pwszVal));
ComPtr<IAudioClient> audio_client;
// Get IAudioDevice
result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
reinterpret_cast<LPVOID*>(audio_client.GetAddressOf()));
result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr, &audio_client);
if (!HandleWinAPI("Failed to activate IAudioClient", result))
return false;
@ -276,15 +286,18 @@ bool WASAPIStream::SetRunning(bool running)
ComPtr<IAudioRenderClient> audio_renderer;
result = audio_client->GetService(IID_PPV_ARGS(audio_renderer.GetAddressOf()));
result = audio_client->GetService(IID_PPV_ARGS(&audio_renderer));
if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
return false;
wil::unique_event_nothrow need_data_event;
need_data_event.create();
HANDLE need_data_event = CreateEvent(NULL, FALSE, FALSE, NULL);
Common::ScopeGuard need_data_event_guard([&] {
if (need_data_event != NULL)
CloseHandle(need_data_event);
});
audio_client->SetEventHandle(need_data_event.get());
audio_client->SetEventHandle(need_data_event);
result = audio_client->Start();
@ -297,6 +310,7 @@ bool WASAPIStream::SetRunning(bool running)
m_audio_client = std::move(audio_client);
m_audio_renderer = std::move(audio_renderer);
m_need_data_event = std::move(need_data_event);
need_data_event = nullptr;
m_running.store(true, std::memory_order_relaxed);
m_thread = std::thread(&WASAPIStream::SoundLoop, this);
@ -308,7 +322,11 @@ bool WASAPIStream::SetRunning(bool running)
if (m_thread.joinable())
m_thread.join();
m_need_data_event.reset();
if (m_need_data_event)
{
CloseHandle(m_need_data_event);
m_need_data_event = NULL;
}
m_audio_renderer.Reset();
m_audio_client.Reset();
}
@ -326,7 +344,7 @@ void WASAPIStream::SoundLoop()
while (m_running.load(std::memory_order_relaxed))
{
WaitForSingleObject(m_need_data_event.get(), 1000);
WaitForSingleObject(m_need_data_event, 1000);
m_audio_renderer->GetBuffer(m_frames_in_buffer, &data);

9
Source/Core/AudioCommon/WASAPIStream.h
View File

@ -3,13 +3,12 @@
#pragma once
#ifdef _MSC_VER
#ifdef _WIN32
// clang-format off
#include <Windows.h>
#include <mmreg.h>
#include <objbase.h>
#include <wil/resource.h>
// clang-format on
#include <atomic>
@ -28,7 +27,7 @@ struct IMMDeviceEnumerator;
class WASAPIStream final : public SoundStream
{
#ifdef _MSC_VER
#ifdef _WIN32
public:
explicit WASAPIStream();
~WASAPIStream();
@ -48,12 +47,12 @@ private:
// CoUninitialize must be called after all WASAPI COM objects have been destroyed,
// therefore this member must be located before them, as first class fields are destructed last
wil::unique_couninitialize_call m_coinitialize{false};
bool m_coinitialize{false};
Microsoft::WRL::ComPtr<IMMDeviceEnumerator> m_enumerator;
Microsoft::WRL::ComPtr<IAudioClient> m_audio_client;
Microsoft::WRL::ComPtr<IAudioRenderClient> m_audio_renderer;
wil::unique_event_nothrow m_need_data_event;
HANDLE m_need_data_event;
WAVEFORMATEXTENSIBLE m_format;
#endif // _MSC_VER
};

9
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@ -786,9 +786,12 @@ void GameList::OpenGCSaveFolder()
#ifdef _WIN32
bool GameList::AddShortcutToDesktop()
{
auto init = wil::CoInitializeEx_failfast(COINIT_APARTMENTTHREADED);
auto shell_link = wil::CoCreateInstanceNoThrow<ShellLink, IShellLink>();
if (!shell_link)
if (FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)))
return false;
Common::ScopeGuard init_guard([] { CoUninitialize(); });
Microsoft::WRL::ComPtr<IShellLink> shell_link;
if (FAILED(
CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shell_link))))
return false;
std::wstring dolphin_path = QCoreApplication::applicationFilePath().toStdWString();

2
Source/Core/UICommon/UICommon.cpp
View File

@ -319,7 +319,7 @@ void SetUserDirectory(std::string custom_path)
// Check our registry keys
HKEY hkey;
Common::ScopeGuard dolphin_hkey_guard([&] { RegCloseKey(hkey); });
Common::ScopeGuard hkey_guard([&] { RegCloseKey(hkey); });
DWORD local = 0;
std::unique_ptr<TCHAR[]> configPath;
if (SUCCEEDED(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), 0,

9
Source/Core/VideoBackends/D3D12/DX12Context.cpp
View File

@ -3,15 +3,12 @@
#include "VideoBackends/D3D12/DX12Context.h"
#include <algorithm>
#include <array>
#include <dxgi1_6.h>
#include <queue>
#include <vector>
#include "Common/Assert.h"
#include "Common/DynamicLibrary.h"
#include "Common/StringUtil.h"
#include "VideoBackends/D3D12/Common.h"
#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
@ -445,14 +442,14 @@ bool DXContext::CreateCommandLists()
for (u32 i = 0; i < NUM_COMMAND_LISTS; i++)
{
CommandListResources& res = m_command_lists[i];
HRESULT hr = m_device->CreateCommandAllocator(
D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(res.command_allocator.GetAddressOf()));
HRESULT hr = m_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT,
IID_PPV_ARGS(&res.command_allocator));
ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create command allocator: {}", DX12HRWrap(hr));
if (FAILED(hr))
return false;
hr = m_device->CreateCommandList(1, D3D12_COMMAND_LIST_TYPE_DIRECT, res.command_allocator.Get(),
nullptr, IID_PPV_ARGS(res.command_list.GetAddressOf()));
nullptr, IID_PPV_ARGS(&res.command_list));
ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create command list: {}", DX12HRWrap(hr));
if (FAILED(hr))
{

6
Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
View File

@ -81,13 +81,13 @@ Microsoft::WRL::ComPtr<IDXGIFactory> CreateDXGIFactory(bool debug_device)
// Use Win8.1 version if available.
if (create_dxgi_factory2 &&
SUCCEEDED(create_dxgi_factory2(debug_device ? DXGI_CREATE_FACTORY_DEBUG : 0,
IID_PPV_ARGS(factory.GetAddressOf()))))
IID_PPV_ARGS(&factory))))
{
return factory;
}
// Fallback to original version, without debug support.
HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(factory.ReleaseAndGetAddressOf()));
HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(&factory));
if (FAILED(hr))
{
PanicAlertFmt("CreateDXGIFactory() failed: {}", Common::HRWrap(hr));
@ -100,7 +100,7 @@ Microsoft::WRL::ComPtr<IDXGIFactory> CreateDXGIFactory(bool debug_device)
std::vector<std::string> GetAdapterNames()
{
Microsoft::WRL::ComPtr<IDXGIFactory> factory;
HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(factory.GetAddressOf()));
HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(&factory));
if (FAILED(hr))
return {};

4
Source/Core/VideoBackends/D3DCommon/SwapChain.cpp
View File

@ -155,7 +155,7 @@ bool SwapChain::CreateSwapChain(bool stereo, bool hdr)
// Only try to activate HDR here, to avoid failing when creating the swapchain
// (we can't know if the format is supported upfront)
Microsoft::WRL::ComPtr<IDXGISwapChain4> swap_chain4;
hr = m_swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain4));
hr = m_swap_chain.As(&swap_chain4);
if (SUCCEEDED(hr))
{
UINT color_space_support = 0;
@ -214,7 +214,7 @@ bool SwapChain::ResizeSwapChain()
WARN_LOG_FMT(VIDEO, "ResizeBuffers() failed: {}", Common::HRWrap(hr));
Microsoft::WRL::ComPtr<IDXGISwapChain4> swap_chain4;
hr = m_swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain4));
hr = m_swap_chain.As(&swap_chain4);
if (SUCCEEDED(hr))
hr = swap_chain4->SetColorSpace1(m_hdr ? DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 :
DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709);

2
Source/Core/WinUpdater/WinUI.cpp
View File

@ -78,7 +78,7 @@ bool InitWindow()
return false;
if (SUCCEEDED(CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(taskbar_list.GetAddressOf()))))
IID_PPV_ARGS(&taskbar_list))))
{
if (FAILED(taskbar_list->HrInit()))
{