fix: amend shv declarations

Author: yulon

include/nob/dx.hpp

@@ -63,6 +63,10 @@ namespace nob {
 					}
 				}
 
+				static void WINAPI _shv_handle(void *sc) {
+					_handle(reinterpret_cast<IDXGISwapChain *>(sc));
+				}
+
 			public:
 				static void _init();
 				static void _uninit();

src/dx.cpp

@@ -76,7 +76,7 @@ namespace nob {
 
 		void on_render::_init() RUA_ONCE_CODE({
 			if (shv::_init()) {
-				shv::presentCallbackRegister(reinterpret_cast<void (*)(void *)>(&dx::on_render::_handle));
+				shv::presentCallbackRegister(&dx::on_render::_shv_handle);
 				return;
 			}
 
@@ -98,7 +98,7 @@ namespace nob {
 			if (!shv::_init()) {
 				return;
 			}
-			shv::presentCallbackUnregister(reinterpret_cast<void (*)(void *)>(&dx::on_render::_handle));
+			shv::presentCallbackUnregister(&dx::on_render::_shv_handle);
 		}
 	}
 }

src/main.cpp

@@ -21,7 +21,7 @@ namespace nob {
 	}
 
 	namespace this_script {
-		void _shv_main();
+		void WINAPI _shv_main();
 		bool _create_from_td();
 		extern std::atomic<bool> _is_exited;
 	}
@@ -42,7 +42,11 @@ namespace nob {
 		#define _NOB_CALL_INIT_FN(_f) _f()
 	#endif
 
-	#define _NOB_NEW_TD(_f) CreateThread(nullptr, 0, reinterpret_cast<LPTHREAD_START_ROUTINE>(static_cast<void(*)()>( _f )), nullptr, 0, nullptr);
+	void CALLBACK _td_proc(void *f) {
+		reinterpret_cast<void(*)()>(f)();
+	}
+
+	#define _NOB_NEW_TD(_f) CreateThread(nullptr, 0, reinterpret_cast<LPTHREAD_START_ROUTINE>(&_td_proc), reinterpret_cast<LPVOID>(static_cast<void(*)()>(_f)), 0, nullptr);
 
 	void _init() {
 		ntv::_pre_init();

src/script.cpp

@@ -98,7 +98,7 @@ namespace nob {
 			return true;
 		}
 
-		void _shv_main() {
+		void WINAPI _shv_main() {
 			while (_run()) {
 				shv::WAIT(0);
 			}

src/shv.cpp

@@ -6,40 +6,40 @@
 
 namespace nob {
 	namespace shv {
-		int (*createTexture)(const char *texFileName);
+		int (WINAPI *createTexture)(const char *texFileName);
 
-		void (*drawTexture)(
+		void (WINAPI *drawTexture)(
 			int id, int index, int level, int time,
 			float sizeX, float sizeY, float centerX, float centerY,
 			float posX, float posY, float rotation, float screenHeightScaleFactor,
 			float r, float g, float b, float a
 		);
 
-		void (*presentCallbackRegister)(PresentCallback cb);
-		void (*presentCallbackUnregister)(PresentCallback cb);
+		void (WINAPI *presentCallbackRegister)(PresentCallback cb);
+		void (WINAPI *presentCallbackUnregister)(PresentCallback cb);
 
-		void (*keyboardHandlerRegister)(KeyboardHandler handler);
-		void (*keyboardHandlerUnregister)(KeyboardHandler handler);
+		void (WINAPI *keyboardHandlerRegister)(KeyboardHandler handler);
+		void (WINAPI *keyboardHandlerUnregister)(KeyboardHandler handler);
 
-		void (*scriptWait)(DWORD time);
-		void (*scriptRegister)(HMODULE module, void(*LP_SCRIPT_MAIN)());
-		void (*scriptRegisterAdditionalThread)(HMODULE module, void(*LP_SCRIPT_MAIN)());
-		void (*scriptUnregister)(HMODULE module);
+		void (WINAPI *scriptWait)(DWORD time);
+		void (WINAPI *scriptRegister)(HMODULE module, void(WINAPI *LP_SCRIPT_MAIN)());
+		void (WINAPI *scriptRegisterAdditionalThread)(HMODULE module, void(WINAPI *LP_SCRIPT_MAIN)());
+		void (WINAPI *scriptUnregister)(HMODULE module);
 
-		void (*nativeInit)(UINT64 hash);
-		void (*nativePush64)(UINT64 val);
-		PUINT64 (*nativeCall)();
+		void (WINAPI *nativeInit)(UINT64 hash);
+		void (WINAPI *nativePush64)(UINT64 val);
+		PUINT64 (WINAPI *nativeCall)();
 
-		UINT64 *(*getGlobalPtr)(int globalId);
+		UINT64 *(WINAPI *getGlobalPtr)(int globalId);
 
-		int (*worldGetAllVehicles)(int *arr, int arrSize);
-		int (*worldGetAllPeds)(int *arr, int arrSize);
-		int (*worldGetAllObjects)(int *arr, int arrSize);
-		int (*worldGetAllPickups)(int *arr, int arrSize);
+		int (WINAPI *worldGetAllVehicles)(int *arr, int arrSize);
+		int (WINAPI *worldGetAllPeds)(int *arr, int arrSize);
+		int (WINAPI *worldGetAllObjects)(int *arr, int arrSize);
+		int (WINAPI *worldGetAllPickups)(int *arr, int arrSize);
 
-		BYTE *(*getScriptHandleBaseAddress)(int handle);
+		BYTE *(WINAPI *getScriptHandleBaseAddress)(int handle);
 
-		eGameVersion (*getGameVersion)();
+		eGameVersion (WINAPI *getGameVersion)();
 
 		constexpr const std::array<LPCWSTR, 2> _module_names {{
 			L"ScriptHookV.dll",