Use GetUnknownPointerDelegate for PluginVersion and StandardVersion

neon-nyan · neon-nyan · commit 26b184dae255 · 2025-08-03T12:01:36.000+07:00
diff --git a/SharedStatic.cs b/SharedStatic.cs
@@ -53,8 +53,8 @@ public class SharedStatic
 {
     static unsafe SharedStatic()
     {
-        TryRegisterApiExport<GetVersionPointerDelegate>     ("GetPluginStandardVersion",    GetPluginStandardVersion);
-        TryRegisterApiExport<GetVersionPointerDelegate>     ("GetPluginVersion",            GetPluginVersion);
+        TryRegisterApiExport<GetUnknownPointerDelegate>     ("GetPluginStandardVersion",    GetPluginStandardVersion);
+        TryRegisterApiExport<GetUnknownPointerDelegate>     ("GetPluginVersion",            GetPluginVersion);
         TryRegisterApiExport<GetUnknownPointerDelegate>     ("GetPlugin",                   GetPlugin);
         TryRegisterApiExport<GetPluginUpdateCdnListDelegate>("GetPluginUpdateCdnList",      GetPluginUpdateCdnList);
         TryRegisterApiExport<SetCallbackPointerDelegate>    ("SetLoggerCallback",           SetLoggerCallback);
@@ -85,17 +85,16 @@ static unsafe SharedStatic()
 #else
     internal static bool IsDebug = false;
 #endif
-    internal static unsafe GameVersion CurrentPluginVersion => *GetPluginVersion();
+    internal static unsafe GameVersion CurrentPluginVersion => *(GameVersion*)GetPluginVersion();
     #endregion
 
     #region API Exports
     private static readonly Dictionary<string, nint>                                     RegisteredApiExports       = new(StringComparer.OrdinalIgnoreCase);
     private static readonly Dictionary<string, nint>.AlternateLookup<ReadOnlySpan<char>> RegisteredApiExportsLookup = RegisteredApiExports.GetAlternateLookup<ReadOnlySpan<char>>();
 
-    protected unsafe delegate GameVersion* GetVersionPointerDelegate();
-    protected unsafe delegate void*        GetUnknownPointerDelegate();
-    protected unsafe delegate void         GetPluginUpdateCdnListDelegate(int* count, ushort*** ptr);
-    protected        delegate void         SetCallbackPointerDelegate(nint callbackP);
+    protected unsafe delegate void* GetUnknownPointerDelegate();
+    protected unsafe delegate void  GetPluginUpdateCdnListDelegate(int* count, ushort*** ptr);
+    protected delegate        void  SetCallbackPointerDelegate(nint     callbackP);
 
     private static unsafe void GetPluginUpdateCdnList(int* count, ushort*** ptr)
     {
@@ -138,15 +137,15 @@ private static unsafe void GetPluginUpdateCdnList(int* count, ushort*** ptr)
         }
     }
 
-    private static unsafe GameVersion* GetPluginStandardVersion()
+    private static unsafe void* GetPluginStandardVersion()
     {
-        fixed (GameVersion* ptr = &LibraryStandardVersion)
+        fixed (void* ptr = &LibraryStandardVersion)
         {
             return ptr;
         }
     }
 
-    private static unsafe GameVersion* GetPluginVersion()
+    private static unsafe void* GetPluginVersion()
     {
         if (_currentDllVersion != GameVersion.Empty)
         {

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ public class SharedStatic`
`53`	`53`	`{`
`54`	`54`	`static unsafe SharedStatic()`
`55`	`55`	`{`
`56`		`- TryRegisterApiExport<GetVersionPointerDelegate> ("GetPluginStandardVersion", GetPluginStandardVersion);`
`57`		`- TryRegisterApiExport<GetVersionPointerDelegate> ("GetPluginVersion", GetPluginVersion);`
	`56`	`+ TryRegisterApiExport<GetUnknownPointerDelegate> ("GetPluginStandardVersion", GetPluginStandardVersion);`
	`57`	`+ TryRegisterApiExport<GetUnknownPointerDelegate> ("GetPluginVersion", GetPluginVersion);`
`58`	`58`	`TryRegisterApiExport<GetUnknownPointerDelegate> ("GetPlugin", GetPlugin);`
`59`	`59`	`TryRegisterApiExport<GetPluginUpdateCdnListDelegate>("GetPluginUpdateCdnList", GetPluginUpdateCdnList);`
`60`	`60`	`TryRegisterApiExport<SetCallbackPointerDelegate> ("SetLoggerCallback", SetLoggerCallback);`
`@@ -85,17 +85,16 @@ static unsafe SharedStatic()`
`85`	`85`	`#else`
`86`	`86`	`internal static bool IsDebug = false;`
`87`	`87`	`#endif`
`88`		`- internal static unsafe GameVersion CurrentPluginVersion => *GetPluginVersion();`
	`88`	`+ internal static unsafe GameVersion CurrentPluginVersion => (GameVersion)GetPluginVersion();`
`89`	`89`	`#endregion`
`90`	`90`
`91`	`91`	`#region API Exports`
`92`	`92`	`private static readonly Dictionary<string, nint> RegisteredApiExports = new(StringComparer.OrdinalIgnoreCase);`
`93`	`93`	`private static readonly Dictionary<string, nint>.AlternateLookup<ReadOnlySpan<char>> RegisteredApiExportsLookup = RegisteredApiExports.GetAlternateLookup<ReadOnlySpan<char>>();`
`94`	`94`
`95`		`- protected unsafe delegate GameVersion* GetVersionPointerDelegate();`
`96`		`- protected unsafe delegate void* GetUnknownPointerDelegate();`
`97`		`- protected unsafe delegate void GetPluginUpdateCdnListDelegate(int* count, ushort*** ptr);`
`98`		`- protected delegate void SetCallbackPointerDelegate(nint callbackP);`
	`95`	`+ protected unsafe delegate void* GetUnknownPointerDelegate();`
	`96`	`+ protected unsafe delegate void GetPluginUpdateCdnListDelegate(int* count, ushort*** ptr);`
	`97`	`+ protected delegate void SetCallbackPointerDelegate(nint callbackP);`
`99`	`98`
`100`	`99`	`private static unsafe void GetPluginUpdateCdnList(int* count, ushort*** ptr)`
`101`	`100`	`{`
`@@ -138,15 +137,15 @@ private static unsafe void GetPluginUpdateCdnList(int* count, ushort*** ptr)`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`
`141`		`- private static unsafe GameVersion* GetPluginStandardVersion()`
	`140`	`+ private static unsafe void* GetPluginStandardVersion()`
`142`	`141`	`{`
`143`		`- fixed (GameVersion* ptr = &LibraryStandardVersion)`
	`142`	`+ fixed (void* ptr = &LibraryStandardVersion)`
`144`	`143`	`{`
`145`	`144`	`return ptr;`
`146`	`145`	`}`
`147`	`146`	`}`
`148`	`147`
`149`		`- private static unsafe GameVersion* GetPluginVersion()`
	`148`	`+ private static unsafe void* GetPluginVersion()`
`150`	`149`	`{`
`151`	`150`	`if (_currentDllVersion != GameVersion.Empty)`
`152`	`151`	`{`