Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 17:38:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Remove redundant bIsSystemShell assignments (#7542)

Browse source 
Addendum to commit df197bc42 (PR #7502)
CORE-19887
This commit is contained in:
Serge Gautherie 2024-12-02 20:42:46 +01:00 committed by GitHub
parent 76014b92a4
commit e51e5de1f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
base/shell/explorer/explorer.cpp
View file

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