compile welcome.exe as unicode application by default
Modified: trunk/reactos/subsys/system/welcome/welcome.c
Modified: trunk/reactos/subsys/system/welcome/welcome.xml
_____
Modified: trunk/reactos/subsys/system/welcome/welcome.c
--- trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04
06:52:58 UTC (rev 17041)
+++ trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04
10:41:58 UTC (rev 17042)
@@ -176,7 +176,7 @@
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 @@
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 @@
static DWORD
GetButtonHeight(HDC hDC,
HFONT hFont,
- PSZ szText,
+ LPCTSTR szText,
DWORD dwWidth)
{
HFONT hOldFont;
@@ -324,7 +324,7 @@
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 @@
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 @@
CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY,
FF_DONTCARE,
- "Arial");
+ TEXT("Arial"));
/* Load title bitmap */
if (hTitleBitmap != 0)
_____
Modified: trunk/reactos/subsys/system/welcome/welcome.xml
--- trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04
06:52:58 UTC (rev 17041)
+++ trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04
10:41:58 UTC (rev 17042)
@@ -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>