Author: hbelusca
Date: Mon Sep 26 22:47:25 2016
New Revision: 72822
URL:
http://svn.reactos.org/svn/reactos?rev=72822&view=rev
Log:
[USERINIT]: Addendum to r72821 + demote to WARNing the displayed message if the installer
could not be started.
Modified:
trunk/reactos/base/system/userinit/userinit.c
Modified: trunk/reactos/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon Sep 26 22:47:25 2016
@@ -273,7 +273,7 @@
StartShell(VOID)
{
WCHAR Shell[MAX_PATH];
- TCHAR szMsg[RC_STRING_MAX_SIZE];
+ WCHAR szMsg[RC_STRING_MAX_SIZE];
DWORD Type, Size;
DWORD Value = 0;
LONG rc;
@@ -375,8 +375,8 @@
if (!TryToStartShell(Shell))
{
WARN("Failed to start default shell %s\n", debugstr_w(Shell));
- LoadString( GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg));
- MessageBox(NULL, szMsg, NULL, MB_OK);
+ LoadStringW(GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, ARRAYSIZE(szMsg));
+ MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE;
}
return TRUE;
@@ -562,7 +562,7 @@
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));
MessageBoxW(NULL, szMsg, NULL, MB_OK);
return FALSE;