Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit46d56af

Browse files
authored
Merge pull request#550 from dmitriyse/core2-marshal-fix
Marshalling fix for 3-IntPtr args cdecl calls.
2 parents7f81b38 +580f13f commit46d56af

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

‎src/runtime/nativecall.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ internal class NativeCall
2727
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
2828
privatedelegatevoidVoid_1_Delegate(IntPtra1);
2929

30-
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
31-
privatedelegateIntPtrIntPtr_3_Delegate(IntPtra1,IntPtra2,IntPtra3);
32-
3330
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
3431
privatedelegateintInt_3_Delegate(IntPtra1,IntPtra2,IntPtra3);
3532

@@ -40,7 +37,8 @@ public static void Void_Call_1(IntPtr fp, IntPtr a1)
4037

4138
publicstaticIntPtrCall_3(IntPtrfp,IntPtra1,IntPtra2,IntPtra3)
4239
{
43-
return((IntPtr_3_Delegate)Marshal.GetDelegateForFunctionPointer(fp,typeof(IntPtr_3_Delegate)))(a1,a2,a3);
40+
vard=(Interop.TernaryFunc)Marshal.GetDelegateForFunctionPointer(fp,typeof(Interop.TernaryFunc));
41+
returnd(a1,a2,a3);
4442
}
4543

4644

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp