ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-10 23:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Rewrite] Cast int32 overloads to native int

Browse source 
Int32 parameters should be converted to native int when
the native signature expects the latter.
This commit is contained in:
thefiddler 2014-09-01 18:09:46 +02:00
parent 680a5eef3c
commit 074a4ff807
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/Generator.Rewrite/Program.cs
View file

@ -260,7 +260,7 @@ namespace OpenTK.Rewrite
// Patch convenience wrappers // Patch convenience wrappers
if (wrapper.Parameters.Count == native.Parameters.Count) if (wrapper.Parameters.Count == native.Parameters.Count)
{ {
EmitParameters(wrapper, body, il); EmitParameters(wrapper, native, body, il);
} }
else else
{ {
@ -715,7 +715,7 @@ namespace OpenTK.Rewrite
// return result; // return result;
// } // }
body.Variables.Add(new VariableDefinition(wrapper.ReturnType)); body.Variables.Add(new VariableDefinition(wrapper.ReturnType));
EmitParameters(wrapper, body, il); EmitParameters(wrapper, native, body, il);
il.Emit(OpCodes.Ldloca, body.Variables.Count - 1); il.Emit(OpCodes.Ldloca, body.Variables.Count - 1);
} }
else else
@ -743,7 +743,7 @@ namespace OpenTK.Rewrite
} }
} }
static int EmitParameters(MethodDefinition method, MethodBody body, ILProcessor il) static int EmitParameters(MethodDefinition method, MethodDefinition native, MethodBody body, ILProcessor il)
{ {
int i; int i;
for (i = 0; i < method.Parameters.Count; i++) for (i = 0; i < method.Parameters.Count; i++)
@ -752,7 +752,13 @@ namespace OpenTK.Rewrite
var p = method.Module.Import(method.Parameters[i].ParameterType); var p = method.Module.Import(method.Parameters[i].ParameterType);
il.Emit(OpCodes.Ldarg, i); il.Emit(OpCodes.Ldarg, i);
if (p.Name == "StringBuilder") if (p.Name.Contains("Int32") && native.Parameters[i].ParameterType.Name.Contains("IntPtr"))
{
// This is a convenience Int32 overload for an IntPtr (size_t) parameter.
// We need to convert the loaded argument to IntPtr.
il.Emit(OpCodes.Conv_I);
}
else if (p.Name == "StringBuilder")
{ {
EmitStringBuilderParameter(method, parameter, body, il); EmitStringBuilderParameter(method, parameter, body, il);
} }