Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USERINIT]: Addendum to r72821 + demote to WARNing the displayed message if the installer could not be started.

Browse source 
svn path=/trunk/; revision=72822
This commit is contained in:
Hermès Bélusca-Maïto 2016-09-26 22:47:25 +00:00
parent 0a81885192
commit 6c90c67259
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/base/system/userinit/userinit.c
View file

@ -273,7 +273,7 @@ static BOOL
StartShell(VOID) StartShell(VOID)
{ {
WCHAR Shell[MAX_PATH]; WCHAR Shell[MAX_PATH];
TCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
DWORD Type, Size; DWORD Type, Size;
DWORD Value = 0; DWORD Value = 0;
LONG rc; LONG rc;
@ -375,8 +375,8 @@ StartShell(VOID)
if (!TryToStartShell(Shell)) if (!TryToStartShell(Shell))
{ {
WARN("Failed to start default shell %s\n", debugstr_w(Shell)); WARN("Failed to start default shell %s\n", debugstr_w(Shell));
LoadString( GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg)); LoadStringW(GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg));
MessageBox(NULL, szMsg, NULL, MB_OK); MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -562,7 +562,7 @@ StartInstaller(VOID)
if (!TryToStartShell(Shell)) if (!TryToStartShell(Shell))
{ {
ERR("Failed to start the installer: %s\n", debugstr_w(Shell)); WARN("Failed to start the installer: %s\n", debugstr_w(Shell));
LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg)); LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, ARRAYSIZE(szMsg));
MessageBoxW(NULL, szMsg, NULL, MB_OK); MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE; return FALSE;