[ros-diffs] [greatlrd] 27627: patch from Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com ------------------------------------------------------------------------------ 1. remove one hard code line. 2. cleanup one rc file See issue #2400 for more details.

Author: greatlrd
Date: Fri Jul 13 15:42:20 2007
New Revision: 27627

URL: http://svn.reactos.org/svn/reactos?rev=27627&view=rev
Log:
patch from  Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com  
------------------------------------------------------------------------------
1. remove one hard code line.
2. cleanup one rc file


See issue #2400 for more details.

Modified:
    trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
    trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
    trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
    trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
    trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
    trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
    trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
    trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
    trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
    trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
    trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
    trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
    trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
    trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
    trunk/reactos/base/applications/games/solitaire/resource.h
    trunk/reactos/base/applications/games/solitaire/solgame.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp

Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Ïàñèàíñ"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Äà ïðåêðàòÿ ëè òåêóùàòà èãðà?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Solitär"
     IDS_SOL_ABOUT   "Solitär von J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Laufendes Spiel beenden?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire par J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quitter le jeu actuel?"
+    IDS_SOL_WIN     "Félicitations ! Vous avez gagné !"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Fri Jul 13 15:42:20
2007
@@ -38,6 +38,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Fri Jul 13 15:42:20
2007
@@ -38,6 +38,7 @@
     IDS_SOL_NAME    "Solitario"
     IDS_SOL_ABOUT   "Solitario by J Brown\n\nCardLib versione 1.0."
     IDS_SOL_QUIT    "Chiudere la partita in corso?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Fri Jul 13 15:42:20
2007
@@ -38,6 +38,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Fri Jul 13 15:42:20
2007
@@ -36,6 +36,7 @@
     IDS_SOL_NAME    "Pasjans"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Zakoñczyæ aktualn¹ grê?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Fri Jul 13 15:42:20
2007
@@ -32,6 +32,7 @@
     IDS_SOL_NAME    "Ïàñüÿíñ"
     IDS_SOL_ABOUT   "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0."
     IDS_SOL_QUIT    "Çàêîí÷èòü òåêóùóþ èãðó?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Jul 13 15:42:20
2007
@@ -1,86 +1,44 @@
-//Microsoft Developer Studio generated resource script.
-//
+// Slovak translation by Kario  2007 <kario(a)szm.sk>
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with
'winres.h' */
-#include "winres.h"
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Slovak translation by Kario  2007 <kario(a)szm.sk>
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
+CAPTION "Options"
+FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Zruši",IDCANCEL,129,24,50,14
+    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
+
+    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
+
+    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
+    PUSHBUTTON      "Zruši»", IDCANCEL, 101, 97, 50, 14
 END
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// DESIGNINFO
+// Strings
 //
 
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
+STRINGTABLE
 BEGIN
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
+    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
+    IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -118,27 +76,3 @@
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // Slovak resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Fri Jul 13 15:42:20
2007
@@ -38,6 +38,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Fri Jul 13 15:42:20
2007
@@ -37,6 +37,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Fri Jul 13 15:42:20
2007
@@ -38,6 +38,7 @@
     IDS_SOL_NAME    "Solitaire"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

Modified: trunk/reactos/base/applications/games/solitaire/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/resource.h (original)
+++ trunk/reactos/base/applications/games/solitaire/resource.h Fri Jul 13 15:42:20 2007
@@ -25,3 +25,4 @@
 #define IDS_SOL_NAME                    1300
 #define IDS_SOL_ABOUT                   1301
 #define IDS_SOL_QUIT                    1302
+#define IDS_SOL_WIN                     1303

Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Fri Jul 13 15:42:20 2007
@@ -13,6 +13,8 @@
 #define TRACE(s) printf("%s(%i): %s",__FILE__,__LINE__,s)
 #endif
 
+extern TCHAR MsgWin[128];
+
 CardStack activepile;
 bool fGameStarted = false;
 
@@ -240,7 +242,7 @@
 
     if(fGameOver)
     {
-        MessageBox(SolWnd, _T("Congratulations, you win!!"), szAppName, MB_OK |
MB_ICONINFORMATION);
+        MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
     
         for(int i = 0; i < 4; i++)
         {

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 Jul 13 15:42:20
2007
@@ -18,6 +18,7 @@
 TCHAR szAppName[128];
 TCHAR MsgQuit[128];
 TCHAR MsgAbout[128];
+TCHAR MsgWin[128];
 INT nOptions = 8;
 
 CardWindow SolWnd;
@@ -53,9 +54,10 @@
 
     // 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
+    // Load MsgBox() texts here to avoid loading them 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]));
+    LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
 
     //Window class for the main application parent window
     wndclass.cbSize            = sizeof(wndclass);
@@ -266,3 +268,4 @@
     return DefWindowProc (hwnd, iMsg, wParam, lParam);
 }
 
+