mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-17 19:05:31 +08:00
Only link to SimConnect SP1 and XPack
SimConnect RTM is missing two important symbols: - SimConnect_Text - SimConnect_SubscribeToFacilities Therefore remove it from the probing list.
This commit is contained in:
@@ -112,7 +112,12 @@ bool loadAndResolveSimConnect(bool manifestProbing)
|
|||||||
wchar_t szModuleName[MAX_PATH];
|
wchar_t szModuleName[MAX_PATH];
|
||||||
GetModuleFileName(hInst, szModuleName, MAX_PATH);
|
GetModuleFileName(hInst, szModuleName, MAX_PATH);
|
||||||
|
|
||||||
std::array<WORD, 3> resourceNumbers = {{ 101U, 102U, 103U }};
|
// 101 => "SimConnect_RTM.manifest"
|
||||||
|
// 102 => "SimConnect_SP1.manifest"
|
||||||
|
// 103 => "SimConnect_XPack.manifest"
|
||||||
|
// Use only SP1 and XPack, since RTM is missing two important symbols.
|
||||||
|
// Try the latest one first.
|
||||||
|
std::array<WORD, 2> resourceNumbers = {{ 103U, 102U }};
|
||||||
|
|
||||||
for (const auto resourceNumber : resourceNumbers)
|
for (const auto resourceNumber : resourceNumbers)
|
||||||
{
|
{
|
||||||
@@ -139,7 +144,8 @@ bool loadAndResolveSimConnect(bool manifestProbing)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try once without activation context
|
// If at that stage, no SimConnect library was found in the WinSxS folder, try once without activation context to link to the one we
|
||||||
|
// ship ourselves.
|
||||||
if (!simConnectDll.isLoaded())
|
if (!simConnectDll.isLoaded())
|
||||||
{
|
{
|
||||||
simConnectDll.load();
|
simConnectDll.load();
|
||||||
|
|||||||
Reference in New Issue
Block a user