lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-09 01:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[USERINIT] Minor nits for StartShell() and friends; remove shell32 dependency

Browse Source
This commit is contained in:
Hermès Bélusca-Maïto
2026-05-14 20:42:27 +02:00
parent f530cf99a0
commit 9f5b0f1761
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/system/userinit/CMakeLists.txt
View File

@@ -7,6 +7,6 @@ list(APPEND SOURCE
add_executable(userinit ${SOURCE} userinit.rc)
target_link_libraries(userinit wine)
set_module_type(userinit win32gui UNICODE)
add_importlibs(userinit user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
add_importlibs(userinit advapi32 gdi32 user32 msvcrt kernel32 ntdll)
add_pch(userinit userinit.h SOURCE)
add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all)

26
base/system/userinit/userinit.c
View File

@@ -215,12 +215,12 @@ StartProcess(
static BOOL
StartShell(VOID)
{
WCHAR Shell[MAX_PATH];
WCHAR szMsg[RC_STRING_MAX_SIZE];
DWORD Type, Size;
DWORD Value = 0;
LONG rc;
HKEY hKey;
WCHAR Shell[MAX_PATH];
WCHAR szMsg[RC_STRING_MAX_SIZE];
/* Safe Mode shell run */
rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
@@ -313,14 +313,14 @@ StartShell(VOID)
StringCchCatW(Shell, ARRAYSIZE(Shell), L"explorer.exe");
}
if (!StartProcess(Shell))
{
WARN("Failed to start default shell '%s'\n", debugstr_w(Shell));
LoadStringW(GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg));
MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE;
}
return TRUE;
if (StartProcess(Shell))
return TRUE;
/* We failed, display an error message and quit */
ERR("Failed to start default shell '%s'\n", debugstr_w(Shell));
LoadStringW(GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg));
MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE;
}
const WCHAR g_RegColorNames[][32] = {
@@ -599,7 +599,7 @@ ExpandInstallerPath(
}
/* Installer not found */
ERR("Couldn't find the installer '%s'.\n", debugstr_w(lpInstallerPath));
ERR("Couldn't find the installer '%s'\n", debugstr_w(lpInstallerPath));
*lpInstallerPath = UNICODE_NULL;
return FALSE;
}
@@ -617,8 +617,8 @@ StartInstaller(IN LPCWSTR lpInstallerName)
return TRUE;
}
/* We failed. Display an error message and quit. */
ERR("Failed to start the installer '%s'.\n", debugstr_w(Installer));
/* We failed, display an error message and quit */
ERR("Failed to start the installer '%s'\n", debugstr_w(Installer));
LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg));
MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE;