From 67f0941dbd716f351c7ac3d7302239d20ba0c71d Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Tue, 20 Jan 2026 16:02:29 +0100 Subject: [PATCH] create types.h and also move everything to src --- Makefile | 2 +- api.c => src/api.c | 0 api.h => src/api.h | 25 ++++++------------------- plugin.c => src/plugin.c | 18 +----------------- src/types.h | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 37 deletions(-) rename api.c => src/api.c (100%) rename api.h => src/api.h (74%) rename plugin.c => src/plugin.c (97%) create mode 100644 src/types.h diff --git a/Makefile b/Makefile index a00554d..a1fb810 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ liblua: rm *.o build: liblua - gcc -O2 -shared -static -o luahost.dll plugin.c api.c liblua -lgdi32 -luser32 -lshell32 \ + gcc -O2 -shared -static -o luahost.dll src/*.c liblua -lgdi32 -luser32 -lshell32 -Ilua \ -Wl,--add-stdcall-alias \ -ffunction-sections -fdata-sections diff --git a/api.c b/src/api.c similarity index 100% rename from api.c rename to src/api.c diff --git a/api.h b/src/api.h similarity index 74% rename from api.h rename to src/api.h index 1ecaab5..afa31b1 100644 --- a/api.h +++ b/src/api.h @@ -1,24 +1,11 @@ +#pragma once + #include #include -#include -#include "lua/lua.h" -#include "lua/lualib.h" -#include "lua/lauxlib.h" - -typedef struct { - uint8_t len; - uint8_t data[255]; -} ShortString; - -typedef struct { - ShortString Key; - ShortString Value; -} TRecord; - -typedef struct { - int32_t Count; - TRecord Records[255]; -} TDB; +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +#include "types.h" extern HFONT g_hCurrentFont; #define FONT_NAME "Segoe UI" diff --git a/plugin.c b/src/plugin.c similarity index 97% rename from plugin.c rename to src/plugin.c index 3301940..0037350 100644 --- a/plugin.c +++ b/src/plugin.c @@ -2,21 +2,6 @@ #include #include -typedef struct { - uint16_t Year; - uint8_t Month; - uint8_t Day; - uint8_t Hour; - uint8_t Minute; - uint8_t Second; - uint8_t Centisecond; - uint16_t RFU; - int32_t Blk1; - int32_t Blk2; - int32_t Blk3; - int32_t Blk4; -} TRDSGroup; - static TRDSGroup Group; static HWND hWnd = NULL; @@ -393,8 +378,7 @@ __declspec(dllexport) int WINAPI Initialize(HANDLE hHandle, TDB* DBPointer) { return (int)hWnd; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { if (fdwReason == DLL_PROCESS_ATTACH) hInst = hinstDLL; return TRUE; } diff --git a/src/types.h b/src/types.h new file mode 100644 index 0000000..749a62e --- /dev/null +++ b/src/types.h @@ -0,0 +1,33 @@ +#pragma once + +#include + +typedef struct { + uint8_t len; + uint8_t data[255]; +} ShortString; + +typedef struct { + ShortString Key; + ShortString Value; +} TRecord; + +typedef struct { + int32_t Count; + TRecord Records[255]; +} TDB; + +typedef struct { + uint16_t Year; + uint8_t Month; + uint8_t Day; + uint8_t Hour; + uint8_t Minute; + uint8_t Second; + uint8_t Centisecond; + uint16_t RFU; + int32_t Blk1; + int32_t Blk2; + int32_t Blk3; + int32_t Blk4; +} TRDSGroup; \ No newline at end of file