[ros-diffs] [gedmurphy] 28145: build sol as unicode

Author: gedmurphy
Date: Fri Aug  3 22:01:04 2007
New Revision: 28145

URL: http://svn.reactos.org/svn/reactos?rev=28145&view=rev
Log:
build sol as unicode

Modified:
    trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp
    trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.rbuild

Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp Fri Aug  3
22:01:04 2007
@@ -88,11 +88,11 @@
     //If Windows NT/2000/XP
     if(GetVersion() < 0x80000000)
     {
-        hCardDll = LoadLibrary("cards.dll");
+        hCardDll = LoadLibrary(TEXT("cards.dll"));
 
         if(hCardDll == 0)
         {
-            MessageBox(0, "Error loading cards.dll (32bit)", "Shed",
MB_OK | MB_ICONEXCLAMATION);
+            MessageBox(0, TEXT("Error loading cards.dll (32bit)"),
TEXT("Shed"), MB_OK | MB_ICONEXCLAMATION);
             PostQuitMessage(0);
             return;
         }

Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp Fri Aug  3
22:01:04 2007
@@ -117,6 +117,6 @@
 void PaintRect(HDC hdc, RECT *rect, COLORREF colour)
 {
     COLORREF oldcr = SetBkColor(hdc, colour);
-    ExtTextOut(hdc, 0, 0, ETO_OPAQUE, rect, "", 0, 0);
+    ExtTextOut(hdc, 0, 0, ETO_OPAQUE, rect, TEXT(""), 0, 0);
     SetBkColor(hdc, oldcr);
 }

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Aug  3 22:01:04
2007
@@ -119,7 +119,7 @@
 //
 //    Main entry point
 //
-int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdShow)
+int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCmdShow)
 {
     HWND        hwnd;
     MSG            msg;
@@ -421,7 +421,7 @@
     switch(iMsg)
     {
     case WM_CREATE:
-        hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM |
SBARS_SIZEGRIP, "Ready", hwnd, 0);
+        hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM |
SBARS_SIZEGRIP, _T("Ready"), hwnd, 0);
 
         //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0);
 

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Fri Aug  3 22:01:04
2007
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<module name="sol" type="win32gui"
installbase="system32" installname="sol.exe" unicode="no"
allowwarnings="yes" stdlib="host">
+<module name="sol" type="win32gui"
installbase="system32" installname="sol.exe" unicode="yes"
allowwarnings="yes" stdlib="host">
 	<include base="sol">.</include>
 	<include base="sol">cardlib</include>
 	<linkerflag>-lstdc++</linkerflag>