summaryrefslogtreecommitdiffhomepage
path: root/proto-simconnect
diff options
context:
space:
mode:
Diffstat (limited to 'proto-simconnect')
-rw-r--r--proto-simconnect/CMakeLists.txt2
-rw-r--r--proto-simconnect/ftnoir-protocol-sc.rc8
-rw-r--r--proto-simconnect/ftnoir_protocol_sc.cpp240
-rw-r--r--proto-simconnect/ftnoir_protocol_sc.h84
-rw-r--r--proto-simconnect/ftnoir_protocol_sc_dialog.cpp10
-rw-r--r--proto-simconnect/ftnoir_sccontrols.ui10
-rw-r--r--proto-simconnect/lang/nl_NL.ts29
-rw-r--r--proto-simconnect/lang/ru_RU.ts29
-rw-r--r--proto-simconnect/lang/stub.ts29
-rw-r--r--proto-simconnect/lang/zh_CN.ts31
-rw-r--r--proto-simconnect/manifest-template.in16
11 files changed, 249 insertions, 239 deletions
diff --git a/proto-simconnect/CMakeLists.txt b/proto-simconnect/CMakeLists.txt
index 26047b6f..f5cec5ac 100644
--- a/proto-simconnect/CMakeLists.txt
+++ b/proto-simconnect/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(WIN32)
+if(WIN32 AND opentrack-intel)
otr_module(proto-simconnect)
endif()
diff --git a/proto-simconnect/ftnoir-protocol-sc.rc b/proto-simconnect/ftnoir-protocol-sc.rc
index f1a7b531..0d501812 100644
--- a/proto-simconnect/ftnoir-protocol-sc.rc
+++ b/proto-simconnect/ftnoir-protocol-sc.rc
@@ -1,7 +1,7 @@
#define RT_MANIFEST 24
-142 RT_MANIFEST fsx_rtm.manifest
-143 RT_MANIFEST fsx_sp1.manifest
-144 RT_MANIFEST fsx_sp2.manifest
-145 RT_MANIFEST fsx_p3d_sp2_xpack.manifest
+142 RT_MANIFEST fsx_p3d_sp2_xpack.manifest
+143 RT_MANIFEST fsx_rtm.manifest
+144 RT_MANIFEST fsx_sp1.manifest
+145 RT_MANIFEST fsx_sp2.manifest
146 RT_MANIFEST fsx_steam_orig.manifest
147 RT_MANIFEST fsx_steam_last.manifest
diff --git a/proto-simconnect/ftnoir_protocol_sc.cpp b/proto-simconnect/ftnoir_protocol_sc.cpp
index f2a9dd14..ca76e0ce 100644
--- a/proto-simconnect/ftnoir_protocol_sc.cpp
+++ b/proto-simconnect/ftnoir_protocol_sc.cpp
@@ -2,8 +2,8 @@
* *
* ISC License (ISC) *
* *
- * Copyright (c) 2015, Wim Vriend
- * Copyright (c) 2014, Stanislaw Halik <sthalik@misaki.pl>
+ * Copyright (c) 2015, Wim Vriend *
+ * Copyright (c) 2014, 2017, 2019 Stanislaw Halik *
* *
* Permission to use, copy, modify, and/or distribute this software for any *
* purpose with or without fee is hereby granted, provided that the above *
@@ -13,10 +13,7 @@
#include "api/plugin-api.hpp"
#include "compat/timer.hpp"
#include "compat/library-path.hpp"
-
-simconnect::simconnect() : hSimConnect(nullptr), should_reconnect(false)
-{
-}
+#include "compat/activation-context.hpp"
simconnect::~simconnect()
{
@@ -26,65 +23,62 @@ simconnect::~simconnect()
void simconnect::run()
{
- HANDLE event = CreateEventA(NULL, FALSE, FALSE, nullptr);
+ HANDLE event = CreateEventA(nullptr, FALSE, FALSE, nullptr);
if (event == nullptr)
{
- qDebug() << "simconnect: event create" << GetLastError();
+ qDebug() << "fsx: create event failed, error code" << GetLastError();
return;
}
+ constexpr unsigned sleep_time = 5;
+
while (!isInterruptionRequested())
{
HRESULT hr;
+ reconnect = false;
+ handle = nullptr;
- if (SUCCEEDED(hr = simconnect_open(&hSimConnect, "opentrack", nullptr, 0, event, 0)))
+ if (!SUCCEEDED(hr = simconnect_open(&handle, "opentrack", nullptr, 0, event, 0)))
+ qDebug() << "fsx: connect failed, retry in" << sleep_time << "seconds...";
+ else
{
- if (!SUCCEEDED(hr = simconnect_subscribetosystemevent(hSimConnect, 0, "Frame")))
+ if (!SUCCEEDED(hr = simconnect_subscribe(handle, 0, "1sec")))
+ qDebug() << "fsx: can't subscribe to frame event:" << (void*)hr;
+ else
{
- qDebug() << "simconnect: can't subscribe to frame event:" << hr;
- }
-
- Timer tm;
- should_reconnect = false;
-
- if (SUCCEEDED(hr))
while (!isInterruptionRequested())
{
- if (should_reconnect)
- break;
+ constexpr int max_idle_ms = 2000;
- if (WaitForSingleObject(event, 100) == WAIT_OBJECT_0)
+ if (WaitForSingleObject(event, max_idle_ms) != WAIT_OBJECT_0)
{
- tm.start();
-
- if (!SUCCEEDED(hr = simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast<void*>(this))))
- {
- qDebug() << "simconnect: calldispatch failed:" << hr;
- break;
- }
+ qDebug() << "fsx: timeout reached, reconnecting";
+ break;
}
- else
- {
- const int idle_seconds = tm.elapsed_seconds();
- constexpr int max_idle_seconds = 2;
+ if (reconnect.load(std::memory_order_relaxed))
+ break;
- if (idle_seconds >= max_idle_seconds)
- {
- qDebug() << "simconnect: reconnect";
- break;
- }
+ if (!SUCCEEDED(hr = simconnect_calldispatch(handle, event_handler, (void*)this)))
+ {
+ qDebug() << "fsx: calldispatch failed:" << (void*)hr;
+ break;
}
- }
+ }
+ }
- (void) simconnect_close(hSimConnect);
+ QMutexLocker l(&mtx);
+ (void)simconnect_close(handle);
+ handle = nullptr;
}
- else
- qDebug() << "simconnect: can't open handle:" << hr;
- if (!isInterruptionRequested())
- Sleep(3000);
+ for (unsigned k = 0; k < sleep_time * 25; k++)
+ {
+ if (isInterruptionRequested())
+ break;
+ Sleep(1000 / 25);
+ }
}
qDebug() << "simconnect: exit";
@@ -92,126 +86,70 @@ void simconnect::run()
CloseHandle(event);
}
-void simconnect::pose( const double *headpose )
+void simconnect::pose(const double* pose, const double*)
{
- // euler degrees
- virtSCRotX = float(-headpose[Pitch]);
- virtSCRotY = float(headpose[Yaw]);
- virtSCRotZ = float(headpose[Roll]);
-
- // cm to meters
- virtSCPosX = float(-headpose[TX]/100);
- virtSCPosY = float(headpose[TY]/100);
- virtSCPosZ = float(-headpose[TZ]/100);
+ data[Pitch] = (float)-pose[Pitch];
+ data[Yaw] = (float)pose[Yaw];
+ data[Roll] = (float)pose[Roll];
+
+ constexpr float to_meters = 1e-2f;
+ data[TX] = (float)-pose[TX] * to_meters;
+ data[TY] = (float)pose[TY] * to_meters;
+ data[TZ] = (float)-pose[TZ] * to_meters;
+
+ QMutexLocker l(&mtx);
+ if (handle)
+ (void)simconnect_set6DOF(handle,
+ data[TX], data[TY], data[TZ],
+ data[Pitch], data[Roll], data[Yaw]);
}
-#ifdef __GNUC__
-# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-class ActivationContext
-{
-public:
- ActivationContext(const int resid) :
- ok(false)
- {
- hactctx = INVALID_HANDLE_VALUE;
- actctx_cookie = 0;
- ACTCTXA actx = {};
- actx.cbSize = sizeof(actx);
- actx.lpResourceName = MAKEINTRESOURCEA(resid);
- actx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID;
-#ifdef _MSC_VER
-# define PREFIX ""
-#else
-# define PREFIX "lib"
-#endif
- static const QString prefix = OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH;
- QString path = prefix + PREFIX "opentrack-proto-simconnect.dll";
- QByteArray name = QFile::encodeName(path);
- actx.lpSource = name.constData();
- hactctx = CreateActCtxA(&actx);
- actctx_cookie = 0;
- if (hactctx != INVALID_HANDLE_VALUE)
- {
- if (!ActivateActCtx(hactctx, &actctx_cookie))
- {
- qDebug() << "simconnect: can't set win32 activation context" << GetLastError();
- ReleaseActCtx(hactctx);
- hactctx = INVALID_HANDLE_VALUE;
- }
- else
- ok = true;
- } else {
- qDebug() << "simconnect: can't create win32 activation context" << GetLastError();
- }
- }
- ~ActivationContext() {
- if (hactctx != INVALID_HANDLE_VALUE)
- {
- DeactivateActCtx(0, actctx_cookie);
- ReleaseActCtx(hactctx);
- }
- }
- bool is_ok() const { return ok; }
-
-private:
- ULONG_PTR actctx_cookie;
- HANDLE hactctx;
- bool ok;
-};
-
module_status simconnect::initialize()
{
- if (!SCClientLib.isLoaded())
+ if (!library.isLoaded())
{
- ActivationContext ctx(142 + static_cast<int>(s.sxs_manifest));
+ constexpr int resource_offset = 142;
+ activation_context ctx("opentrack-proto-simconnect" "." OPENTRACK_LIBRARY_EXTENSION,
+ resource_offset + s.sxs_manifest);
- if (ctx.is_ok())
+ if (ctx)
{
- SCClientLib.setFileName("SimConnect.dll");
- SCClientLib.setLoadHints(QLibrary::PreventUnloadHint);
- if (!SCClientLib.load())
- return error(tr("dll load failed -- %1").arg(SCClientLib.errorString()));
+ library.setFileName("SimConnect.dll");
+ library.setLoadHints(QLibrary::PreventUnloadHint | QLibrary::ResolveAllSymbolsHint);
+ if (!library.load())
+ return error(tr("dll load failed: %1").arg(library.errorString()));
}
else
- return error(_("can't load SDK -- check selected simconnect version"));
+ // XXX TODO add instructions for fsx and p3d -sh 20190128
+ return error(tr("Install FSX/Prepar3D SimConnect SDK."));
}
- simconnect_open = (importSimConnect_Open) SCClientLib.resolve("SimConnect_Open");
- if (simconnect_open == NULL) {
- return error("Open function not found in DLL!");
- }
- simconnect_set6DOF = (importSimConnect_CameraSetRelative6DOF) SCClientLib.resolve("SimConnect_CameraSetRelative6DOF");
- if (simconnect_set6DOF == NULL) {
- return error("CameraSetRelative6DOF function not found in DLL!");
- }
- simconnect_close = (importSimConnect_Close) SCClientLib.resolve("SimConnect_Close");
- if (simconnect_close == NULL) {
- return error("Close function not found in DLL!");
- }
+ using ptr = decltype(library.resolve(""));
- simconnect_calldispatch = (importSimConnect_CallDispatch) SCClientLib.resolve("SimConnect_CallDispatch");
- if (simconnect_calldispatch == NULL) {
- return error("CallDispatch function not found in DLL!");
- }
+ struct {
+ const char* name;
+ ptr& place;
+ } list[] = {
+ { "SimConnect_Open", (ptr&)simconnect_open },
+ { "SimConnect_CameraSetRelative6DOF", (ptr&)simconnect_set6DOF },
+ { "SimConnect_Close", (ptr&)simconnect_close },
+ { "SimConnect_CallDispatch", (ptr&)simconnect_calldispatch },
+ { "SimConnect_SubscribeToSystemEvent", (ptr&)simconnect_subscribe },
+ };
- simconnect_subscribetosystemevent = (importSimConnect_SubscribeToSystemEvent) SCClientLib.resolve("SimConnect_SubscribeToSystemEvent");
- if (simconnect_subscribetosystemevent == NULL) {
- return error("SubscribeToSystemEvent function not found in DLL!");
+ for (auto& x : list)
+ {
+ x.place = library.resolve(x.name);
+ if (!x.place)
+ return error(tr("can't import %1: %2").arg(x.name, library.errorString()));
}
start();
- return status_ok();
+ return {};
}
-void simconnect::handle()
-{
- (void) simconnect_set6DOF(hSimConnect, virtSCPosX, virtSCPosY, virtSCPosZ, virtSCRotX, virtSCRotZ, virtSCRotY);
-}
-
-void CALLBACK simconnect::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD, void *self_)
+void simconnect::event_handler(SIMCONNECT_RECV* pData, DWORD, void* self_)
{
simconnect& self = *reinterpret_cast<simconnect*>(self_);
@@ -220,17 +158,19 @@ void CALLBACK simconnect::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWO
default:
break;
case SIMCONNECT_RECV_ID_EXCEPTION:
- qDebug() << "simconnect: got exception";
- //self.should_reconnect = true;
+ // CAVEAT: can't reconnect here, it breaks Prepar3D.
+ // the timer on the event handle will take care of failures.
break;
case SIMCONNECT_RECV_ID_QUIT:
- qDebug() << "simconnect: got quit event";
- self.should_reconnect = true;
- break;
- case SIMCONNECT_RECV_ID_EVENT_FRAME:
- self.handle();
+ qDebug() << "fsx: got quit event";
+ self.reconnect = true;
break;
}
}
-OPENTRACK_DECLARE_PROTOCOL(simconnect, SCControls, simconnectDll)
+QString simconnect::game_name()
+{
+ return tr("FSX / Prepar3D");
+}
+
+OPENTRACK_DECLARE_PROTOCOL(simconnect, simconnect_ui, simconnect_metadata)
diff --git a/proto-simconnect/ftnoir_protocol_sc.h b/proto-simconnect/ftnoir_protocol_sc.h
index 6f9a908f..df3a538d 100644
--- a/proto-simconnect/ftnoir_protocol_sc.h
+++ b/proto-simconnect/ftnoir_protocol_sc.h
@@ -3,7 +3,7 @@
* ISC License (ISC) *
* *
* Copyright (c) 2015, Wim Vriend *
- * Copyright (c) 2014, 2017 Stanislaw Halik *
+ * Copyright (c) 2014, 2017, 2019 Stanislaw Halik *
* *
* Permission to use, copy, modify, and/or distribute this software for any *
* purpose with or without fee is hereby granted, provided that the above *
@@ -16,6 +16,7 @@
#include <atomic>
#include <QThread>
+#include <QMutex>
#include <QMessageBox>
#include <QSettings>
#include <QLibrary>
@@ -30,7 +31,7 @@ struct settings : opts {
value<int> sxs_manifest;
settings() :
opts("proto-simconnect"),
- sxs_manifest(b, "simconnect-manifest", 2)
+ sxs_manifest(b, "simconnect-manifest", 0)
{}
};
@@ -38,79 +39,72 @@ class simconnect : private QThread, public IProtocol
{
Q_OBJECT
public:
- simconnect();
+ simconnect() = default;
~simconnect() override;
module_status initialize() override;
- void pose(const double* headpose);
- void handle();
- QString game_name() {
- return otr_tr("FS2004/FSX");
- }
+ void pose(const double* headpose, const double*) override;
+ QString game_name() override;
+ void run() override;
+
private:
enum {
- SIMCONNECT_RECV_ID_NULL,
SIMCONNECT_RECV_ID_EXCEPTION = 2,
SIMCONNECT_RECV_ID_QUIT = 3,
SIMCONNECT_RECV_ID_EVENT_FRAME = 7,
};
- #pragma pack(push, 1)
struct SIMCONNECT_RECV
{
DWORD dwSize;
DWORD dwVersion;
DWORD dwID;
};
- #pragma pack(pop)
- typedef void (CALLBACK *DispatchProc)(SIMCONNECT_RECV*, DWORD, void*);
+ typedef void (CALLBACK *SC_DispatchProc)(SIMCONNECT_RECV*, DWORD, void*);
- typedef HRESULT (WINAPI *importSimConnect_Open)(HANDLE * phSimConnect, LPCSTR szName, HWND hWnd, DWORD UserEventWin32, HANDLE hEventHandle, DWORD ConfigIndex);
- typedef HRESULT (WINAPI *importSimConnect_Close)(HANDLE hSimConnect);
- typedef HRESULT (WINAPI *importSimConnect_CameraSetRelative6DOF)(HANDLE hSimConnect, float fDeltaX, float fDeltaY, float fDeltaZ, float fPitchDeg, float fBankDeg, float fHeadingDeg);
- typedef HRESULT (WINAPI *importSimConnect_CallDispatch)(HANDLE hSimConnect, DispatchProc pfcnDispatch, void * pContext);
- typedef HRESULT (WINAPI *importSimConnect_SubscribeToSystemEvent)(HANDLE hSimConnect, DWORD EventID, const char * SystemEventName);
+ typedef HRESULT (WINAPI *SC_Open)(HANDLE* phSimConnect, LPCSTR szName, HWND hWnd, DWORD UserEventWin32, HANDLE hEventHandle, DWORD ConfigIndex);
+ typedef HRESULT (WINAPI *SC_Close)(HANDLE hSimConnect);
+ typedef HRESULT (WINAPI *SC_CameraSetRelative6DOF)(HANDLE hSimConnect, float fDeltaX, float fDeltaY, float fDeltaZ, float fPitchDeg, float fBankDeg, float fHeadingDeg);
+ typedef HRESULT (WINAPI *SC_CallDispatch)(HANDLE hSimConnect, SC_DispatchProc pfcnDispatch, void * pContext);
+ typedef HRESULT (WINAPI *SC_SubscribeToSystemEvent)(HANDLE hSimConnect, DWORD EventID, const char * SystemEventName);
- void run() override;
+ float data[6] {};
+ QMutex mtx;
+
+ SC_Open simconnect_open = nullptr;
+ SC_Close simconnect_close = nullptr;
+ SC_CameraSetRelative6DOF simconnect_set6DOF = nullptr;
+ SC_CallDispatch simconnect_calldispatch = nullptr;
+ SC_SubscribeToSystemEvent simconnect_subscribe = nullptr;
- std::atomic<float> virtSCPosX;
- std::atomic<float> virtSCPosY;
- std::atomic<float> virtSCPosZ;
- std::atomic<float> virtSCRotX;
- std::atomic<float> virtSCRotY;
- std::atomic<float> virtSCRotZ;
-
- importSimConnect_Open simconnect_open;
- importSimConnect_Close simconnect_close;
- importSimConnect_CameraSetRelative6DOF simconnect_set6DOF;
- importSimConnect_CallDispatch simconnect_calldispatch;
- importSimConnect_SubscribeToSystemEvent simconnect_subscribetosystemevent;
-
- HANDLE hSimConnect;
- std::atomic<bool> should_reconnect;
- static void CALLBACK processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD cbData, void *pContext);
+ HANDLE handle = nullptr;
+ std::atomic<bool> reconnect = false;
+ static void CALLBACK event_handler(SIMCONNECT_RECV* pData, DWORD cbData, void* pContext);
settings s;
- QLibrary SCClientLib;
+ QLibrary library;
};
-class SCControls: public IProtocolDialog
+class simconnect_ui: public IProtocolDialog
{
Q_OBJECT
-public:
- SCControls();
- void register_protocol(IProtocol *) {}
- void unregister_protocol() {}
-private:
+
Ui::UICSCControls ui;
settings s;
+
+public:
+ simconnect_ui();
+ void register_protocol(IProtocol *) override {}
+ void unregister_protocol() override {}
+
private slots:
void doOK();
void doCancel();
};
-class simconnectDll : public Metadata
+class simconnect_metadata : public Metadata
{
-public:
- QString name() { return otr_tr("Microsoft FSX SimConnect"); }
- QIcon icon() { return QIcon(":/images/fsx.png"); }
+ Q_OBJECT
+
+ QString name() override { return tr("Microsoft FSX SimConnect"); }
+ QIcon icon() override { return QIcon(":/images/fsx.png"); }
};
diff --git a/proto-simconnect/ftnoir_protocol_sc_dialog.cpp b/proto-simconnect/ftnoir_protocol_sc_dialog.cpp
index a14c6b44..c329e75d 100644
--- a/proto-simconnect/ftnoir_protocol_sc_dialog.cpp
+++ b/proto-simconnect/ftnoir_protocol_sc_dialog.cpp
@@ -12,23 +12,23 @@
#include <QDebug>
#include "api/plugin-api.hpp"
-SCControls::SCControls()
+simconnect_ui::simconnect_ui()
{
- ui.setupUi( this );
+ ui.setupUi(this);
- // Connect Qt signals to member-functions
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
tie_setting(s.sxs_manifest, ui.comboBox);
}
-void SCControls::doOK() {
+void simconnect_ui::doOK()
+{
s.b->save();
close();
}
-void SCControls::doCancel()
+void simconnect_ui::doCancel()
{
close();
}
diff --git a/proto-simconnect/ftnoir_sccontrols.ui b/proto-simconnect/ftnoir_sccontrols.ui
index 6439550f..c272d5da 100644
--- a/proto-simconnect/ftnoir_sccontrols.ui
+++ b/proto-simconnect/ftnoir_sccontrols.ui
@@ -53,22 +53,22 @@
</property>
<item>
<property name="text">
- <string>RTM</string>
+ <string>Prepar3d / SP2 XPACK</string>
</property>
</item>
<item>
<property name="text">
- <string>SP1</string>
+ <string>RTM</string>
</property>
</item>
<item>
<property name="text">
- <string>SP2 -- Acceleration</string>
+ <string>SP1</string>
</property>
</item>
<item>
<property name="text">
- <string>Prepar3d SP2 XPACK</string>
+ <string>SP2 -- Acceleration</string>
</property>
</item>
<item>
@@ -78,7 +78,7 @@
</item>
<item>
<property name="text">
- <string>Steam FSX (new)</string>
+ <string>Steam FSX (newer)</string>
</property>
</item>
</widget>
diff --git a/proto-simconnect/lang/nl_NL.ts b/proto-simconnect/lang/nl_NL.ts
index 9c0b83db..5b9acbb3 100644
--- a/proto-simconnect/lang/nl_NL.ts
+++ b/proto-simconnect/lang/nl_NL.ts
@@ -24,26 +24,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Prepar3d SP2 XPACK</source>
+ <source>Steam FSX (older)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (older)</source>
+ <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (new)</source>
+ <source>Prepar3d / SP2 XPACK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
+ <source>Steam FSX (newer)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>simconnect</name>
<message>
- <source>dll load failed -- %1</source>
+ <source>dll load failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>can&apos;t import %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Install FSX/Prepar3D SimConnect SDK.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FSX / Prepar3D</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>simconnect_metadata</name>
+ <message>
+ <source>Microsoft FSX SimConnect</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/proto-simconnect/lang/ru_RU.ts b/proto-simconnect/lang/ru_RU.ts
index d4bd343b..0d5bb1c3 100644
--- a/proto-simconnect/lang/ru_RU.ts
+++ b/proto-simconnect/lang/ru_RU.ts
@@ -24,26 +24,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Prepar3d SP2 XPACK</source>
+ <source>Steam FSX (older)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (older)</source>
+ <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (new)</source>
+ <source>Prepar3d / SP2 XPACK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
+ <source>Steam FSX (newer)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>simconnect</name>
<message>
- <source>dll load failed -- %1</source>
+ <source>dll load failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>can&apos;t import %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Install FSX/Prepar3D SimConnect SDK.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FSX / Prepar3D</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>simconnect_metadata</name>
+ <message>
+ <source>Microsoft FSX SimConnect</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/proto-simconnect/lang/stub.ts b/proto-simconnect/lang/stub.ts
index 73608a68..50d0fa8a 100644
--- a/proto-simconnect/lang/stub.ts
+++ b/proto-simconnect/lang/stub.ts
@@ -24,26 +24,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Prepar3d SP2 XPACK</source>
+ <source>Steam FSX (older)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (older)</source>
+ <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (new)</source>
+ <source>Prepar3d / SP2 XPACK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
+ <source>Steam FSX (newer)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>simconnect</name>
<message>
- <source>dll load failed -- %1</source>
+ <source>dll load failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>can&apos;t import %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Install FSX/Prepar3D SimConnect SDK.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FSX / Prepar3D</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>simconnect_metadata</name>
+ <message>
+ <source>Microsoft FSX SimConnect</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/proto-simconnect/lang/zh_CN.ts b/proto-simconnect/lang/zh_CN.ts
index 73608a68..86e487f2 100644
--- a/proto-simconnect/lang/zh_CN.ts
+++ b/proto-simconnect/lang/zh_CN.ts
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
<context>
<name>UICSCControls</name>
<message>
@@ -24,26 +24,45 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Prepar3d SP2 XPACK</source>
+ <source>Steam FSX (older)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (older)</source>
+ <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Steam FSX (new)</source>
+ <source>Prepar3d / SP2 XPACK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>You need to install SimConnect SDK for your FSX version. For the Steam version, choose SP1 in the above combo box.</source>
+ <source>Steam FSX (newer)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>simconnect</name>
<message>
- <source>dll load failed -- %1</source>
+ <source>dll load failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>can&apos;t import %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Install FSX/Prepar3D SimConnect SDK.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>FSX / Prepar3D</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>simconnect_metadata</name>
+ <message>
+ <source>Microsoft FSX SimConnect</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/proto-simconnect/manifest-template.in b/proto-simconnect/manifest-template.in
index fdf2c74a..69966102 100644
--- a/proto-simconnect/manifest-template.in
+++ b/proto-simconnect/manifest-template.in
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type='win32' name='Microsoft.FlightSimulator.SimConnect' version='VERSION' processorArchitecture='x86' publicKeyToken='67c7c14424d61b5b' />
- </dependentAssembly>
- </dependency>
-</assembly>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.FlightSimulator.SimConnect' version='VERSION' processorArchitecture='x86' publicKeyToken='67c7c14424d61b5b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-19 12:35:26 +0000