flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FS9] Handle CoInitializeEx being previously called with different flags

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-15 09:13:07 +01:00
committed by Mat Sutcliffe
parent 50e82c26c6
commit e68693a35e
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/simulator/fs9/directplaypeer.cpp
View File

@@ -46,7 +46,7 @@ namespace BlackSimPlugin
}
SafeRelease(m_deviceAddress);
CoUninitialize();
if (m_coInitializeSucceeded) { CoUninitialize(); }
}
HRESULT CDirectPlayPeer::directPlayMessageHandler(DWORD messageId, void *msgBuffer)
@@ -160,10 +160,29 @@ namespace BlackSimPlugin
HRESULT CDirectPlayPeer::initDirectPlay()
{
HRESULT hr = S_OK;
// Initialize COM.
// https://docs.microsoft.com/en-us/windows/desktop/api/combaseapi/nf-combaseapi-coinitializeex
HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
// Init COM so we can use CoCreateInstance
CoInitializeEx(nullptr, COINIT_MULTITHREADED);
// RPC_E_CHANGED_MODE: CoInitializeEx was already called by someone else in this thread with a different mode.
if (hr == RPC_E_CHANGED_MODE)
{
CLogMessage(this).debug(u"CoInitializeEx was already called with a different mode. Trying again.");
hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
}
// Continue here only if CoInitializeEx was successful
// S_OK: The COM library was initialized successfully on this thread.
// S_FALSE: The COM library is already initialized on this thread. Reference count was incremented. This is not an error.
if (hr == S_OK || hr == S_FALSE)
{
m_coInitializeSucceeded = true;
}
else
{
CLogMessage(this).warning(u"CoInitializeEx returned error code %1");
return E_FAIL;
}
// Create the IDirectPlay8Peer Object
if (FAILED(hr = CoCreateInstance(CLSID_DirectPlay8Peer,

3
src/plugins/simulator/fs9/directplaypeer.h
View File

@@ -92,6 +92,9 @@ namespace BlackSimPlugin
using TCallbackWrapper = CallbackWrapper<CDirectPlayPeer, HRESULT, DWORD, void *>; //!< DirectPlay peer message handler wrapper
TCallbackWrapper m_callbackWrapper; //!< Callback wrapper
private:
bool m_coInitializeSucceeded = false;
};
} // ns
} // ns