now uses the generic version of Marshal.PtrToStructure and SizeOf

Author: Pascal-Krenckel

CompressedFileViewer/PluginInfrastructure/GatewayDomain.cs

@@ -171,15 +171,17 @@ private void _initNativeStruct()
     private void _readNativeStruct()
     {
         if (_ptrSciTextRange != nint.Zero)
-            _sciTextRange = (Sci_TextRange)Marshal.PtrToStructure(_ptrSciTextRange, typeof(Sci_TextRange))!;
+            _sciTextRange = Marshal.PtrToStructure<Sci_TextRange>(_ptrSciTextRange)!;
     }
 
     public void Dispose()
     {
         if (!_disposed)
         {
-            if (_sciTextRange.lpstrText != nint.Zero) Marshal.FreeHGlobal(_sciTextRange.lpstrText);
-            if (_ptrSciTextRange != nint.Zero) Marshal.FreeHGlobal(_ptrSciTextRange);
+            if (_sciTextRange.lpstrText != nint.Zero)
+                Marshal.FreeHGlobal(_sciTextRange.lpstrText);
+            if (_ptrSciTextRange != nint.Zero)
+                Marshal.FreeHGlobal(_ptrSciTextRange);
             _disposed = true;
         }
     }

CompressedFileViewer/PluginInfrastructure/NppPluginNETHelper.cs

@@ -50,7 +50,7 @@ public class FuncItems : IDisposable
     public FuncItems()
     {
         Items = [];
-        _sizeFuncItem = Marshal.SizeOf(typeof(FuncItem));
+        _sizeFuncItem = Marshal.SizeOf<FuncItem>();
         _shortCutKeys = [];
     }
 

CompressedFileViewer/PluginInfrastructure/Scintilla_iface.cs

@@ -3027,7 +3027,7 @@ private void _initNativeStruct()
     private void _readNativeStruct()
     {
         if (_ptrSciTextToFind != nint.Zero)
-            _sciTextToFind = (Sci_TextToFind)Marshal.PtrToStructure(_ptrSciTextToFind, typeof(Sci_TextToFind))!;
+            _sciTextToFind = Marshal.PtrToStructure<Sci_TextToFind>(_ptrSciTextToFind)!;
     }
 
     private void _freeNativeString()

CompressedFileViewer/PluginInfrastructure/UnmanagedExports.cs

@@ -40,7 +40,7 @@ public static nint GetName()
     [UnmanagedCallersOnly(EntryPoint = "beNotified", CallConvs = [typeof(CallConvCdecl)])]
     public static void BeNotified(nint notifyCode)
     {
-        ScNotification notification = (ScNotification)Marshal.PtrToStructure(notifyCode, typeof(ScNotification))!;
+        ScNotification notification = Marshal.PtrToStructure<ScNotification>(notifyCode)!;
         if (notification.Header.Code == (uint)NppMsg.NPPN_TBMODIFICATION)
         {
             PluginBase._funcItems.RefreshItems();