wip

Author: FaithBeam

LibCurlImpersonate/LibCurl.cs

@@ -52,16 +52,57 @@ internal static partial int curl_easy_impersonate(
         int defaultHeaders
     );
 
+    private static readonly bool _isMacOsArm64 =
+        RuntimeInformation.IsOSPlatform(OSPlatform.OSX)
+        && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
+
+    // curl_easy_setopt is variadic in C. On both x64 (R8) and ARM64/AAPCS64 (x2),
+    // the 3rd argument is passed in the first available register — no stack padding needed.
+    [LibraryImport(
+        Lib,
+        EntryPoint = "curl_easy_setopt",
+        StringMarshalling = StringMarshalling.Utf8
+    )]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int setopt_str_impl(IntPtr h, int opt, string value);
+
+    [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int setopt_long_impl(IntPtr h, int opt, long value);
+
+    [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int setopt_ptr_impl(IntPtr h, int opt, IntPtr value);
+
+    [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int setopt_cb_impl(
+        IntPtr h,
+        int opt,
+        [MarshalAs(UnmanagedType.FunctionPtr)] WriteCallback value
+    );
+
+    [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int setopt_xcb_impl(
+        IntPtr h,
+        int opt,
+        [MarshalAs(UnmanagedType.FunctionPtr)] XferInfoCallback value
+    );
+
+    [LibraryImport(Lib, EntryPoint = "curl_easy_getinfo")]
+    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
+    private static partial int getinfo_long_impl(IntPtr h, int info, out long value);
+
     // ARM64 calling convention fix: fill x2-x7 with dummy zeros so the real value
     // lands on the stack at [old_sp], which is where Curl_vsetopt reads it from.
-
     [LibraryImport(
         Lib,
         EntryPoint = "curl_easy_setopt",
         StringMarshalling = StringMarshalling.Utf8
     )]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int setopt_str_impl(
+    private static partial int setopt_str_macos_arm64_impl(
         IntPtr h,
         int opt,
         nint _2,
@@ -75,7 +116,7 @@ string value
 
     [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int setopt_long_impl(
+    private static partial int setopt_long_macos_arm64_impl(
         IntPtr h,
         int opt,
         nint _2,
@@ -89,7 +130,7 @@ long value
 
     [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int setopt_ptr_impl(
+    private static partial int setopt_ptr_macos_arm64_impl(
         IntPtr h,
         int opt,
         nint _2,
@@ -103,7 +144,7 @@ IntPtr value
 
     [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int setopt_cb_impl(
+    private static partial int setopt_cb_macos_arm64_impl(
         IntPtr h,
         int opt,
         nint _2,
@@ -117,7 +158,7 @@ private static partial int setopt_cb_impl(
 
     [LibraryImport(Lib, EntryPoint = "curl_easy_setopt")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int setopt_xcb_impl(
+    private static partial int setopt_xcb_macos_arm64_impl(
         IntPtr h,
         int opt,
         nint _2,
@@ -131,7 +172,7 @@ private static partial int setopt_xcb_impl(
 
     [LibraryImport(Lib, EntryPoint = "curl_easy_getinfo")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    private static partial int getinfo_long_impl(
+    private static partial int getinfo_long_macos_arm64_impl(
         IntPtr h,
         int info,
         nint _2,
@@ -144,22 +185,34 @@ out long value
     );
 
     internal static int curl_easy_getinfo_long(IntPtr h, int info, out long value) =>
-        getinfo_long_impl(h, info, 0, 0, 0, 0, 0, 0, out value);
+        _isMacOsArm64
+            ? getinfo_long_macos_arm64_impl(h, info, 0, 0, 0, 0, 0, 0, out value)
+            : getinfo_long_impl(h, info, out value);
 
     internal static int curl_easy_setopt_str(IntPtr h, int opt, string v) =>
-        setopt_str_impl(h, opt, 0, 0, 0, 0, 0, 0, v);
+        _isMacOsArm64
+            ? setopt_str_macos_arm64_impl(h, opt, 0, 0, 0, 0, 0, 0, v)
+            : setopt_str_impl(h, opt, v);
 
     internal static int curl_easy_setopt_long(IntPtr h, int opt, long v) =>
-        setopt_long_impl(h, opt, 0, 0, 0, 0, 0, 0, v);
+        _isMacOsArm64
+            ? setopt_long_macos_arm64_impl(h, opt, 0, 0, 0, 0, 0, 0, v)
+            : setopt_long_impl(h, opt, v);
 
     internal static int curl_easy_setopt_ptr(IntPtr h, int opt, IntPtr v) =>
-        setopt_ptr_impl(h, opt, 0, 0, 0, 0, 0, 0, v);
+        _isMacOsArm64
+            ? setopt_ptr_macos_arm64_impl(h, opt, 0, 0, 0, 0, 0, 0, v)
+            : setopt_ptr_impl(h, opt, v);
 
     internal static int curl_easy_setopt_cb(IntPtr h, int opt, WriteCallback v) =>
-        setopt_cb_impl(h, opt, 0, 0, 0, 0, 0, 0, v);
+        _isMacOsArm64
+            ? setopt_cb_macos_arm64_impl(h, opt, 0, 0, 0, 0, 0, 0, v)
+            : setopt_cb_impl(h, opt, v);
 
     internal static int curl_easy_setopt_xcb(IntPtr h, int opt, XferInfoCallback v) =>
-        setopt_xcb_impl(h, opt, 0, 0, 0, 0, 0, 0, v);
+        _isMacOsArm64
+            ? setopt_xcb_macos_arm64_impl(h, opt, 0, 0, 0, 0, 0, 0, v)
+            : setopt_xcb_impl(h, opt, v);
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate nuint WriteCallback(IntPtr data, nuint size, nuint nmemb, IntPtr userdata);