[ros-diffs] [reactos] 01/01: [EXPLORER] Remove redundant bIsSystemShell assignments (#7542)

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51e5de1f856e69eb4cdb…

commit e51e5de1f856e69eb4cdb8d39e1b6aa847cf038c
Author:     Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Mon Dec 2 20:42:46 2024 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Dec 2 20:42:46 2024 +0100

    [EXPLORER] Remove redundant bIsSystemShell assignments (#7542)
    
    Addendum to commit df197bc42 (PR #7502)
    CORE-19887
---
 base/shell/explorer/explorer.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp
index d51a32976cc..140a1e93ffa 100644
--- a/base/shell/explorer/explorer.cpp
+++ b/base/shell/explorer/explorer.cpp
@@ -99,13 +99,9 @@ IsExplorerSystemShell()
     LPWSTR szExplorer = PathFindFileNameW(szPath);
 
     HKEY hKeyWinlogon;
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows
NT\\CurrentVersion\\Winlogon",
-                      0, KEY_READ, &hKeyWinlogon) != ERROR_SUCCESS)
-    {
-        // No registry access.
-        bIsSystemShell = TRUE;
-    }
-    else
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                      L"Software\\Microsoft\\Windows
NT\\CurrentVersion\\Winlogon",
+                      0, KEY_READ, &hKeyWinlogon) == ERROR_SUCCESS)
     {
         LSTATUS Status;
         DWORD dwType;
@@ -116,9 +112,7 @@ IsExplorerSystemShell()
         Status = RegQueryValueExW(hKeyWinlogon, L"Shell", 0, &dwType,
(LPBYTE)szShell, &cbShell);
         if (Status == ERROR_SUCCESS)
         {
-            if ((dwType == REG_SZ || dwType == REG_EXPAND_SZ) && StrStrI(szShell,
szExplorer))
-                bIsSystemShell = TRUE;
-            else
+            if ((dwType != REG_SZ && dwType != REG_EXPAND_SZ) ||
!StrStrIW(szShell, szExplorer))
                 bIsSystemShell = FALSE;
         }