Solitaire patch by Pierre Schweitzer (bug #2275).

svn path=/trunk/; revision=26971

diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc
index 3763039..b8b1d86 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/de-DE.rc
+++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc
@@ -56,6 +56,13 @@ BEGIN
 END
 
 
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+END
+
 /////
 // DESIGNINFO
 

diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc
index e2b7da5..4f0183a 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/en-US.rc
+++ b/reactos/base/applications/games/solitaire/lang/en-US.rc
@@ -56,6 +56,13 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+END
+
 
 /////
 // DESIGNINFO

diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc
index 01ff4aa..dfbb77f 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/es-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc
@@ -55,6 +55,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+END
+
 /////
 // DESIGNINFO
 

diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
index 39db3c7..428586c 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
@@ -39,22 +39,31 @@ BEGIN
     PUSHBUTTON      "Annuler",IDCANCEL,129,24,50,14
 END
 
+
 IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "Cards", -1, 7, 7, 65, 40
-    AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
+    GROUPBOX        "Cartes", -1, 7, 7, 65, 40
+    AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
-    AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX    "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
+    AUTOCHECKBOX    "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
+    PUSHBUTTON      "Annuler", IDCANCEL, 101, 97, 50, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire par J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quitter le jeu actuel?"
 END
 
+
 /////
 // DESIGNINFO
 
@@ -71,7 +80,6 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-
 #ifdef APSTUDIO_INVOKED
 
 /////

diff --git a/reactos/base/applications/games/solitaire/lang/id-ID.rc b/reactos/base/applications/games/solitaire/lang/id-ID.rc
index 4ed220c..f070e0f 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/id-ID.rc
+++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc
@@ -56,6 +56,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
+\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_SOL_NAME    "Solitaire"\r
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."\r
+    IDS_SOL_QUIT    "Quit the current game?"\r
+END\r
+\r
 /////\r
 // DESIGNINFO\r
 \r

diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc
index 972102f..a315b9c 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/it-IT.rc
+++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc
@@ -55,6 +55,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+END
+
 /////
 // DESIGNINFO
 

diff --git a/reactos/base/applications/games/solitaire/lang/nb-NO.rc b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
index fdafa57..1255467 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/nb-NO.rc
+++ b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
@@ -56,6 +56,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
+\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_SOL_NAME    "Solitaire"\r
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."\r
+    IDS_SOL_QUIT    "Quit the current game?"\r
+END\r
+\r
 /////\r
 // DESIGNINFO\r
 \r

diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
index f70ab4f..6db9a6c 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
@@ -54,6 +54,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
+\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_SOL_NAME    "Solitaire"\r
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."\r
+    IDS_SOL_QUIT    "Quit the current game?"\r
+END\r
+\r
 /////\r
 // DESIGNINFO\r
 \r

diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc
index 4bbe86f..12d7aba 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/th-TH.rc
+++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc
@@ -56,6 +56,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
+\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_SOL_NAME    "Solitaire"\r
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."\r
+    IDS_SOL_QUIT    "Quit the current game?"\r
+END\r
+\r
 /////\r
 // DESIGNINFO\r
 \r

diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
index 748a11e..513a2f1 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
@@ -55,6 +55,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+END
+
 /////
 // DESIGNINFO
 

diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
index 73d3ca4..e857b46 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
@@ -56,6 +56,14 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
+\r
+STRINGTABLE\r
+BEGIN\r
+    IDS_SOL_NAME    "Solitaire"\r
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."\r
+    IDS_SOL_QUIT    "Quit the current game?"\r
+END\r
+\r
 /////\r
 // DESIGNINFO\r
 \r

diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h
index f7f85b7..e72c14f 100644 (file)
--- a/reactos/base/applications/games/solitaire/resource.h
+++ b/reactos/base/applications/games/solitaire/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by Solitaire.rc
+// Used by rsrc.rc
 //
 #define IDD_DIALOG1                     101
 #define IDR_MENU1                       102
@@ -21,6 +21,10 @@
 #define IDC_OPT_SHOWTIME                1203
 #define IDC_OPT_STATUSBAR               1204
 
+#define IDS_SOL_NAME                    1300
+#define IDS_SOL_ABOUT                   1301
+#define IDS_SOL_QUIT                    1302
+
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/sol.rc b/reactos/base/applications/games/solitaire/sol.rc
deleted file mode 100644 (file)
index 8f2c5f1..0000000
--- a/reactos/base/applications/games/solitaire/sol.rc
+++ /dev/null
@@ -1 +0,0 @@
-#include "rsrc.rc"

diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp
index 69af283..37dfe03 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.cpp
+++ b/reactos/base/applications/games/solitaire/solitaire.cpp
@@ -15,7 +15,9 @@ HWND        hwndMain;
 HWND        hwndStatus;
 HINSTANCE    hInstance;
 
-TCHAR szAppName[] = _T("Solitaire");
+TCHAR szAppName[128];
+TCHAR MsgQuit[128];
+TCHAR MsgAbout[128];
 INT nOptions = 8;
 
 CardWindow SolWnd;
@@ -49,6 +51,12 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
 
     hInstance = hInst;
 
+    // Load application title
+    LoadString(hInst, IDS_SOL_NAME, szAppName, sizeof(szAppName) / sizeof(szAppName[0]));
+    // Load MsgBox() text here to avoid loading it many times later
+    LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0]));
+    LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0]));
+
     //Window class for the main application parent window
     wndclass.cbSize            = sizeof(wndclass);
     wndclass.style            = 0;//CS_HREDRAW | CS_VREDRAW;
@@ -232,7 +240,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             return 0;
 
         case IDM_HELP_ABOUT:
-            MessageBox(hwnd, _T("Solitaire by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION);
+            MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION);
             return 0;
 
         case IDM_GAME_EXIT:
@@ -244,12 +252,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 
     case WM_CLOSE:
         
-        ret = IDOK;
-
-        if(fGameStarted)
-        {
-            ret = MessageBox(hwnd, _T("Quit the current game?"), szAppName, MB_OKCANCEL|MB_ICONQUESTION);
-        }
+        ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION);
 
         if(ret == IDOK)
         {

diff --git a/reactos/base/applications/games/solitaire/solitaire.rbuild b/reactos/base/applications/games/solitaire/solitaire.rbuild
index 6478c45..1c3598e 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.rbuild
+++ b/reactos/base/applications/games/solitaire/solitaire.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" allowwarnings="true" stdlib="host">
+<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" unicode="no" allowwarnings="yes" stdlib="host">
        <include base="sol">.</include>
        <include base="sol">cardlib</include>
        <linkerflag>-lstdc++</linkerflag>
@@ -31,5 +31,5 @@
                <file>cardwindow.cpp</file>
                <file>dropzone.cpp</file>
        </directory>
-       <file>sol.rc</file>
+       <file>rsrc.rc</file>
 </module>