Merge pull request #40999 from bruvzg/ctl_string_to_utf32

[Complex Test Layouts] Refactor `String` to use UTF-32 encoding.

6 files changed, 18 insertions, 72 deletions

diff --git a/modules/mono/editor/script_class_parser.cpp b/modules/mono/editor/script_class_parser.cpp
index 430c82953e..f7d6e7e302 100644
--- a/modules/mono/editor/script_class_parser.cpp
+++ b/modules/mono/editor/script_class_parser.cpp
@@ -151,7 +151,7 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 			case '"': {
 				bool verbatim = idx != 0 && code[idx - 1] == '@';
 
-				CharType begin_str = code[idx];
+				char32_t begin_str = code[idx];
 				idx++;
 				String tk_string = String();
 				while (true) {
@@ -170,13 +170,13 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 					} else if (code[idx] == '\\' && !verbatim) {
 						//escaped characters...
 						idx++;
-						CharType next = code[idx];
+						char32_t next = code[idx];
 						if (next == 0) {
 							error_str = "Unterminated String";
 							error = true;
 							return TK_ERROR;
 						}
-						CharType res = 0;
+						char32_t res = 0;
 
 						switch (next) {
 							case 'b':
@@ -234,7 +234,7 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 
 				if (code[idx] == '-' || (code[idx] >= '0' && code[idx] <= '9')) {
 					//a number
-					const CharType *rptr;
+					const char32_t *rptr;
 					double number = String::to_float(&code[idx], &rptr);
 					idx += (rptr - &code[idx]);
 					value = number;
diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp
index 6d7d5f76cd..c460e283ea 100644
--- a/modules/mono/mono_gd/gd_mono_marshal.cpp
+++ b/modules/mono/mono_gd/gd_mono_marshal.cpp
@@ -311,44 +311,6 @@ bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_
 	return false;
 }
 
-String mono_to_utf8_string(MonoString *p_mono_string) {
-	MonoError error;
-	char *utf8 = mono_string_to_utf8_checked(p_mono_string, &error);
-
-	if (!mono_error_ok(&error)) {
-		ERR_PRINT(String() + "Failed to convert MonoString* to UTF-8: '" + mono_error_get_message(&error) + "'.");
-		mono_error_cleanup(&error);
-		return String();
-	}
-
-	String ret = String::utf8(utf8);
-
-	mono_free(utf8);
-
-	return ret;
-}
-
-String mono_to_utf16_string(MonoString *p_mono_string) {
-	int len = mono_string_length(p_mono_string);
-	String ret;
-
-	if (len == 0) {
-		return ret;
-	}
-
-	ret.resize(len + 1);
-	ret.set(len, 0);
-
-	CharType *src = (CharType *)mono_string_chars(p_mono_string);
-	CharType *dst = ret.ptrw();
-
-	for (int i = 0; i < len; i++) {
-		dst[i] = src[i];
-	}
-
-	return ret;
-}
-
 MonoObject *variant_to_mono_object(const Variant *p_var) {
 	ManagedType type;
 
diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h
index 4ff330fd43..a1fd975916 100644
--- a/modules/mono/mono_gd/gd_mono_marshal.h
+++ b/modules/mono/mono_gd/gd_mono_marshal.h
@@ -69,15 +69,11 @@ bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_
 
 // String
 
-String mono_to_utf8_string(MonoString *p_mono_string);
-String mono_to_utf16_string(MonoString *p_mono_string);
-
 _FORCE_INLINE_ String mono_string_to_godot_not_null(MonoString *p_mono_string) {
-	if constexpr (sizeof(CharType) == 2) {
-		return mono_to_utf16_string(p_mono_string);
-	}
-
-	return mono_to_utf8_string(p_mono_string);
+	char32_t *utf32 = (char32_t *)mono_string_to_utf32(p_mono_string);
+	String ret = String(utf32);
+	mono_free(utf32);
+	return ret;
 }
 
 _FORCE_INLINE_ String mono_string_to_godot(MonoString *p_mono_string) {
@@ -88,20 +84,8 @@ _FORCE_INLINE_ String mono_string_to_godot(MonoString *p_mono_string) {
 	return mono_string_to_godot_not_null(p_mono_string);
 }
 
-_FORCE_INLINE_ MonoString *mono_from_utf8_string(const String &p_string) {
-	return mono_string_new(mono_domain_get(), p_string.utf8().get_data());
-}
-
-_FORCE_INLINE_ MonoString *mono_from_utf16_string(const String &p_string) {
-	return mono_string_from_utf16((mono_unichar2 *)p_string.c_str());
-}
-
 _FORCE_INLINE_ MonoString *mono_string_from_godot(const String &p_string) {
-	if constexpr (sizeof(CharType) == 2) {
-		return mono_from_utf16_string(p_string);
-	}
-
-	return mono_from_utf8_string(p_string);
+	return mono_string_from_utf32((mono_unichar4 *)(p_string.get_data()));
 }
 
 // Variant
diff --git a/modules/mono/utils/mono_reg_utils.cpp b/modules/mono/utils/mono_reg_utils.cpp
index e0cf916a01..a619f0b975 100644
--- a/modules/mono/utils/mono_reg_utils.cpp
+++ b/modules/mono/utils/mono_reg_utils.cpp
@@ -71,12 +71,12 @@ LONG _RegKeyQueryString(HKEY hKey, const String &p_value_name, String &r_value)
 	buffer.resize(512);
 	DWORD dwBufferSize = buffer.size();
 
-	LONG res = RegQueryValueExW(hKey, p_value_name.c_str(), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
+	LONG res = RegQueryValueExW(hKey, (LPCWSTR)(p_value_name.utf16().get_data()), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
 
 	if (res == ERROR_MORE_DATA) {
 		// dwBufferSize now contains the actual size
 		buffer.resize(dwBufferSize);
-		res = RegQueryValueExW(hKey, p_value_name.c_str(), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
+		res = RegQueryValueExW(hKey, (LPCWSTR)(p_value_name.utf16().get_data()), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
 	}
 
 	if (res == ERROR_SUCCESS) {
@@ -90,7 +90,7 @@ LONG _RegKeyQueryString(HKEY hKey, const String &p_value_name, String &r_value)
 
 LONG _find_mono_in_reg(const String &p_subkey, MonoRegInfo &r_info, bool p_old_reg = false) {
 	HKEY hKey;
-	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, p_subkey.c_str(), &hKey);
+	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
 
 	if (res != ERROR_SUCCESS)
 		goto cleanup;
@@ -127,7 +127,7 @@ LONG _find_mono_in_reg_old(const String &p_subkey, MonoRegInfo &r_info) {
 	String default_clr;
 
 	HKEY hKey;
-	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, p_subkey.c_str(), &hKey);
+	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
 
 	if (res != ERROR_SUCCESS)
 		goto cleanup;
diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp
index ccfaf5aba7..d91dcb5981 100644
--- a/modules/mono/utils/path_utils.cpp
+++ b/modules/mono/utils/path_utils.cpp
@@ -86,7 +86,7 @@ String abspath(const String &p_path) {
 String realpath(const String &p_path) {
 #ifdef WINDOWS_ENABLED
 	// Open file without read/write access
-	HANDLE hFile = ::CreateFileW(p_path.c_str(), 0,
+	HANDLE hFile = ::CreateFileW((LPCWSTR)(p_path.utf16().get_data()), 0,
 			FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 			nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 
@@ -130,7 +130,7 @@ String join(const String &p_a, const String &p_b) {
 		return p_b;
 	}
 
-	const CharType a_last = p_a[p_a.length() - 1];
+	const char32_t a_last = p_a[p_a.length() - 1];
 	if ((a_last == '/' || a_last == '\\') ||
 			(p_b.size() > 0 && (p_b[0] == '/' || p_b[0] == '\\'))) {
 		return p_a + p_b;
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp
index f8d9804de4..65da4328f6 100644
--- a/modules/mono/utils/string_utils.cpp
+++ b/modules/mono/utils/string_utils.cpp
@@ -49,7 +49,7 @@ int sfind(const String &p_text, int p_from) {
 		return -1;
 	}
 
-	const CharType *src = p_text.c_str();
+	const char32_t *src = p_text.get_data();
 
 	for (int i = p_from; i <= (len - src_len); i++) {
 		bool found = true;
@@ -64,7 +64,7 @@ int sfind(const String &p_text, int p_from) {
 					found = src[read_pos] == '%';
 					break;
 				case 1: {
-					CharType c = src[read_pos];
+					char32_t c = src[read_pos];
 					found = src[read_pos] == 's' || (c >= '0' && c <= '4');
 					break;
 				}
@@ -121,7 +121,7 @@ String sformat(const String &p_text, const Variant &p1, const Variant &p2, const
 	int result = 0;
 
 	while ((result = sfind(p_text, search_from)) >= 0) {
-		CharType c = p_text[result + 1];
+		char32_t c = p_text[result + 1];
 
 		int req_index = (c == 's' ? findex++ : c - '0');