fix: remove unnecessary code

Author: tzobler

src/misc/CMakeLists.txt

@@ -535,8 +535,6 @@ add_library(misc SHARED
         simulation/flightgear/flightgearutil.h
         simulation/msfs2024/aircraftmodelloadermsfs2024.cpp
         simulation/msfs2024/aircraftmodelloadermsfs2024.h
-        simulation/msfs2024/msfs2024util.cpp
-        simulation/msfs2024/msfs2024util.h
         simulation/fscommon/aircraftcfgentries.cpp
         simulation/fscommon/aircraftcfgentries.h
         simulation/fscommon/aircraftcfgentrieslist.cpp

src/misc/simulation/msfs2024/msfs2024util.cpp

@@ -160,7 +160,7 @@ bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *fu
     return true;
 }
 
-bool resolveCommonSimConnectSymbols(QLibrary &simConnectDll)
+bool resolveMsfs2024SimConnectSymbols(QLibrary &simConnectDll)
 {
     bool resolveSuccess = true;
     resolveSuccess =
@@ -253,103 +253,6 @@ bool resolveP3DSimConnectSymbols(QLibrary &simConnectDll)
     return resolveSuccess;
 }
 
-P3DSimConnectVersion stringToP3DVersion(const QString &p3d)
-{
-    if (p3d.length() >= 2)
-    {
-        const QString p = digitOnlyString(p3d);
-        if (p.contains("40")) { return P3DSimConnectv40; }
-        if (p.contains("41")) { return P3DSimConnectv41; }
-        if (p.contains("42")) { return P3DSimConnectv42; }
-        if (p.contains("43")) { return P3DSimConnectv43; }
-        if (p.contains("44")) { return P3DSimConnectv44; }
-        if (p.contains("45")) { return P3DSimConnectv45; }
-
-        if (p.contains("50")) { return P3DSimConnectv45; }
-        if (p.contains("51")) { return P3DSimConnectv45; }
-        if (p.contains("52")) { return P3DSimConnectv45; }
-    }
-    return P3DSimConnectv44; // default
-}
-
-bool loadAndResolveP3DSimConnect(P3DSimConnectVersion version)
-{
-    // Check if already loaded
-    if (gSymbols.SimConnect_Open) { return true; }
-
-    QString simConnectFileName(QStringLiteral("SimConnect.P3D-"));
-
-    switch (version)
-    {
-    case P3DSimConnectv40: simConnectFileName += "v4.0"; break;
-    case P3DSimConnectv41: simConnectFileName += "v4.1"; break;
-    case P3DSimConnectv42: simConnectFileName += "v4.2"; break;
-    case P3DSimConnectv43: simConnectFileName += "v4.3"; break;
-    case P3DSimConnectv44: simConnectFileName += "v4.4"; break;
-    case P3DSimConnectv45: simConnectFileName += "v4.5"; break;
-    }
-
-    QLibrary simConnectDll(simConnectFileName);
-    simConnectDll.setLoadHints(QLibrary::PreventUnloadHint);
-    if (simConnectDll.load())
-    {
-        const bool resolvedCommon = resolveCommonSimConnectSymbols(simConnectDll);
-        const bool resolvedP3DSimConnectSymbols = resolveP3DSimConnectSymbols(simConnectDll);
-        if (!resolvedCommon)
-        {
-            CLogMessage(CLogCategories::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'")
-                << simConnectFileName;
-            return false;
-        }
-        if (!resolvedP3DSimConnectSymbols)
-        {
-            CLogMessage(CLogCategories::driver()).error(u"Failed to resolve P3D symbols from SimConnect.dll: '%1'")
-                << simConnectFileName;
-            return false;
-        }
-
-        CLogMessage(CLogCategories::driver()).info(u"Loaded and resolved P3D symbols from SimConnect.dll: '%1'")
-            << simConnectFileName;
-        return resolvedCommon && resolvedP3DSimConnectSymbols;
-    }
-    else
-    {
-        CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'")
-            << simConnectFileName << simConnectDll.errorString();
-        return false;
-    }
-}
-
-bool loadAndResolveMSFSimConnect()
-{
-    // Check if already loaded
-    if (gSymbols.SimConnect_Open) { return true; }
-
-    QString simConnectFileName(QStringLiteral("SimConnect.MSFS"));
-
-    QLibrary simConnectDll(simConnectFileName);
-    simConnectDll.setLoadHints(QLibrary::PreventUnloadHint);
-    if (simConnectDll.load())
-    {
-        const bool resolvedCommon = resolveCommonSimConnectSymbols(simConnectDll);
-        if (!resolvedCommon)
-        {
-            CLogMessage(CLogCategories::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'")
-                << simConnectFileName;
-            return false;
-        }
-
-        CLogMessage(CLogCategories::driver()).info(u"Loaded and resolved MSFS symbols from SimConnect.dll: '%1'")
-            << simConnectFileName;
-        return resolvedCommon;
-    }
-    else
-    {
-        CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: '%1' '%2'")
-            << simConnectFileName << simConnectDll.errorString();
-        return false;
-    }
-}
 
 bool loadAndResolveMSFS2024SimConnect()
 {
@@ -362,7 +265,7 @@ bool loadAndResolveMSFS2024SimConnect()
     simConnectDll.setLoadHints(QLibrary::PreventUnloadHint);
     if (simConnectDll.load())
     {
-        const bool resolvedCommon = resolveCommonSimConnectSymbols(simConnectDll);
+        const bool resolvedCommon = resolveMsfs2024SimConnectSymbols(simConnectDll);
         if (!resolvedCommon)
         {
             CLogMessage(CLogCategories::driver()).error(u"Failed to resolve common symbols from SimConnect.dll: '%1'")
@@ -382,65 +285,7 @@ bool loadAndResolveMSFS2024SimConnect()
     }
 }
 
-#else
-bool loadAndResolveFsxSimConnect(bool manifestProbing)
-{
-    // Check if already loaded
-    if (gSymbols.SimConnect_Open) { return true; }
 
-    QLibrary simConnectDll(QStringLiteral("SimConnect"));
-    simConnectDll.setLoadHints(QLibrary::PreventUnloadHint);
-    if (manifestProbing)
-    {
-        HMODULE hInst = nullptr;
-        GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)loadAndResolveSimConnect, &hInst);
-        wchar_t szModuleName[MAX_PATH];
-        GetModuleFileName(hInst, szModuleName, MAX_PATH);
-
-        // 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)
-        {
-            ACTCTX actCtx;
-            memset(&actCtx, 0, sizeof(ACTCTX));
-            actCtx.cbSize = sizeof(actCtx);
-            actCtx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID;
-            actCtx.lpSource = szModuleName;
-            actCtx.lpResourceName = MAKEINTRESOURCE(resourceNumber);
-
-            HANDLE hActCtx;
-            hActCtx = CreateActCtx(&actCtx);
-            if (hActCtx != INVALID_HANDLE_VALUE)
-            {
-                ULONG_PTR lpCookie = 0;
-                if (ActivateActCtx(hActCtx, &lpCookie))
-                {
-                    simConnectDll.load();
-                    DeactivateActCtx(0, lpCookie);
-                    if (simConnectDll.isLoaded()) { break; }
-                }
-            }
-            ReleaseActCtx(hActCtx);
-        }
-    }
-
-    // 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()) { simConnectDll.load(); }
-
-    if (simConnectDll.isLoaded()) { return resolveCommonSimConnectSymbols(simConnectDll); }
-    else
-    {
-        CLogMessage(CLogCategories::driver()).error(u"Failed to load SimConnect.dll: %1")
-            << simConnectDll.errorString();
-        return false;
-    }
-}
 
 #endif
 

src/misc/simulation/msfs2024/msfs2024util.h

@@ -12,16 +12,16 @@
 
 #ifdef Q_OS_WIN64
 
-//! P3D versions
-enum P3DSimConnectVersion
-{
-    P3DSimConnectv40,
-    P3DSimConnectv41,
-    P3DSimConnectv42,
-    P3DSimConnectv43,
-    P3DSimConnectv44,
-    P3DSimConnectv45
-};
+////! P3D versions
+//enum P3DSimConnectVersion
+//{
+//    P3DSimConnectv40,
+//    P3DSimConnectv41,
+//    P3DSimConnectv42,
+//    P3DSimConnectv43,
+//    P3DSimConnectv44,
+//    P3DSimConnectv45
+//};
 
 //! FSXCOMMON_EXPORT to the enum
 //MSFS2024COMMON_EXPORT P3DSimConnectVersion stringToP3DVersion(const QString &p3d);

src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp

@@ -25,7 +25,6 @@
 #include "misc/simulation/fscommon/aircraftcfgparser.h"
 #include "misc/simulation/fscommon/bcdconversions.h"
 #include "misc/simulation/fscommon/fscommonutil.h"
-#include "misc/simulation/msfs2024/msfs2024util.h"
 #include "misc/simulation/fsx/simconnectutilities.h"
 #include "misc/simulation/interpolation/interpolatormulti.h"
 #include "misc/simulation/settings/simulatorsettings.h"
@@ -44,7 +43,7 @@ using namespace swift::misc::math;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
 using namespace swift::misc::simulation::fsx;
-using namespace swift::misc::simulation::msfs2024;
+//using namespace swift::misc::simulation::msfs2024;
 using namespace swift::misc::simulation::settings;
 using namespace swift::core;
 using namespace swift::simplugin::fscommon;

src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.h

@@ -27,9 +27,9 @@
 #    include "misc/statusmessage.h"
 #    include "plugins/simulator/fscommon/simulatorfscommon.h"
 #    include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#    include "plugins/simulator/fsxcommon/simconnectwindows.h"
 #    include "plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.h"
 #    include "plugins/simulator/msfs2024/simconnectobjectmsfs2024.h"
+#    include "plugins/simulator/fsxcommon/simconnectwindows.h"
 
 namespace swift::simplugin::msfs2024common
 {
@@ -768,4 +768,4 @@ namespace swift::simplugin::msfs2024common
     };
 } // namespace swift::simplugin::msfs2024common
 
-#endif // SWIFT_SIMPLUGIN_MSFS2024COMMON_SIMULATORFSXCOMMON_H
+#endif // SWIFT_SIMPLUGIN_MSFS2024COMMON_SIMULATORMSFS2024COMMON_H