From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Mon, 26 Sep 2016 22:47:25 +0000 (+0000)
Subject: [USERINIT]: Addendum to r72821 + demote to WARNing the displayed message if the insta... 
X-Git-Tag: ReactOS-0.4.3~233
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=6c90c67259d6878776b7b1b42843190c9ab4369b;ds=sidebyside

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

svn path=/trunk/; revision=72822
---

diff --git a/reactos/base/system/userinit/userinit.c b/reactos/base/system/userinit/userinit.c
index 3bcfe28a0fa..d154f5b3236 100644
--- a/reactos/base/system/userinit/userinit.c
+++ b/reactos/base/system/userinit/userinit.c
@@ -273,7 +273,7 @@ static BOOL
 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 @@ StartShell(VOID)
     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 @@ StartInstaller(VOID)
 
     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;