seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104556 from Ivorforce/string-extend-instead-of-parse

Browse Source 
Use `append_` instead of `parse_` for `String` methods.
This commit is contained in:
Thaddeus Crews
2025-03-29 10:16:33 -05:00
parent 6bab3c07fc ffa6ef220b
commit 780cf03051
62 changed files with 245 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/display_server_windows.cpp
View File

@ -981,7 +981,7 @@ String DisplayServerWindows::clipboard_get() const {
if (mem != nullptr) {
LPTSTR ptr = (LPTSTR)GlobalLock(mem);
if (ptr != nullptr) {
ret.parse_utf8((const char *)ptr);
ret.append_utf8((const char *)ptr);
GlobalUnlock(mem);
}
}
@ -2761,7 +2761,7 @@ String DisplayServerWindows::ime_get_text() const {
int32_t length = ImmGetCompositionStringW(wd.im_himc, GCS_COMPSTR, nullptr, 0);
wchar_t *string = reinterpret_cast<wchar_t *>(memalloc(length));
ImmGetCompositionStringW(wd.im_himc, GCS_COMPSTR, string, length);
ret.parse_utf16((char16_t *)string, length / sizeof(wchar_t));
ret.append_utf16((char16_t *)string, length / sizeof(wchar_t));
memdelete(string);

5
platform/windows/windows_utils.cpp
View File

@ -136,7 +136,7 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
}
String utf_path;
Error err = utf_path.parse_utf8(raw_pdb_path);
Error err = utf_path.append_utf8(raw_pdb_path);
ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to read PDB path from '%s'.", p_dll_path));
pdb_info.path = utf_path;
@ -179,7 +179,8 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
if (new_expected_buffer_size > original_path_size) {
ERR_FAIL_COND_V_MSG(original_path_size < min_base_size + suffix_size, FAILED, vformat("The original PDB path size in bytes is too small: '%s'. Expected size: %d or more bytes, but available %d.", pdb_info.path, min_base_size + suffix_size, original_path_size));
new_pdb_base_name.parse_utf8(utf8_name, original_path_size - suffix_size);
new_pdb_base_name.clear();
new_pdb_base_name.append_utf8(utf8_name, original_path_size - suffix_size);
new_pdb_base_name[new_pdb_base_name.length() - 1] = '_'; // Restore the last '_'
WARN_PRINT(vformat("The original path size of '%s' in bytes was too small to fit the new name, so it was shortened to '%s%d.pdb'.", pdb_info.path, new_pdb_base_name, max_pdb_names - 1));
}