From 16025312da15ba5f4f825d3f009cfb86b9b7c906 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 4 Aug 2005 10:41:58 +0000
Subject: [PATCH] compile welcome.exe as unicode application by default

svn path=/trunk/; revision=17042
---
 reactos/subsys/system/welcome/welcome.c   | 18 +++++++++---------
 reactos/subsys/system/welcome/welcome.xml |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/reactos/subsys/system/welcome/welcome.c b/reactos/subsys/system/welcome/welcome.c
index 2e8d37142fa..a048fc271da 100755
--- a/reactos/subsys/system/welcome/welcome.c
+++ b/reactos/subsys/system/welcome/welcome.c
@@ -176,7 +176,7 @@ WinMain(HINSTANCE hInst,
   rcRightPanel.right = ulInnerWidth - 1;
 
   if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80))
-    lstrcpy(szAppTitle, TEXT("ReactOS Welcome"));
+    _tcscpy(szAppTitle, TEXT("ReactOS Welcome"));
 
   /* Create main window */
   hwndMain = CreateWindow(szFrameClass,
@@ -248,13 +248,13 @@ RunApplication(int nTopic)
   if (nLength == 0)
     return TRUE;
 
-  if (!lstrcmpi(AppName, TEXT("<exit>")))
+  if (!_tcsicmp(AppName, TEXT("<exit>")))
     return FALSE;
 
-  if (lstrcmpi(AppName, TEXT("explorer.exe")) == 0)
+  if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0)
     {
-      lstrcat(AppName, TEXT(" "));
-      lstrcat(AppName, CurrentDir);
+      _tcscat(AppName, TEXT(" "));
+      _tcscat(AppName, CurrentDir);
     }
 
   memset(&StartupInfo, 0, sizeof(STARTUPINFO));
@@ -285,7 +285,7 @@ SubclassButton(HWND hWnd)
 static DWORD
 GetButtonHeight(HDC hDC,
 		HFONT hFont,
-		PSZ szText,
+		LPCTSTR szText,
 		DWORD dwWidth)
 {
   HFONT hOldFont;
@@ -324,7 +324,7 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 			       CLIP_DEFAULT_PRECIS,
 			       DEFAULT_QUALITY,
 			       FF_DONTCARE,
-			       "Arial");
+			       TEXT("Arial"));
 
   /* Topic description font */
   hfontTopicDescription = CreateFont(-11,0,0,0,FW_THIN,
@@ -333,7 +333,7 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 				     CLIP_DEFAULT_PRECIS,
 				     DEFAULT_QUALITY,
 				     FF_DONTCARE,
-				     "Arial");
+				     TEXT("Arial"));
 
   /* Topic button font */
   hfontTopicButton = CreateFont(-11,0,0,0,FW_BOLD,
@@ -342,7 +342,7 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 				CLIP_DEFAULT_PRECIS,
 				DEFAULT_QUALITY,
 				FF_DONTCARE,
-				"Arial");
+				TEXT("Arial"));
 
   /* Load title bitmap */
   if (hTitleBitmap != 0)
diff --git a/reactos/subsys/system/welcome/welcome.xml b/reactos/subsys/system/welcome/welcome.xml
index 2407e187e73..06cb80c304c 100644
--- a/reactos/subsys/system/welcome/welcome.xml
+++ b/reactos/subsys/system/welcome/welcome.xml
@@ -4,6 +4,8 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
-- 
2.17.1