godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Style: Cleanup single-line blocks, semicolons, dead code

Browse Source 
Remove currently unused implementation of TextureBasisU, could be re-added
later on if needed and ported.
This commit is contained in:
Rémi Verschelde
2022-02-16 13:56:32 +01:00
parent f5b9cbaff6
commit b8b4580448
137 changed files with 847 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/mono/utils/mono_reg_utils.cpp
View File

@@ -60,8 +60,9 @@ REGSAM _get_bitness_sam() {
LONG _RegOpenKey(HKEY hKey, LPCWSTR lpSubKey, PHKEY phkResult) {
LONG res = RegOpenKeyExW(hKey, lpSubKey, 0, KEY_READ, phkResult);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
res = RegOpenKeyExW(hKey, lpSubKey, 0, KEY_READ | _get_bitness_sam(), phkResult);
}
return res;
}
@@ -92,31 +93,37 @@ LONG _find_mono_in_reg(const String &p_subkey, MonoRegInfo &r_info, bool p_old_r
HKEY hKey;
LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
if (!p_old_reg) {
res = _RegKeyQueryString(hKey, "Version", r_info.version);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
}
res = _RegKeyQueryString(hKey, "SdkInstallRoot", r_info.install_root_dir);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
res = _RegKeyQueryString(hKey, "FrameworkAssemblyDirectory", r_info.assembly_dir);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
res = _RegKeyQueryString(hKey, "MonoConfigDir", r_info.config_dir);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
if (r_info.install_root_dir.ends_with("\\"))
if (r_info.install_root_dir.ends_with("\\")) {
r_info.bin_dir = r_info.install_root_dir + "bin";
else
} else {
r_info.bin_dir = r_info.install_root_dir + "\\bin";
}
cleanup:
RegCloseKey(hKey);
@@ -129,8 +136,9 @@ LONG _find_mono_in_reg_old(const String &p_subkey, MonoRegInfo &r_info) {
HKEY hKey;
LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
res = _RegKeyQueryString(hKey, "DefaultCLR", default_clr);
@@ -147,11 +155,13 @@ cleanup:
MonoRegInfo find_mono() {
MonoRegInfo info;
if (_find_mono_in_reg("Software\\Mono", info) == ERROR_SUCCESS)
if (_find_mono_in_reg("Software\\Mono", info) == ERROR_SUCCESS) {
return info;
}
if (_find_mono_in_reg_old("Software\\Novell\\Mono", info) == ERROR_SUCCESS)
if (_find_mono_in_reg_old("Software\\Novell\\Mono", info) == ERROR_SUCCESS) {
return info;
}
return MonoRegInfo();
}
@@ -212,13 +222,15 @@ String find_msbuild_tools_path() {
HKEY hKey;
LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\14.0", &hKey);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
res = _RegKeyQueryString(hKey, "MSBuildToolsPath", msbuild_tools_path);
if (res != ERROR_SUCCESS)
if (res != ERROR_SUCCESS) {
goto cleanup;
}
cleanup:
RegCloseKey(hKey);

9
modules/mono/utils/path_utils.cpp
View File

@@ -57,8 +57,9 @@ String cwd() {
Char16String buffer;
buffer.resize((int)expected_size);
if (::GetCurrentDirectoryW(expected_size, (wchar_t *)buffer.ptrw()) == 0)
if (::GetCurrentDirectoryW(expected_size, (wchar_t *)buffer.ptrw()) == 0) {
return ".";
}
String result;
if (result.parse_utf16(buffer.ptr())) {
@@ -95,8 +96,9 @@ String realpath(const String &p_path) {
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (hFile == INVALID_HANDLE_VALUE)
if (hFile == INVALID_HANDLE_VALUE) {
return p_path;
}
const DWORD expected_size = ::GetFinalPathNameByHandleW(hFile, nullptr, 0, FILE_NAME_NORMALIZED);
@@ -177,8 +179,9 @@ String relative_to_impl(const String &p_path, const String &p_relative_to) {
#ifdef WINDOWS_ENABLED
String get_drive_letter(const String &p_norm_path) {
int idx = p_norm_path.find(":/");
if (idx != -1 && idx < p_norm_path.find("/"))
if (idx != -1 && idx < p_norm_path.find("/")) {
return p_norm_path.substr(0, idx + 1);
}
return String();
}
#endif