Merge pull request #1027 from dorssel/refactor_nint

Refactor IntPtr to nint

Author: dorssel

Usbipd/AttachedEndpoint.cs

@@ -334,7 +334,7 @@ public async Task HandleSubmitAsync(UsbIpHeaderBasic basic, UsbIpHeaderCmdSubmit
             }
             else
             {
-                urb.buf = IntPtr.Zero;
+                urb.buf = 0;
                 StructToBytes(urb, bytes);
                 ioctl = Device.IoControlAsync(SUPUSB_IOCTL.SEND_URB, bytes, bytes);
             }

Usbipd/ConnectedClient.cs

@@ -231,7 +231,7 @@ async Task HandleRequestImportAsync(CancellationToken cancellationToken)
                         {
                             case CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVEPENDING:
                             case CM_NOTIFY_ACTION.CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE:
-                                PInvoke.SetEvent((HANDLE)(IntPtr)context);
+                                PInvoke.SetEvent((HANDLE)(nint)context);
                                 break;
                         }
                         return (uint)WIN32_ERROR.ERROR_SUCCESS;

Usbipd/Interop/VBoxUsb.cs

@@ -109,7 +109,7 @@ public struct UsbSupUrb
         public UsbSupXferFlags flags;          /* [in] USBSUP_FLAG_XXX */
         public UsbSupError error;          /* [out] USBSUP_XFER_XXX */
         public ulong len;            /* [in/out] may change */
-        public IntPtr buf;           /* [in/out] depends on dir */
+        public nint buf;           /* [in/out] depends on dir */
         public uint numIsoPkts;     /* [in] number of isochronous packets (8 max) */
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
         public UsbSupIsoPkt[] aIsoPkts;    /* [in/out] isochronous packet descriptors */

Usbipd/Tools.cs

@@ -56,7 +56,7 @@ public static void StructToBytes<T>(in T s, Span<byte> bytes) where T : struct
         {
             fixed (byte* dst = bytes)
             {
-                Marshal.StructureToPtr(s, (IntPtr)dst, false);
+                Marshal.StructureToPtr(s, (nint)dst, false);
             }
         }
     }
@@ -79,7 +79,7 @@ public static byte[] StructToBytes<T>(in T s) where T : struct
         {
             fixed (byte* src = bytes)
             {
-                s = Marshal.PtrToStructure<T>((IntPtr)src);
+                s = Marshal.PtrToStructure<T>((nint)src);
             }
         }
     }