Merge pull request #28 from ghorsington/master

Author: 0x0ade

RuntimeDetour/Platforms/Runtime/DetourRuntimeILPlatform.cs

@@ -326,6 +326,11 @@ public bool TryCreateCopy(MethodBase method, out MethodInfo dm) {
             }
         }
 
+        private static bool IsStruct(Type t) {
+            if (t == null) return false;
+            return t.IsValueType && !t.IsPrimitive && !t.IsEnum;
+        }
+
         public MethodBase GetDetourTarget(MethodBase from, MethodBase to) {
             to = GetIdentifiable(to);
 
@@ -335,9 +340,9 @@ public MethodBase GetDetourTarget(MethodBase from, MethodBase to) {
             if (from is MethodInfo fromInfo && !from.IsStatic &&
                 to is MethodInfo toInfo && to.IsStatic &&
                 fromInfo.ReturnType == toInfo.ReturnType &&
-                fromInfo.ReturnType.IsValueType &&
+                IsStruct(fromInfo.ReturnType) &&
                 (glueThiscallStructRetPtr =
-                    from.DeclaringType?.IsValueType ?? false && from.GetParameters().Length == 0 ? GlueThiscallInStructRetPtr :
+                    IsStruct(from.DeclaringType) && from.GetParameters().Length == 0 ? GlueThiscallInStructRetPtr :
                     GlueThiscallStructRetPtr
                 ) != GlueThiscallStructRetPtrOrder.Original) {