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

Merge pull request #8322 from CookiePLMonster/8298-com-fix 

WinUpdater: Properly initialize COM on window thread
This commit is contained in:
Connor McLaughlin 2019-08-20 10:51:45 +10:00 committed by GitHub
parent 7520306671 fe8c9dfa14
commit e71cab06a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#include <CommCtrl.h> #include <CommCtrl.h>
#include <ShObjIdl.h> #include <ShObjIdl.h>
#include <shellapi.h> #include <shellapi.h>
#include <wrl/client.h>
#include "Common/Event.h" #include "Common/Event.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
@ -22,7 +23,7 @@ HWND window_handle = nullptr;
HWND label_handle = nullptr; HWND label_handle = nullptr;
HWND total_progressbar_handle = nullptr; HWND total_progressbar_handle = nullptr;
HWND current_progressbar_handle = nullptr; HWND current_progressbar_handle = nullptr;
ITaskbarList3* taskbar_list = nullptr; Microsoft::WRL::ComPtr<ITaskbarList3> taskbar_list;
std::thread ui_thread; std::thread ui_thread;
Common::Event window_created_event; Common::Event window_created_event;
@ -75,15 +76,13 @@ bool InitWindow()
if (!window_handle) if (!window_handle)
return false; return false;
if (FAILED(CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, if (SUCCEEDED(CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&taskbar_list)))) IID_PPV_ARGS(taskbar_list.GetAddressOf()))))
{ {
taskbar_list = nullptr; if (FAILED(taskbar_list->HrInit()))
{
taskbar_list.Reset();
} }
if (taskbar_list && FAILED(taskbar_list->HrInit()))
{
taskbar_list->Release();
taskbar_list = nullptr;
} }
int y = PADDING_HEIGHT; int y = PADDING_HEIGHT;
@ -206,6 +205,14 @@ void SetDescription(const std::string& text)
void MessageLoop() void MessageLoop()
{ {
HRESULT result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
Common::ScopeGuard ui_guard{[result] {
taskbar_list.Reset();
if (SUCCEEDED(result))
CoUninitialize();
}};
if (!InitWindow()) if (!InitWindow())
{ {
MessageBox(nullptr, L"Window init failed!", L"", MB_ICONERROR); MessageBox(nullptr, L"Window init failed!", L"", MB_ICONERROR);