Merge pull request #68776 from bruvzg/win_sysfont_case

[Windows] Use case-sensitive file names for the system fonts to avoid warnings.
This commit is contained in:
Rémi Verschelde 2022-11-17 11:57:11 +01:00
commit 424a16d108
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -849,7 +849,19 @@ String OS_Windows::get_system_font_path(const String &p_font_name, bool p_bold,
if (FAILED(hr)) {
continue;
}
return String::utf16((const char16_t *)&file_path[0]);
String fpath = String::utf16((const char16_t *)&file_path[0]);
WIN32_FIND_DATAW d;
HANDLE fnd = FindFirstFileW((LPCWSTR)&file_path[0], &d);
if (fnd != INVALID_HANDLE_VALUE) {
String fname = String::utf16((const char16_t *)d.cFileName);
if (!fname.is_empty()) {
fpath = fpath.get_base_dir().path_join(fname);
}
FindClose(fnd);
}
return fpath;
}
return String();
}