13 files changed, 114 insertions, 122 deletions

diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp
index 424b74906f..e98ce8f6c1 100644
--- a/modules/mono/mono_gd/gd_mono.cpp
+++ b/modules/mono/mono_gd/gd_mono.cpp
@@ -643,7 +643,7 @@ bool GDMono::copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const
 
 	// Create destination directory if needed
 	if (!DirAccess::exists(dst_dir)) {
-		DirAccessRef da = DirAccess::create_for_path(dst_dir);
+		Ref<DirAccess> da = DirAccess::create_for_path(dst_dir);
 		Error err = da->make_dir_recursive(dst_dir);
 
 		if (err != OK) {
@@ -652,7 +652,7 @@ bool GDMono::copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const
 		}
 	}
 
-	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 
 	String xml_file = assembly_name + ".xml";
 	if (da->copy(src_dir.plus_file(xml_file), dst_dir.plus_file(xml_file)) != OK) {
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index aab0b31c37..51fd0f8483 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -94,16 +94,16 @@ private:
 
 	UnhandledExceptionPolicy unhandled_exception_policy;
 
-	MonoDomain *root_domain;
-	MonoDomain *scripts_domain;
+	MonoDomain *root_domain = nullptr;
+	MonoDomain *scripts_domain = nullptr;
 
 	HashMap<int32_t, HashMap<String, GDMonoAssembly *>> assemblies;
 
-	GDMonoAssembly *corlib_assembly;
-	GDMonoAssembly *project_assembly;
+	GDMonoAssembly *corlib_assembly = nullptr;
+	GDMonoAssembly *project_assembly = nullptr;
 #ifdef TOOLS_ENABLED
-	GDMonoAssembly *tools_assembly;
-	GDMonoAssembly *tools_project_editor_assembly;
+	GDMonoAssembly *tools_assembly = nullptr;
+	GDMonoAssembly *tools_project_editor_assembly = nullptr;
 #endif
 
 	LoadedApiAssembly core_api_assembly;
@@ -150,7 +150,7 @@ private:
 	void _init_godot_api_hashes();
 	void _init_exception_policy();
 
-	GDMonoLog *gdmono_log;
+	GDMonoLog *gdmono_log = nullptr;
 
 #if defined(WINDOWS_ENABLED) && defined(TOOLS_ENABLED)
 	MonoRegInfo mono_reg_info;
@@ -250,7 +250,7 @@ public:
 namespace gdmono {
 
 class ScopeDomain {
-	MonoDomain *prev_domain;
+	MonoDomain *prev_domain = nullptr;
 
 public:
 	ScopeDomain(MonoDomain *p_domain) {
@@ -270,7 +270,7 @@ public:
 };
 
 class ScopeExitDomainUnload {
-	MonoDomain *domain;
+	MonoDomain *domain = nullptr;
 
 public:
 	ScopeExitDomainUnload(MonoDomain *p_domain) :
diff --git a/modules/mono/mono_gd/gd_mono_assembly.h b/modules/mono/mono_gd/gd_mono_assembly.h
index b25d773be7..a96357b082 100644
--- a/modules/mono/mono_gd/gd_mono_assembly.h
+++ b/modules/mono/mono_gd/gd_mono_assembly.h
@@ -68,8 +68,8 @@ class GDMonoAssembly {
 	};
 
 	String name;
-	MonoImage *image;
-	MonoAssembly *assembly;
+	MonoImage *image = nullptr;
+	MonoAssembly *assembly = nullptr;
 
 	bool attrs_fetched = false;
 	MonoCustomAttrInfo *attributes = nullptr;
diff --git a/modules/mono/mono_gd/gd_mono_cache.h b/modules/mono/mono_gd/gd_mono_cache.h
index 49f47b0a15..4000342c94 100644
--- a/modules/mono/mono_gd/gd_mono_cache.h
+++ b/modules/mono/mono_gd/gd_mono_cache.h
@@ -41,91 +41,91 @@ struct CachedData {
 	// corlib classes
 
 	// Let's use the no-namespace format for these too
-	GDMonoClass *class_MonoObject; // object
-	GDMonoClass *class_bool; // bool
-	GDMonoClass *class_int8_t; // sbyte
-	GDMonoClass *class_int16_t; // short
-	GDMonoClass *class_int32_t; // int
-	GDMonoClass *class_int64_t; // long
-	GDMonoClass *class_uint8_t; // byte
-	GDMonoClass *class_uint16_t; // ushort
-	GDMonoClass *class_uint32_t; // uint
-	GDMonoClass *class_uint64_t; // ulong
-	GDMonoClass *class_float; // float
-	GDMonoClass *class_double; // double
-	GDMonoClass *class_String; // string
-	GDMonoClass *class_IntPtr; // System.IntPtr
-
-	GDMonoClass *class_System_Collections_IEnumerable;
-	GDMonoClass *class_System_Collections_ICollection;
-	GDMonoClass *class_System_Collections_IDictionary;
+	GDMonoClass *class_MonoObject = nullptr; // object
+	GDMonoClass *class_bool = nullptr; // bool
+	GDMonoClass *class_int8_t = nullptr; // sbyte
+	GDMonoClass *class_int16_t = nullptr; // short
+	GDMonoClass *class_int32_t = nullptr; // int
+	GDMonoClass *class_int64_t = nullptr; // long
+	GDMonoClass *class_uint8_t = nullptr; // byte
+	GDMonoClass *class_uint16_t = nullptr; // ushort
+	GDMonoClass *class_uint32_t = nullptr; // uint
+	GDMonoClass *class_uint64_t = nullptr; // ulong
+	GDMonoClass *class_float = nullptr; // float
+	GDMonoClass *class_double = nullptr; // double
+	GDMonoClass *class_String = nullptr; // string
+	GDMonoClass *class_IntPtr = nullptr; // System.IntPtr
+
+	GDMonoClass *class_System_Collections_IEnumerable = nullptr;
+	GDMonoClass *class_System_Collections_ICollection = nullptr;
+	GDMonoClass *class_System_Collections_IDictionary = nullptr;
 
 #ifdef DEBUG_ENABLED
-	GDMonoClass *class_System_Diagnostics_StackTrace;
+	GDMonoClass *class_System_Diagnostics_StackTrace = nullptr;
 	GDMonoMethodThunkR<MonoArray *, MonoObject *> methodthunk_System_Diagnostics_StackTrace_GetFrames;
-	GDMonoMethod *method_System_Diagnostics_StackTrace_ctor_bool;
-	GDMonoMethod *method_System_Diagnostics_StackTrace_ctor_Exception_bool;
+	GDMonoMethod *method_System_Diagnostics_StackTrace_ctor_bool = nullptr;
+	GDMonoMethod *method_System_Diagnostics_StackTrace_ctor_Exception_bool = nullptr;
 #endif
 
-	GDMonoClass *class_KeyNotFoundException;
+	GDMonoClass *class_KeyNotFoundException = nullptr;
 
-	MonoClass *rawclass_Dictionary;
+	MonoClass *rawclass_Dictionary = nullptr;
 	// -----------------------------------------------
 
-	GDMonoClass *class_Vector2;
-	GDMonoClass *class_Vector2i;
-	GDMonoClass *class_Rect2;
-	GDMonoClass *class_Rect2i;
-	GDMonoClass *class_Transform2D;
-	GDMonoClass *class_Vector3;
-	GDMonoClass *class_Vector3i;
-	GDMonoClass *class_Basis;
-	GDMonoClass *class_Quaternion;
-	GDMonoClass *class_Transform3D;
-	GDMonoClass *class_AABB;
-	GDMonoClass *class_Color;
-	GDMonoClass *class_Plane;
-	GDMonoClass *class_StringName;
-	GDMonoClass *class_NodePath;
-	GDMonoClass *class_RID;
-	GDMonoClass *class_GodotObject;
-	GDMonoClass *class_GodotResource;
-	GDMonoClass *class_Node;
-	GDMonoClass *class_Control;
-	GDMonoClass *class_Node3D;
-	GDMonoClass *class_WeakRef;
-	GDMonoClass *class_Callable;
-	GDMonoClass *class_SignalInfo;
-	GDMonoClass *class_Array;
-	GDMonoClass *class_Dictionary;
-	GDMonoClass *class_MarshalUtils;
-	GDMonoClass *class_ISerializationListener;
+	GDMonoClass *class_Vector2 = nullptr;
+	GDMonoClass *class_Vector2i = nullptr;
+	GDMonoClass *class_Rect2 = nullptr;
+	GDMonoClass *class_Rect2i = nullptr;
+	GDMonoClass *class_Transform2D = nullptr;
+	GDMonoClass *class_Vector3 = nullptr;
+	GDMonoClass *class_Vector3i = nullptr;
+	GDMonoClass *class_Basis = nullptr;
+	GDMonoClass *class_Quaternion = nullptr;
+	GDMonoClass *class_Transform3D = nullptr;
+	GDMonoClass *class_AABB = nullptr;
+	GDMonoClass *class_Color = nullptr;
+	GDMonoClass *class_Plane = nullptr;
+	GDMonoClass *class_StringName = nullptr;
+	GDMonoClass *class_NodePath = nullptr;
+	GDMonoClass *class_RID = nullptr;
+	GDMonoClass *class_GodotObject = nullptr;
+	GDMonoClass *class_GodotResource = nullptr;
+	GDMonoClass *class_Node = nullptr;
+	GDMonoClass *class_Control = nullptr;
+	GDMonoClass *class_Node3D = nullptr;
+	GDMonoClass *class_WeakRef = nullptr;
+	GDMonoClass *class_Callable = nullptr;
+	GDMonoClass *class_SignalInfo = nullptr;
+	GDMonoClass *class_Array = nullptr;
+	GDMonoClass *class_Dictionary = nullptr;
+	GDMonoClass *class_MarshalUtils = nullptr;
+	GDMonoClass *class_ISerializationListener = nullptr;
 
 #ifdef DEBUG_ENABLED
-	GDMonoClass *class_DebuggingUtils;
+	GDMonoClass *class_DebuggingUtils = nullptr;
 	GDMonoMethodThunk<MonoObject *, MonoString **, int *, MonoString **> methodthunk_DebuggingUtils_GetStackFrameInfo;
 #endif
 
-	GDMonoClass *class_ExportAttribute;
-	GDMonoField *field_ExportAttribute_hint;
-	GDMonoField *field_ExportAttribute_hintString;
-	GDMonoClass *class_SignalAttribute;
-	GDMonoClass *class_ToolAttribute;
-	GDMonoClass *class_AnyPeerAttribute;
-	GDMonoClass *class_AuthorityAttribute;
-	GDMonoClass *class_GodotMethodAttribute;
-	GDMonoField *field_GodotMethodAttribute_methodName;
-	GDMonoClass *class_ScriptPathAttribute;
-	GDMonoField *field_ScriptPathAttribute_path;
-	GDMonoClass *class_AssemblyHasScriptsAttribute;
-	GDMonoField *field_AssemblyHasScriptsAttribute_requiresLookup;
-	GDMonoField *field_AssemblyHasScriptsAttribute_scriptTypes;
-
-	GDMonoField *field_GodotObject_ptr;
-	GDMonoField *field_StringName_ptr;
-	GDMonoField *field_NodePath_ptr;
-	GDMonoField *field_Image_ptr;
-	GDMonoField *field_RID_ptr;
+	GDMonoClass *class_ExportAttribute = nullptr;
+	GDMonoField *field_ExportAttribute_hint = nullptr;
+	GDMonoField *field_ExportAttribute_hintString = nullptr;
+	GDMonoClass *class_SignalAttribute = nullptr;
+	GDMonoClass *class_ToolAttribute = nullptr;
+	GDMonoClass *class_AnyPeerAttribute = nullptr;
+	GDMonoClass *class_AuthorityAttribute = nullptr;
+	GDMonoClass *class_GodotMethodAttribute = nullptr;
+	GDMonoField *field_GodotMethodAttribute_methodName = nullptr;
+	GDMonoClass *class_ScriptPathAttribute = nullptr;
+	GDMonoField *field_ScriptPathAttribute_path = nullptr;
+	GDMonoClass *class_AssemblyHasScriptsAttribute = nullptr;
+	GDMonoField *field_AssemblyHasScriptsAttribute_requiresLookup = nullptr;
+	GDMonoField *field_AssemblyHasScriptsAttribute_scriptTypes = nullptr;
+
+	GDMonoField *field_GodotObject_ptr = nullptr;
+	GDMonoField *field_StringName_ptr = nullptr;
+	GDMonoField *field_NodePath_ptr = nullptr;
+	GDMonoField *field_Image_ptr = nullptr;
+	GDMonoField *field_RID_ptr = nullptr;
 
 	GDMonoMethodThunk<MonoObject *> methodthunk_GodotObject_Dispose;
 	GDMonoMethodThunkR<Array *, MonoObject *> methodthunk_Array_GetPtr;
diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp
index 89c37e087b..3fc0f16e05 100644
--- a/modules/mono/mono_gd/gd_mono_class.cpp
+++ b/modules/mono/mono_gd/gd_mono_class.cpp
@@ -194,7 +194,7 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 
 #ifdef DEBUG_ENABLED
 		// For debug builds, we also fetched from native base classes as well before if this is not a native base class.
-		// This allows us to warn the user here if he is using snake_case by mistake.
+		// This allows us to warn the user here if they are using snake_case by mistake.
 
 		if (p_native_base != this) {
 			GDMonoClass *native_top = p_native_base;
diff --git a/modules/mono/mono_gd/gd_mono_class.h b/modules/mono/mono_gd/gd_mono_class.h
index bfb5797d4b..b32d561f61 100644
--- a/modules/mono/mono_gd/gd_mono_class.h
+++ b/modules/mono/mono_gd/gd_mono_class.h
@@ -70,11 +70,11 @@ class GDMonoClass {
 	StringName namespace_name;
 	StringName class_name;
 
-	MonoClass *mono_class;
-	GDMonoAssembly *assembly;
+	MonoClass *mono_class = nullptr;
+	GDMonoAssembly *assembly = nullptr;
 
 	bool attrs_fetched;
-	MonoCustomAttrInfo *attributes;
+	MonoCustomAttrInfo *attributes = nullptr;
 
 	// This contains both the original method names and remapped method names from the native Godot identifiers to the C# functions.
 	// Most method-related functions refer to this and it's possible this is unintuitive for outside users; this may be a prime location for refactoring or renaming.
diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h
index abcdef378c..87ef245f3f 100644
--- a/modules/mono/mono_gd/gd_mono_field.h
+++ b/modules/mono/mono_gd/gd_mono_field.h
@@ -36,14 +36,14 @@
 #include "i_mono_class_member.h"
 
 class GDMonoField : public IMonoClassMember {
-	GDMonoClass *owner;
-	MonoClassField *mono_field;
+	GDMonoClass *owner = nullptr;
+	MonoClassField *mono_field = nullptr;
 
 	StringName name;
 	ManagedType type;
 
 	bool attrs_fetched;
-	MonoCustomAttrInfo *attributes;
+	MonoCustomAttrInfo *attributes = nullptr;
 
 public:
 	virtual GDMonoClass *get_enclosing_class() const final { return owner; }
diff --git a/modules/mono/mono_gd/gd_mono_log.cpp b/modules/mono/mono_gd/gd_mono_log.cpp
index 01a6521876..6ea3c5539e 100644
--- a/modules/mono/mono_gd/gd_mono_log.cpp
+++ b/modules/mono/mono_gd/gd_mono_log.cpp
@@ -77,23 +77,20 @@ static String make_text(const char *log_domain, const char *log_level, const cha
 }
 
 void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *) {
-	FileAccess *f = GDMonoLog::get_singleton()->log_file;
-
 	if (GDMonoLog::get_singleton()->log_level_id >= get_log_level_id(log_level)) {
 		String text = make_text(log_domain, log_level, message);
 		text += "\n";
 
-		f->seek_end();
-		f->store_string(text);
+		GDMonoLog::get_singleton()->log_file->seek_end();
+		GDMonoLog::get_singleton()->log_file->store_string(text);
 	}
 
 	if (fatal) {
 		String text = make_text(log_domain, log_level, message);
 		ERR_PRINT("Mono: FATAL ERROR '" + text + "', ABORTING! Logfile: '" + GDMonoLog::get_singleton()->log_file_path + "'.");
 		// Make sure to flush before aborting
-		f->flush();
-		f->close();
-		memdelete(f);
+		GDMonoLog::get_singleton()->log_file->flush();
+		GDMonoLog::get_singleton()->log_file.unref();
 
 		abort();
 	}
@@ -101,8 +98,8 @@ void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level,
 
 bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
 	if (!DirAccess::exists(p_logs_dir)) {
-		DirAccessRef diraccess = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-		ERR_FAIL_COND_V(!diraccess, false);
+		Ref<DirAccess> diraccess = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+		ERR_FAIL_COND_V(diraccess.is_null(), false);
 		Error logs_mkdir_err = diraccess->make_dir_recursive(p_logs_dir);
 		ERR_FAIL_COND_V_MSG(logs_mkdir_err != OK, false, "Failed to create mono logs directory.");
 	}
@@ -113,8 +110,8 @@ bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
 void GDMonoLog::_delete_old_log_files(const String &p_logs_dir) {
 	static const uint64_t MAX_SECS = 5 * 86400; // 5 days
 
-	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	ERR_FAIL_COND(!da);
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	ERR_FAIL_COND(da.is_null());
 
 	Error err = da->change_dir(p_logs_dir);
 	ERR_FAIL_COND_MSG(err != OK, "Cannot change directory to '" + p_logs_dir + "'.");
@@ -170,7 +167,7 @@ void GDMonoLog::initialize() {
 		log_file_path = logs_dir.plus_file(log_file_name);
 
 		log_file = FileAccess::open(log_file_path, FileAccess::WRITE);
-		if (!log_file) {
+		if (log_file.is_null()) {
 			ERR_PRINT("Mono: Cannot create log file at: " + log_file_path);
 		}
 	}
@@ -178,7 +175,7 @@ void GDMonoLog::initialize() {
 	mono_trace_set_level_string(log_level.get_data());
 	log_level_id = get_log_level_id(log_level.get_data());
 
-	if (log_file) {
+	if (log_file.is_valid()) {
 		OS::get_singleton()->print("Mono: Log file is: '%s'\n", log_file_path.utf8().get_data());
 		mono_trace_set_log_handler(mono_log_callback, this);
 	} else {
@@ -192,11 +189,6 @@ GDMonoLog::GDMonoLog() {
 
 GDMonoLog::~GDMonoLog() {
 	singleton = nullptr;
-
-	if (log_file) {
-		log_file->close();
-		memdelete(log_file);
-	}
 }
 
 #else
diff --git a/modules/mono/mono_gd/gd_mono_log.h b/modules/mono/mono_gd/gd_mono_log.h
index 9aa67a09e2..9fc35f8e31 100644
--- a/modules/mono/mono_gd/gd_mono_log.h
+++ b/modules/mono/mono_gd/gd_mono_log.h
@@ -48,7 +48,7 @@ class GDMonoLog {
 #ifdef GD_MONO_LOG_ENABLED
 	int log_level_id = -1;
 
-	FileAccess *log_file = nullptr;
+	Ref<FileAccess> log_file;
 	String log_file_path;
 
 	bool _try_create_logs_dir(const String &p_logs_dir);
diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h
index 20d4743e5c..eb33c6119e 100644
--- a/modules/mono/mono_gd/gd_mono_marshal.h
+++ b/modules/mono/mono_gd/gd_mono_marshal.h
@@ -196,14 +196,14 @@ PackedVector3Array mono_array_to_PackedVector3Array(MonoArray *p_array);
 #pragma pack(push, 1)
 
 struct M_Callable {
-	MonoObject *target;
-	MonoObject *method_string_name;
-	MonoDelegate *delegate;
+	MonoObject *target = nullptr;
+	MonoObject *method_string_name = nullptr;
+	MonoDelegate *delegate = nullptr;
 };
 
 struct M_SignalInfo {
-	MonoObject *owner;
-	MonoObject *name_string_name;
+	MonoObject *owner = nullptr;
+	MonoObject *name_string_name = nullptr;
 };
 
 #pragma pack(pop)
diff --git a/modules/mono/mono_gd/gd_mono_method.h b/modules/mono/mono_gd/gd_mono_method.h
index 6e87a60ee2..be11ef5bfe 100644
--- a/modules/mono/mono_gd/gd_mono_method.h
+++ b/modules/mono/mono_gd/gd_mono_method.h
@@ -54,7 +54,7 @@ class GDMonoMethod : public IMonoClassMember {
 
 	friend class GDMonoClass;
 
-	MonoMethod *mono_method;
+	MonoMethod *mono_method = nullptr;
 
 public:
 	virtual GDMonoClass *get_enclosing_class() const final;
diff --git a/modules/mono/mono_gd/gd_mono_property.h b/modules/mono/mono_gd/gd_mono_property.h
index 003bcf05e1..6fc681aeb5 100644
--- a/modules/mono/mono_gd/gd_mono_property.h
+++ b/modules/mono/mono_gd/gd_mono_property.h
@@ -36,14 +36,14 @@
 #include "i_mono_class_member.h"
 
 class GDMonoProperty : public IMonoClassMember {
-	GDMonoClass *owner;
-	MonoProperty *mono_property;
+	GDMonoClass *owner = nullptr;
+	MonoProperty *mono_property = nullptr;
 
 	StringName name;
 	ManagedType type;
 
 	bool attrs_fetched;
-	MonoCustomAttrInfo *attributes;
+	MonoCustomAttrInfo *attributes = nullptr;
 
 	unsigned int param_buffer_size;
 
diff --git a/modules/mono/mono_gd/gd_mono_wasm_m2n.h b/modules/mono/mono_gd/gd_mono_wasm_m2n.h
index 68299aa984..83e2750e5a 100644
--- a/modules/mono/mono_gd/gd_mono_wasm_m2n.h
+++ b/modules/mono/mono_gd/gd_mono_wasm_m2n.h
@@ -47,11 +47,11 @@ struct Mono_InterpMethodArguments {
 	size_t ilen;
 	void **iargs;
 	size_t flen;
-	double *fargs;
+	double *fargs = nullptr;
 	void **retval;
 	size_t is_float_ret;
 	//#ifdef TARGET_WASM
-	void *sig;
+	void *sig = nullptr;
 	//#endif
 };
 } // extern "C"