Synchronize changes from 1.6 branch [ci skip]

27ebfbc Revert reg function changes (only for 1.7)

Author: github-actions[bot]

Client/core/CVersionUpdater.cpp

@@ -3155,20 +3155,8 @@ int CVersionUpdater::DoSendDownloadRequestToNextServer()
         iReqKB3035131 = IsHotFixInstalled("KB3035131") ? 0 : 1;
     }
 
-    int secureBootStatus = 0;
-    const SString secureBootValue =
-        GetSystemRegistryValue((uint)HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State", "UEFISecureBootEnabled", &secureBootStatus);
-    bool bSecureBootEnabled = false;
-    if (secureBootStatus > 0)
-    {
-        // Parse the registry value into a numeric flag
-        char* secureBootEnd = nullptr;
-        const long secureBootNumeric = strtol(secureBootValue.c_str(), &secureBootEnd, 10);
-        if (secureBootEnd != secureBootValue.c_str() && *secureBootEnd == '\0')
-        {
-            bSecureBootEnabled = secureBootNumeric != 0;
-        }
-    }
+    bool bSecureBootEnabled =
+        (GetSystemRegistryValue((uint)HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State", "UEFISecureBootEnabled") == "\x01");
     // Compile some system stats
     SDxStatus dxStatus;
     g_pGraphics->GetRenderItemManager()->GetDxStatus(dxStatus);

Client/core/DXHook/CProxyDirect3D9.cpp

@@ -350,20 +350,7 @@ HRESULT CProxyDirect3D9::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND
     #endif
 
     // Set dark titlebar if needed
-    int themeStatus = 0;
-    const SString appsUseLightTheme =
-        GetSystemRegistryValue((uint)HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", &themeStatus);
-    BOOL darkTitleBar = FALSE;
-    if (themeStatus > 0)
-    {
-        // Parse the registry value into a numeric flag
-        char* themeEnd = nullptr;
-        const long themeNumeric = strtol(appsUseLightTheme.c_str(), &themeEnd, 10);
-        if (themeEnd != appsUseLightTheme.c_str() && *themeEnd == '\0')
-        {
-            darkTitleBar = (themeNumeric == 0);
-        }
-    }
+    BOOL darkTitleBar = GetSystemRegistryValue((uint)HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme") == "\x0";
     DwmSetWindowAttribute(hFocusWindow, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkTitleBar, sizeof(darkTitleBar));
 
     // Update icon

Shared/sdk/SharedUtil.Misc.h

@@ -62,20 +62,20 @@ namespace SharedUtil
     SString GetMajorVersionString();
 
     // Get a system registry value
-    SString GetSystemRegistryValue(uint hKey, const SString& strPath, const SString& strName, int* iResult = nullptr);
+    SString GetSystemRegistryValue(uint hKey, const SString& strPath, const SString& strName);
 
     // Get/set registry values for the current version
     void    SetRegistryValue(const SString& strPath, const SString& strName, const SString& strValue, bool bFlush = false);
-    SString GetRegistryValue(const SString& strPath, const SString& strName, int* iResult = nullptr);
+    SString GetRegistryValue(const SString& strPath, const SString& strName);
     bool    RemoveRegistryKey(const SString& strPath);
 
     // Get/set registry values for a particular version
     void    SetVersionRegistryValue(const SString& strVersion, const SString& strPath, const SString& strName, const SString& strValue);
-    SString GetVersionRegistryValue(const SString& strVersion, const SString& strPath, const SString& strName, int* iResult = nullptr);
+    SString GetVersionRegistryValue(const SString& strVersion, const SString& strPath, const SString& strName);
 
     // Get/set registry values for all versions (Common)
     void    SetCommonRegistryValue(const SString& strPath, const SString& strName, const SString& strValue);
-    SString GetCommonRegistryValue(const SString& strPath, const SString& strName, int* iResult = nullptr);
+    SString GetCommonRegistryValue(const SString& strPath, const SString& strName);
 
     bool ShellExecuteBlocking(const SString& strAction, const SString& strFile, const SString& strParameters = "", const SString& strDirectory = "",
                               int nShowCmd = 1);