Merge branch 'praydog:master' into master

Author: joeyhodge

shared/sdk/RETypeDB.cpp

@@ -359,6 +359,25 @@ void* REField::get_data_raw(void* object, bool is_value_type) const {
             return Address{object}.get(this->get_offset_from_fieldptr());
         }
 
+#if TDB_VER >= 81
+        // Read fieldptr_offset from the object's own vtable, not from the
+        // declaring type's managed_vt. For abstract declaring types,
+        // get_managed_vt() walks up the parent chain and can return an
+        // ancestor's vtable with a WRONG fieldptr_offset. The object's
+        // vtable always has the correct value — this matches what the
+        // .NET runtime does in RuntimeFieldInfo.GetValue.
+        if (object != nullptr) try {
+            const auto vtable_ptr = *(uintptr_t*)object;
+            if (vtable_ptr != 0) {
+                const auto fieldptr_offset = *(int32_t*)(vtable_ptr - sizeof(void*));
+                return Address{object}.get(fieldptr_offset + this->get_offset_from_fieldptr());
+            }
+        } catch (...) {
+            // Occurs if consumer passes some bad object in. Need to look into this more.
+            return nullptr;
+        }
+#endif
+
         return Address{object}.get(this->get_offset_from_base());
     }
 

shared/sdk/RETypeDefinition.cpp

@@ -717,15 +717,15 @@ bool RETypeDefinition::is_by_ref() const {
     auto runtime_type = this->get_runtime_type();
 
     if (runtime_type == nullptr) {
-        g_by_ref_map[this] = true;
-        return true;
+        g_by_ref_map[this] = false;
+        return false;
     }
 
     auto runtime_typedef = utility::re_managed_object::get_type_definition(runtime_type);
 
     if (runtime_typedef == nullptr) {
-        g_by_ref_map[this] = true;
-        return true;
+        g_by_ref_map[this] = false;
+        return false;
     }
 
     static auto by_ref_method = runtime_typedef->get_method("get_IsByRef") != nullptr ?