diff --git a/libmulti.gms2/extensions/libmulti/libmulti.dll b/libmulti.gms2/extensions/libmulti/libmulti.dll index 0ed3f7a..95bf6a2 100644 Binary files a/libmulti.gms2/extensions/libmulti/libmulti.dll and b/libmulti.gms2/extensions/libmulti/libmulti.dll differ diff --git a/libmulti.gms2/extensions/libmulti/libmulti.yy b/libmulti.gms2/extensions/libmulti/libmulti.yy index 14bd786..3063dd7 100644 --- a/libmulti.gms2/extensions/libmulti/libmulti.yy +++ b/libmulti.gms2/extensions/libmulti/libmulti.yy @@ -37,6 +37,24 @@ "filename": "libmulti.dll", "final": "", "functions": [ + { + "id": "c5041168-ecc6-30e1-002b-d4b72da3b6c9", + "modelName": "GMExtensionFunction", + "mvc": "1.0", + "argCount": 4, + "args": [ + 1, + 1, + 1, + 1 + ], + "externalName": "RegisterCallbacks", + "help": "RegisterCallbacks(please, dont, call, it) : Do not call this function at all.", + "hidden": false, + "kind": 1, + "name": "RegisterCallbacks", + "returnType": 1 + }, { "id": "d5415e82-a8ba-05e7-e2b7-ca142935a78e", "modelName": "GMExtensionFunction", diff --git a/libmulti.gms23/extensions/libmulti/libmulti.dll b/libmulti.gms23/extensions/libmulti/libmulti.dll index 0ed3f7a..95bf6a2 100644 Binary files a/libmulti.gms23/extensions/libmulti/libmulti.dll and b/libmulti.gms23/extensions/libmulti/libmulti.dll differ diff --git a/libmulti.gms23/extensions/libmulti/libmulti.yy b/libmulti.gms23/extensions/libmulti/libmulti.yy index ac4e9a1..dd288d6 100644 --- a/libmulti.gms23/extensions/libmulti/libmulti.yy +++ b/libmulti.gms23/extensions/libmulti/libmulti.yy @@ -17,6 +17,12 @@ "installdir": "", "files": [ {"filename":"libmulti.dll","origname":"","init":"","final":"","kind":1,"uncompress":false,"functions":[ + {"externalName":"RegisterCallbacks","kind":1,"help":"RegisterCallbacks(please, dont, call, it) : Do not call this function at all.","hidden":false,"returnType":1,"argCount":4,"args":[ + 1, + 1, + 1, + 1, + ],"resourceVersion":"1.0","name":"RegisterCallbacks","tags":[],"resourceType":"GMExtensionFunction",}, {"externalName":"libmulti_init","kind":1,"help":"libmulti_init() ->real : Initializes the library.","hidden":false,"returnType":2,"argCount":0,"args":[],"resourceVersion":"1.0","name":"libmulti_init","tags":[],"resourceType":"GMExtensionFunction",}, {"externalName":"libmulti_quit","kind":1,"help":"libmulti_quit() ->real : Destroys all windows and frees the library resources.","hidden":false,"returnType":2,"argCount":0,"args":[],"resourceVersion":"1.0","name":"libmulti_quit","tags":[],"resourceType":"GMExtensionFunction",}, {"externalName":"libmulti_present","kind":1,"help":"libmulti_present() ->real : Returns true if the DLL is present and was loaded.","hidden":false,"returnType":2,"argCount":0,"args":[],"resourceVersion":"1.0","name":"libmulti_present","tags":[],"resourceType":"GMExtensionFunction",}, @@ -183,6 +189,7 @@ ],"ProxyFiles":[ {"resourceType":"GMProxyFile","TargetMask":6,"name":"libmulti_x64.dll","tags":[],"resourceVersion":"1.0",}, ],"copyToTargets":64,"order":[ + {"name":"RegisterCallbacks","path":"extensions/libmulti/libmulti.yy",}, {"name":"libmulti_init","path":"extensions/libmulti/libmulti.yy",}, {"name":"libmulti_quit","path":"extensions/libmulti/libmulti.yy",}, {"name":"libmulti_present","path":"extensions/libmulti/libmulti.yy",}, diff --git a/libmulti.gms23/extensions/libmulti/libmulti_x64.dll b/libmulti.gms23/extensions/libmulti/libmulti_x64.dll index c96330c..1169efa 100644 Binary files a/libmulti.gms23/extensions/libmulti/libmulti_x64.dll and b/libmulti.gms23/extensions/libmulti/libmulti_x64.dll differ diff --git a/libmulti.gmx/extensions/libmulti.extension.gmx b/libmulti.gmx/extensions/libmulti.extension.gmx index da21456..ebef420 100644 --- a/libmulti.gmx/extensions/libmulti.extension.gmx +++ b/libmulti.gmx/extensions/libmulti.extension.gmx @@ -45,6 +45,20 @@ + + RegisterCallbacks + RegisterCallbacks + 1 + RegisterCallbacks(please, dont, call, it) : Do not call this function at all. + 1 + 4 + + 1 + 1 + 1 + 1 + + libmulti_init libmulti_init diff --git a/libmulti.gmx/extensions/libmulti/libmulti.dll b/libmulti.gmx/extensions/libmulti/libmulti.dll index 0ed3f7a..95bf6a2 100644 Binary files a/libmulti.gmx/extensions/libmulti/libmulti.dll and b/libmulti.gmx/extensions/libmulti/libmulti.dll differ diff --git a/libmulti/libmulti.cpp b/libmulti/libmulti.cpp index e9b8863..55f45de 100644 --- a/libmulti/libmulti.cpp +++ b/libmulti/libmulti.cpp @@ -378,11 +378,12 @@ static LRESULT WINAPI WindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPar return ret; } -dllx void RegisterCallbacks(char* p1, char* p2, char* p3, char* p4) { +dllx char* RegisterCallbacks(char* p1, char* p2, char* p3, char* p4) { CBDispatch = reinterpret_cast(p1); CBCreateDsMap = reinterpret_cast(p2); CBDsMapAddReal = reinterpret_cast(p3); CBDsMapAddString = reinterpret_cast(p4); + return nullptr; // TODO: Change this when GmxGen updates. } dllx double libmulti_init() { diff --git a/libmulti/libmulti.h b/libmulti/libmulti.h index 901b7ef..8723c25 100644 --- a/libmulti/libmulti.h +++ b/libmulti/libmulti.h @@ -35,6 +35,8 @@ void libmulti_legacy_mutex_quit(); /* GmxGen stuff below, change as needed: */ #define dllx extern "C" __declspec(dllexport) +/// Do not call this function at all. +dllx char* RegisterCallbacks(char* please, char* dont, char* call, char* it); ///->real : Initializes the library. dllx double libmulti_init(); ///->real : Destroys all windows and frees the library resources.