- Removed unused dialog resource and MSVC rubbish.

- Use a more descriptive id for the icon.

svn path=/trunk/; revision=26972

diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc
index b8b1d86..43f3680 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/de-DE.rc
+++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc
@@ -7,42 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// German resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
 
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Abbrechen",IDCANCEL,129,24,50,14
-END
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Optionen"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Karten", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -56,6 +30,8 @@ BEGIN
 END
 
 
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -63,89 +39,32 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"
 END
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
 
-#ifdef APSTUDIO_INVOKED
+/* Menus */
 
-/////
-// 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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Spiel"
     BEGIN
-        MENUITEM "&Karten geben\t F2",                   IDM_GAME_NEW
+        MENUITEM "&Karten geben\t F2",        IDM_GAME_NEW
         MENUITEM SEPARATOR
-        MENUITEM "&Deckblatt...",                    IDM_GAME_DECK
-        MENUITEM "&Optionen...",                 IDM_GAME_OPTIONS
+        MENUITEM "&Deckblatt...",             IDM_GAME_DECK
+        MENUITEM "&Optionen...",              IDM_GAME_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "&Beenden",                       IDM_GAME_EXIT
+        MENUITEM "&Beenden",                  IDM_GAME_EXIT
     END
     POPUP "&?"
     BEGIN
         MENUITEM "&Inhalt\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "Inf&o",                      IDM_HELP_ABOUT
+        MENUITEM "Inf&o",                     IDM_HELP_ABOUT
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+/* Accelerators */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // German resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc
index 4f0183a..4b4b484 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/en-US.rc
+++ b/reactos/base/applications/games/solitaire/lang/en-US.rc
@@ -7,43 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-END
 
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -56,6 +29,9 @@ BEGIN
     PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
+
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -64,52 +40,9 @@ BEGIN
 END
 
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-
-/////
-// TEXTINCLUDE
+/* Menus */
 
-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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Game"
     BEGIN
@@ -127,26 +60,12 @@ BEGIN
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // English (U.K.) resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc
index dfbb77f..70700b0 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/es-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc
@@ -7,42 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// Spanish (Spain) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
 
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialogo"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "Aceptar",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancelar",IDCANCEL,129,24,50,14
-END
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -51,11 +25,13 @@ BEGIN
     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      "Cancel", IDCANCEL, 101, 97, 50, 14
+    DEFPUSHBUTTON   "Aceptar", IDOK, 35, 97, 50, 14
+    PUSHBUTTON      "Cancelar", IDCANCEL, 101, 97, 50, 14
 END
 
 
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -63,52 +39,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"
 END
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
 
-#ifdef APSTUDIO_INVOKED
+/* Menus */
 
-/////
-// 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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Juego"
     BEGIN
@@ -126,26 +60,11 @@ BEGIN
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // Spanish (Spain) resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
index 428586c..b1e4240 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
@@ -7,43 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// French resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Annuler",IDCANCEL,129,24,50,14
-END
 
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cartes", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -56,6 +29,9 @@ BEGIN
     PUSHBUTTON      "Annuler", IDCANCEL, 101, 97, 50, 14
 END
 
+
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -64,88 +40,31 @@ BEGIN
 END
 
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#ifdef APSTUDIO_INVOKED
-
-/////
-// TEXTINCLUDE
+/* Menus */
 
-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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Partie"
     BEGIN
-        MENUITEM "&Donne\tF2",                   IDM_GAME_NEW
+        MENUITEM "&Donne\tF2",                  IDM_GAME_NEW
         MENUITEM SEPARATOR
         MENUITEM "&Jeux...",                    IDM_GAME_DECK
         MENUITEM "&Options...",                 IDM_GAME_OPTIONS
         MENUITEM SEPARATOR
-        MENUITEM "&Quitter",                       IDM_GAME_EXIT
+        MENUITEM "&Quitter",                    IDM_GAME_EXIT
     END
     POPUP "&Aide"
     BEGIN
         MENUITEM "&Sommaire\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "&À propos",                      IDM_HELP_ABOUT
+        MENUITEM "&À propos",                   IDM_HELP_ABOUT
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // French resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not 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 f070e0f..95042fe 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/id-ID.rc
+++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc
@@ -8,42 +8,16 @@
 \r
 #include "resource.h"\r
 \r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/* winemaker: #include "afxres.h" */\r
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
-#include "winres.h"\r
-\r
-/////\r
-\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////\r
-// Indonesian resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT\r
-#pragma code_page(1252)\r
-#endif //_WIN32\r
 \r
-/////\r
-// Dialog\r
 \r
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Dialog"\r
-FONT 8, "MS Shell Dlg"\r
-EXSTYLE DS_SHELLFONT\r
-BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14\r
-    PUSHBUTTON      "Batal",IDCANCEL,129,24,50,14\r
-END\r
+/* Dialogs */\r
 \r
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118\r
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Options"\r
 FONT 8, "MS Shell Dlg"\r
+EXSTYLE DS_SHELLFONT\r
 BEGIN\r
     GROUPBOX        "Cards", -1, 7, 7, 65, 40\r
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP\r
@@ -53,10 +27,12 @@ BEGIN
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP\r
 \r
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14\r
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
+    PUSHBUTTON      "Batal", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
 \r
+/* Strings */\r
+\r
 STRINGTABLE\r
 BEGIN\r
     IDS_SOL_NAME    "Solitaire"\r
@@ -64,52 +40,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"\r
 END\r
 \r
-/////\r
-// DESIGNINFO\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
-BEGIN\r
-    IDD_DIALOG1, DIALOGEX\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 179\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 88\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
 \r
-#ifdef APSTUDIO_INVOKED\r
+/* Menus */\r
 \r
-/////\r
-// TEXTINCLUDE\r
-\r
-1 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "#include ""winres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////\r
-// Menu\r
-\r
-IDR_MENU1 MENU DISCARDABLE \r
+IDR_MENU1 MENU DISCARDABLE\r
 BEGIN\r
     POPUP "&Game"\r
     BEGIN\r
@@ -127,26 +61,11 @@ BEGIN
     END\r
 END\r
 \r
-/////\r
-// Accelerator\r
 \r
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE \r
+/* Accelerator */\r
+\r
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE\r
 BEGIN\r
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
 END\r
-\r
-\r
-/////\r
-// Icon\r
-\r
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
-#endif    // Indonesian resources\r
-\r
-/////\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-\r
-/////\r
-#endif    // not APSTUDIO_INVOKED\r

diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc
index a315b9c..6340a42 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/it-IT.rc
+++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc
@@ -7,42 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
 
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Annulla",IDCANCEL,129,24,50,14
-END
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -52,10 +26,12 @@ BEGIN
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
+    PUSHBUTTON      "Annulla", IDCANCEL, 101, 97, 50, 14
 END
 
 
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -63,52 +39,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"
 END
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
 
-#ifdef APSTUDIO_INVOKED
+/* Menus */
 
-/////
-// 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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Partita"
     BEGIN
@@ -126,26 +60,11 @@ BEGIN
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // Italian resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/lang/nb-NO.rc b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
index 1255467..7dd0f3f 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/nb-NO.rc
+++ b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
@@ -8,42 +8,16 @@
 \r
 #include "resource.h"\r
 \r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/* winemaker: #include "afxres.h" */\r
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
-#include "winres.h"\r
-\r
-/////\r
-\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////\r
-// Norwegian resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL\r
-#pragma code_page(1252)\r
-#endif //_WIN32\r
 \r
-/////\r
-// Dialog\r
 \r
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Dialog"\r
-FONT 8, "MS Shell Dlg"\r
-EXSTYLE DS_SHELLFONT\r
-BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14\r
-    PUSHBUTTON      "Avbryt",IDCANCEL,129,24,50,14\r
-END\r
+/* Dialogs */\r
 \r
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118\r
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Options"\r
 FONT 8, "MS Shell Dlg"\r
+EXSTYLE DS_SHELLFONT\r
 BEGIN\r
     GROUPBOX        "Cards", -1, 7, 7, 65, 40\r
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP\r
@@ -53,10 +27,12 @@ BEGIN
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP\r
 \r
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14\r
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
+    PUSHBUTTON      "Avbryt", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
 \r
+/* Strings */\r
+\r
 STRINGTABLE\r
 BEGIN\r
     IDS_SOL_NAME    "Solitaire"\r
@@ -64,52 +40,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"\r
 END\r
 \r
-/////\r
-// DESIGNINFO\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
-BEGIN\r
-    IDD_DIALOG1, DIALOGEX\r
-    BEGIN\r
-        LEFTMARGIN, 7\r
-        RIGHTMARGIN, 179\r
-        TOPMARGIN, 7\r
-        BOTTOMMARGIN, 88\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
 \r
-#ifdef APSTUDIO_INVOKED\r
+/* Menus */\r
 \r
-/////\r
-// TEXTINCLUDE\r
-\r
-1 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "#include ""winres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////\r
-// Menu\r
-\r
-IDR_MENU1 MENU DISCARDABLE \r
+IDR_MENU1 MENU DISCARDABLE\r
 BEGIN\r
     POPUP "&Spill"\r
     BEGIN\r
@@ -127,26 +61,11 @@ BEGIN
     END\r
 END\r
 \r
-/////\r
-// Accelerator\r
 \r
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE \r
+/* Accelerator */\r
+\r
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE\r
 BEGIN\r
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
 END\r
-\r
-\r
-/////\r
-// Icon\r
-\r
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
-#endif    // Norwegian resource\r
-\r
-/////\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-\r
-/////\r
-#endif    // not APSTUDIO_INVOKED\r

diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
index 6db9a6c..e5ad478 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
@@ -6,42 +6,16 @@
 \r
 #include "resource.h"\r
 \r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/* winemaker: #include "afxres.h" */\r
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
-#include "winres.h"\r
-\r
-/////\r
-\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////\r
-// English (U.K.) resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT\r
-#pragma code_page(1250)\r
-#endif //_WIN32\r
 \r
-/////\r
-// Dialog\r
 \r
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Dialog"\r
-FONT 8, "MS Shell Dlg"\r
-EXSTYLE DS_SHELLFONT\r
-BEGIN\r
-DEFPUSHBUTTON   "OK",IDOK,129,7,50,14\r
-PUSHBUTTON      "Anuluj",IDCANCEL,129,24,50,14\r
-END\r
+/* Dialogs */\r
 \r
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118\r
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Options"\r
 FONT 8, "MS Shell Dlg"\r
+EXSTYLE DS_SHELLFONT\r
 BEGIN\r
     GROUPBOX        "Cards", -1, 7, 7, 65, 40\r
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP\r
@@ -51,10 +25,12 @@ BEGIN
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP\r
 \r
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14\r
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
+    PUSHBUTTON      "Anuluj", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
 \r
+/* Strings */\r
+\r
 STRINGTABLE\r
 BEGIN\r
     IDS_SOL_NAME    "Solitaire"\r
@@ -62,89 +38,32 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"\r
 END\r
 \r
-/////\r
-// DESIGNINFO\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE\r
-BEGIN\r
-IDD_DIALOG1, DIALOGEX\r
-BEGIN\r
-LEFTMARGIN, 7\r
-RIGHTMARGIN, 179\r
-TOPMARGIN, 7\r
-BOTTOMMARGIN, 88\r
-END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
 \r
-\r
-#ifdef APSTUDIO_INVOKED\r
-\r
-/////\r
-// TEXTINCLUDE\r
-\r
-1 TEXTINCLUDE DISCARDABLE\r
-BEGIN\r
-"resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE\r
-BEGIN\r
-"#include ""winres.h""\r\n"\r
-"\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE\r
-BEGIN\r
-"\r\n"\r
-"\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////\r
-// Menu\r
+/* Menu */\r
 \r
 IDR_MENU1 MENU DISCARDABLE\r
 BEGIN\r
-POPUP "&Gra"\r
-BEGIN\r
-MENUITEM "&Rozdaj\tF2",                   IDM_GAME_NEW\r
-MENUITEM SEPARATOR\r
-MENUITEM "&Talia...",                    IDM_GAME_DECK\r
-MENUITEM "&Opcje...",                 IDM_GAME_OPTIONS\r
-MENUITEM SEPARATOR\r
-MENUITEM "&Zakoñcz",                       IDM_GAME_EXIT\r
-END\r
-POPUP "Pomo&c"\r
-BEGIN\r
-MENUITEM "&Spis tre\9cci\tF1",               IDM_HELP_CONTENTS\r
-MENUITEM "Solit&aire - informacje",                      IDM_HELP_ABOUT\r
-END\r
+    POPUP "&Gra"\r
+    BEGIN\r
+        MENUITEM "&Rozdaj\tF2",                   IDM_GAME_NEW\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Talia...",                    IDM_GAME_DECK\r
+        MENUITEM "&Opcje...",                 IDM_GAME_OPTIONS\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Zakoñcz",                       IDM_GAME_EXIT\r
+    END\r
+    POPUP "Pomo&c"\r
+    BEGIN\r
+        MENUITEM "&Spis tre\9cci\tF1",               IDM_HELP_CONTENTS\r
+        MENUITEM "Solit&aire - informacje",        IDM_HELP_ABOUT\r
+    END\r
 END\r
 \r
-/////\r
-// Accelerator\r
+\r
+/* Accelerator */\r
 \r
 IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE\r
 BEGIN\r
-VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
-VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
+    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
+    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
 END\r
-\r
-\r
-/////\r
-// Icon\r
-\r
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
-#endif    // English (U.K.) resources\r
-\r
-/////\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-\r
-/////\r
-#endif    // not APSTUDIO_INVOKED\r

diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc
index 12d7aba..6a3732a 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/th-TH.rc
+++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc
@@ -8,42 +8,16 @@
 \r
 #include "resource.h"\r
 \r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/* winemaker: #include "afxres.h" */\r
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
-#include "winres.h"\r
-\r
-/////\r
-\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////\r
-// Thai resources\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT\r
-#pragma code_page(874)\r
-#endif //_WIN32\r
 \r
-/////\r
-// Dialog\r
 \r
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Dialog"\r
-FONT 8, "MS Shell Dlg"\r
-EXSTYLE DS_SHELLFONT\r
-BEGIN\r
-    DEFPUSHBUTTON   "µ¡Å§",   IDOK, 129,7,50,14\r
-    PUSHBUTTON      "¡àÅÔ¡", IDCANCEL, 129,24,50,14\r
-END\r
+/* Dialogs */\r
 \r
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118\r
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Options"\r
 FONT 8, "MS Shell Dlg"\r
+EXSTYLE DS_SHELLFONT\r
 BEGIN\r
     GROUPBOX        "Cards", -1, 7, 7, 65, 40\r
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP\r
@@ -52,11 +26,13 @@ BEGIN
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP\r
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP\r
 \r
-    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14\r
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
+    DEFPUSHBUTTON   "µ¡Å§", IDOK, 35, 97, 50, 14\r
+    PUSHBUTTON      "¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
 \r
+/* Strings */\r
+\r
 STRINGTABLE\r
 BEGIN\r
     IDS_SOL_NAME    "Solitaire"\r
@@ -64,50 +40,8 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"\r
 END\r
 \r
-/////\r
-// DESIGNINFO\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
-BEGIN\r
-    IDD_DIALOG1, DIALOGEX\r
-    BEGIN\r
-        LEFTMARGIN,    7\r
-        RIGHTMARGIN, 179\r
-        TOPMARGIN,     7\r
-        BOTTOMMARGIN, 88\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
 \r
-#ifdef APSTUDIO_INVOKED\r
-\r
-/////\r
-// TEXTINCLUDE\r
-\r
-1 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "#include ""winres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////\r
-// Menu\r
+/* Menus */\r
 \r
 IDR_MENU1 MENU DISCARDABLE \r
 BEGIN\r
@@ -127,26 +61,11 @@ BEGIN
     END\r
 END\r
 \r
-/////\r
-// Accelerator\r
 \r
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE \r
+/* Accelerators */\r
+\r
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE\r
 BEGIN\r
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
 END\r
-\r
-\r
-/////\r
-// Icon\r
-\r
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
-#endif    // Thai resources\r
-\r
-/////\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-\r
-/////\r
-#endif    // not APSTUDIO_INVOKED\r

diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
index 513a2f1..69acc86 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
@@ -7,42 +7,16 @@
  */
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-
-/* winemaker: #include "afxres.h" */
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
-#include "winres.h"
-
-/////
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////
-// Ukraianian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
 
-/////
-// Dialog
 
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Ñêàñóâàòè",IDCANCEL,129,24,50,14
-END
+/* Dialogs */
 
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
+EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
@@ -52,10 +26,12 @@ BEGIN
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14
+    PUSHBUTTON      "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14
 END
 
 
+/* Strings */
+
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Solitaire"
@@ -63,52 +39,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"
 END
 
-/////
-// DESIGNINFO
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOGEX
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
 
-#ifdef APSTUDIO_INVOKED
+/* Menus */
 
-/////
-// 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
-
-
-/////
-// Menu
-
-IDR_MENU1 MENU DISCARDABLE 
+IDR_MENU1 MENU DISCARDABLE
 BEGIN
     POPUP "&Ãðà"
     BEGIN
@@ -126,26 +60,11 @@ BEGIN
     END
 END
 
-/////
-// Accelerator
 
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
+/* Accelerators */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
 BEGIN
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
 END
-
-
-/////
-// Icon
-
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"
-#endif    // Ukraianian resources
-
-/////
-
-
-#ifndef APSTUDIO_INVOKED
-
-/////
-#endif    // not APSTUDIO_INVOKED

diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
index e857b46..afc49d2 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
@@ -8,42 +8,16 @@
 \r
 #include "resource.h"\r
 \r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/* winemaker: #include "afxres.h" */\r
-/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
-#include "winres.h"\r
-\r
-/////\r
-\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////\r
-// ¼òÌåÖÐÎÄ×ÊÔ´\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED\r
-#pragma code_page(936)\r
-#endif //_WIN32\r
 \r
-/////\r
-// Dialog\r
 \r
-IDD_DIALOG1 DIALOGEX DISCARDABLE  0, 0, 186, 95\r
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Dialog"\r
-FONT 8, "MS Shell Dlg"\r
-EXSTYLE DS_SHELLFONT\r
-BEGIN\r
-    DEFPUSHBUTTON   "È·¶¨", IDOK,     129,  7, 50, 14\r
-    PUSHBUTTON      "È¡Ïû", IDCANCEL, 129, 24, 50, 14\r
-END\r
+/* Dialogs */\r
 \r
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 186, 118\r
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Options"\r
 FONT 8, "MS Shell Dlg"\r
+EXSTYLE DS_SHELLFONT\r
 BEGIN\r
     GROUPBOX        "Cards", -1, 7, 7, 65, 40\r
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP\r
@@ -52,11 +26,13 @@ BEGIN
     AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP\r
     AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP\r
 \r
-    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14\r
-    PUSHBUTTON      "Cancel", IDCANCEL, 101, 97, 50, 14\r
+    DEFPUSHBUTTON   "È·¶¨", IDOK, 35, 97, 50, 14\r
+    PUSHBUTTON      "È¡Ïû", IDCANCEL, 101, 97, 50, 14\r
 END\r
 \r
 \r
+/* Strings */\r
+\r
 STRINGTABLE\r
 BEGIN\r
     IDS_SOL_NAME    "Solitaire"\r
@@ -64,52 +40,10 @@ BEGIN
     IDS_SOL_QUIT    "Quit the current game?"\r
 END\r
 \r
-/////\r
-// DESIGNINFO\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO DISCARDABLE \r
-BEGIN\r
-    IDD_DIALOG1, DIALOGEX\r
-    BEGIN\r
-        LEFTMARGIN,    7\r
-        RIGHTMARGIN, 179\r
-        TOPMARGIN,     7\r
-        BOTTOMMARGIN, 88\r
-    END\r
-END\r
-#endif    // APSTUDIO_INVOKED\r
-\r
 \r
-#ifdef APSTUDIO_INVOKED\r
+/* Menus */\r
 \r
-/////\r
-// TEXTINCLUDE\r
-\r
-1 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "resource.h\0"\r
-END\r
-\r
-2 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "#include ""winres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE DISCARDABLE \r
-BEGIN\r
-    "\r\n"\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-\r
-/////\r
-// Menu\r
-\r
-IDR_MENU1 MENU DISCARDABLE \r
+IDR_MENU1 MENU DISCARDABLE\r
 BEGIN\r
     POPUP "ÓÎÏ·(&G)"\r
     BEGIN\r
@@ -127,26 +61,11 @@ BEGIN
     END\r
 END\r
 \r
-/////\r
-// Accelerator\r
 \r
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE \r
+/* Accelerator */\r
+\r
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE\r
 BEGIN\r
     VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
     VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
 END\r
-\r
-\r
-/////\r
-// Icon\r
-\r
-IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
-#endif    // ÖÐÎÄ×ÊÔ´\r
-\r
-/////\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-\r
-/////\r
-#endif    // not APSTUDIO_INVOKED\r

diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h
index e72c14f..325f0fb 100644 (file)
--- a/reactos/base/applications/games/solitaire/resource.h
+++ b/reactos/base/applications/games/solitaire/resource.h
@@ -1,37 +1,27 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by rsrc.rc
-//
-#define IDD_DIALOG1                     101
+
+/* Icon */
+#define IDI_SOLITAIRE                   100
+
 #define IDR_MENU1                       102
 #define IDR_ACCELERATOR1                103
 
-#define IDI_ICON1                       1004
 
-#define IDM_GAME_NEW                    40001
-#define IDM_GAME_DECK                   40002
-#define IDM_GAME_OPTIONS                40003
-#define IDM_GAME_EXIT                   40004
-#define IDM_HELP_CONTENTS               40005
-#define IDM_HELP_ABOUT                  40006
+/* Menu */
+#define IDM_GAME_NEW                    1001
+#define IDM_GAME_DECK                   1002
+#define IDM_GAME_OPTIONS                1003
+#define IDM_GAME_EXIT                   1004
+#define IDM_HELP_CONTENTS               1005
+#define IDM_HELP_ABOUT                  1006
 
+/* Dialogs */
 #define IDD_OPTIONS                     1200
 #define IDC_OPT_DRAWONE                 1201
 #define IDC_OPT_DRAWTHREE               1202
 #define IDC_OPT_SHOWTIME                1203
 #define IDC_OPT_STATUSBAR               1204
 
+/* Strings */
 #define IDS_SOL_NAME                    1300
 #define IDS_SOL_ABOUT                   1301
 #define IDS_SOL_QUIT                    1302
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        105
-#define _APS_NEXT_COMMAND_VALUE         40007
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

diff --git a/reactos/base/applications/games/solitaire/rsrc.rc b/reactos/base/applications/games/solitaire/rsrc.rc
index 0d50a52..bff0476 100644 (file)
--- a/reactos/base/applications/games/solitaire/rsrc.rc
+++ b/reactos/base/applications/games/solitaire/rsrc.rc
@@ -1,6 +1,10 @@
 #include <windows.h>
 #include "resource.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
+
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"

diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp
index 37dfe03..3607b55 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.cpp
+++ b/reactos/base/applications/games/solitaire/solitaire.cpp
@@ -64,12 +64,12 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
     wndclass.cbClsExtra        = 0;
     wndclass.cbWndExtra        = 0;
     wndclass.hInstance        = hInst;
-    wndclass.hIcon            = LoadIcon (hInst, MAKEINTRESOURCE(IDI_ICON1));
+    wndclass.hIcon            = LoadIcon (hInst, MAKEINTRESOURCE(IDI_SOLITAIRE));
     wndclass.hCursor        = LoadCursor (NULL, IDC_ARROW);
     wndclass.hbrBackground    = (HBRUSH)NULL;
     wndclass.lpszMenuName    = MAKEINTRESOURCE(IDR_MENU1);
     wndclass.lpszClassName    = szAppName;
-    wndclass.hIconSm        = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 16, 16, 0);
+    wndclass.hIconSm        = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0);
 
     RegisterClassEx(&wndclass);