diff options
Diffstat (limited to 'freetrackclient/freetrackclient.c')
| -rw-r--r-- | freetrackclient/freetrackclient.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/freetrackclient/freetrackclient.c b/freetrackclient/freetrackclient.c index 4bc39d67..8e6c2b7f 100644 --- a/freetrackclient/freetrackclient.c +++ b/freetrackclient/freetrackclient.c @@ -27,13 +27,12 @@ #define NP_AXIS_MAX 16383 -#include <stdbool.h> #include <string.h> #include <windows.h> -#include "../ftnoir_protocol_ft/fttypes.h" +#include "fttypes.h" -#define FT_EXPORT(t) __declspec(dllexport) t __stdcall +#define FT_EXPORT(t) t __stdcall #if 0 # include <stdio.h> @@ -49,10 +48,10 @@ static HANDLE ipc_mutex = 0; static const char* dllVersion = "1.0.0.0"; static const char* dllProvider = "FreeTrack"; -static bool impl_create_mapping(void) +static BOOL impl_create_mapping(void) { if (ipc_heap != NULL) - return true; + return TRUE; hFTMemMap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, @@ -62,29 +61,26 @@ static bool impl_create_mapping(void) (LPCSTR) FREETRACK_HEAP); if (hFTMemMap == NULL) - return (ipc_heap = NULL), false; + return (ipc_heap = NULL), FALSE; ipc_heap = (FTHeap*) MapViewOfFile(hFTMemMap, FILE_MAP_WRITE, 0, 0, sizeof(FTHeap)); - ipc_mutex = CreateMutexA(NULL, false, FREETRACK_MUTEX); + ipc_mutex = CreateMutexA(NULL, FALSE, FREETRACK_MUTEX); - return true; + return TRUE; } -#pragma comment (linker, "/export:FTGetData") -FT_EXPORT(bool) FTGetData(FTData* data) +FT_EXPORT(BOOL) FTGetData(FTData* data) { - if (impl_create_mapping() == false) - return false; + if (impl_create_mapping() == FALSE) + return FALSE; if (ipc_mutex && WaitForSingleObject(ipc_mutex, 16) == WAIT_OBJECT_0) { - if (ipc_heap) { - if (ipc_heap->data.DataID > (1 << 29)) - ipc_heap->data.DataID = 0; - data->DataID = ipc_heap->data.DataID; - } + memcpy(data, &ipc_heap->data, sizeof(FTData)); + if (ipc_heap->data.DataID > (1 << 29)) + ipc_heap->data.DataID = 0; ReleaseMutex(ipc_mutex); } - return true; + return TRUE; } /* @@ -92,23 +88,24 @@ FT_EXPORT(bool) FTGetData(FTData* data) // The Delphi-code from the FreeTrack repo suggest a char * as argument, so it cost me an afternoon to figure it out (and keep ArmA2 from crashing). // Thanks guys! */ -#pragma comment (linker, "/export:FTReportName") FT_EXPORT(void) FTReportName( int name ) { dbg_report("FTReportName request (ID = %d).\n", name); } -#pragma comment (linker, "/export:FTGetDllVersion") FT_EXPORT(const char*) FTGetDllVersion(void) { dbg_report("FTGetDllVersion request.\n"); return dllVersion; } -#pragma comment (linker, "/export:FTProvider") FT_EXPORT(const char*) FTProvider(void) { dbg_report("FTProvider request.\n"); return dllProvider; } +#pragma comment (linker, "/export:FTReportName=_FTReportName@4") +#pragma comment (linker, "/export:FTGetDllVersion=_FTGetDllVersion@0") +#pragma comment (linker, "/export:FTProvider=_FTProvider@0") +#pragma comment (linker, "/export:FTGetData=_FTGetData@4") |