Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[gedmurphy] 26973: - Don't return directly from PSEH. Same error, same dev, different day. - Thanks to pigglesworth for noticing

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sun Jun 3 17:06:32 2007 New Revision: 26973 URL: http://svn.reactos.org/svn/reactos?rev=26973&view=rev Log: - Don't return directly from PSEH. Same error, same dev, different day. - Thanks to pigglesworth for noticing Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sun Jun 3 17:06:32 2007 @@ -71,16 +71,16 @@ if (pUnkOuter) { /* we are using same error code as MS*/ - return CLASS_E_NOAGGREGATION; + retVal = CLASS_E_NOAGGREGATION; + }/* Is it a DirectDraw 7 Request or not */ + else if (!IsEqualGUID(id, &IID_IDirectDraw7)) + { + retVal = DDERR_INVALIDPARAMS; } - - /* Is it a DirectDraw 7 Request or not */ - if (!IsEqualGUID(id, &IID_IDirectDraw7)) + else { - return DDERR_INVALIDPARAMS; + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); } - - retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); /* Create our DirectDraw interface */ }

17 years, 6 months

[ekohl] 26972: - Removed unused dialog resource and MSVC rubbish. - Use a more descriptive id for the icon.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 3 15:58:45 2007 New Revision: 26972 URL: http://svn.reactos.org/svn/reactos?rev=26972&view=rev Log: - Removed unused dialog resource and MSVC rubbish. - Use a more descriptive id for the icon. Modified: 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/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/rsrc.rc trunk/reactos/base/applications/games/solitaire/solitaire.cpp 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 Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#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 - -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 @@ END +/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -63,89 +39,32 @@ 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 +/* Menus */ - -#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 - - -///// -// 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 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 Sun Jun 3 15:58:45 2007 @@ -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 -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +/* Dialogs */ + +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 @@ PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -64,52 +40,9 @@ END -///// -// DESIGNINFO +/* Menus */ -#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 - -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 @@ 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 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 Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#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 - -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,10 +25,12 @@ 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 @@ -63,52 +39,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Juego" BEGIN @@ -126,26 +60,11 @@ 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 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 Sun Jun 3 15:58:45 2007 @@ -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 -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +/* Dialogs */ + +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 @@ PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -64,88 +40,31 @@ END -///// -// DESIGNINFO +/* Menus */ -#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 - -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 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 Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Indonesian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -#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 "Batal",IDCANCEL,129,24,50,14 -END - -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 @@ -53,9 +27,11 @@ 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 "Batal", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ STRINGTABLE BEGIN @@ -64,52 +40,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Game" BEGIN @@ -127,26 +61,11 @@ 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 // Indonesian resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED 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 Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#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 - -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,9 +26,11 @@ 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 @@ -63,52 +39,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Partita" BEGIN @@ -126,26 +60,11 @@ 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 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 Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Norwegian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -#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 "Avbryt",IDCANCEL,129,24,50,14 -END - -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 @@ -53,9 +27,11 @@ 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 "Avbryt", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ STRINGTABLE BEGIN @@ -64,52 +40,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Spill" BEGIN @@ -127,26 +61,11 @@ 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 // Norwegian resource - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED 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 Sun Jun 3 15:58:45 2007 @@ -6,42 +6,16 @@ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#undef APSTUDIO_READONLY_SYMBOLS - -///// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(1250) -#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 "Anuluj",IDCANCEL,129,24,50,14 -END - -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,9 +25,11 @@ 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 "Anuluj", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ STRINGTABLE BEGIN @@ -62,89 +38,32 @@ 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 - -///// -// 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 +/* Menu */ IDR_MENU1 MENU DISCARDABLE BEGIN -POPUP "&Gra" -BEGIN -MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW -MENUITEM SEPARATOR -MENUITEM "&Talia...", IDM_GAME_DECK -MENUITEM "&Opcje...", IDM_GAME_OPTIONS -MENUITEM SEPARATOR -MENUITEM "&Zakoñcz", IDM_GAME_EXIT -END -POPUP "Pomo&c" -BEGIN -MENUITEM "&Spis treci\tF1", IDM_HELP_CONTENTS -MENUITEM "Solit&aire - informacje", IDM_HELP_ABOUT -END + POPUP "&Gra" + BEGIN + MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Talia...", IDM_GAME_DECK + MENUITEM "&Opcje...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Zakoñcz", IDM_GAME_EXIT + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Spis treci\tF1", IDM_HELP_CONTENTS + MENUITEM "Solit&aire - informacje", IDM_HELP_ABOUT + END END -///// -// Accelerator + +/* Accelerator */ IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN -VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT -VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT + 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 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 Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_THAI, SUBLANG_DEFAULT -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Thai resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_THAI, SUBLANG_DEFAULT -#pragma code_page(874) -#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 "µ¡Å§", IDOK, 129,7,50,14 - PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 129,24,50,14 -END - -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 @@ 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 "µ¡Å§", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ STRINGTABLE BEGIN @@ -64,50 +40,8 @@ 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 - -///// -// 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 +/* Menus */ IDR_MENU1 MENU DISCARDABLE BEGIN @@ -127,26 +61,11 @@ 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 // Thai resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED 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 Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#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 - -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,9 +26,11 @@ 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 @@ -63,52 +39,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Ãðà" BEGIN @@ -126,26 +60,11 @@ 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 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 Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@ #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" -///// +/* Dialogs */ -#undef APSTUDIO_READONLY_SYMBOLS - -///// -// ¼òÌåÖÐÎÄ×ÊÔ´ - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) -#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 "È·¶¨", IDOK, 129, 7, 50, 14 - PUSHBUTTON "È¡Ïû", IDCANCEL, 129, 24, 50, 14 -END - -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 @@ 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 "È·¶¨", IDOK, 35, 97, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 END + +/* Strings */ STRINGTABLE BEGIN @@ -64,52 +40,10 @@ 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 +/* Menus */ - -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "ÓÎÏ·(&G)" BEGIN @@ -127,26 +61,11 @@ 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 // ÖÐÎÄ×ÊÔ´ - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED 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 Sun Jun 3 15:58:45 2007 @@ -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 Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Sun Jun 3 15:58:45 2007 @@ -1,5 +1,9 @@ #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" 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 Sun Jun 3 15:58:45 2007 @@ -64,12 +64,12 @@ 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);

17 years, 6 months

[dgorbachev] 26971: Solitaire patch by Pierre Schweitzer (bug #2275).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Jun 3 01:47:06 2007 New Revision: 26971 URL: http://svn.reactos.org/svn/reactos?rev=26971&view=rev Log: Solitaire patch by Pierre Schweitzer (bug #2275). Removed: trunk/reactos/base/applications/games/solitaire/sol.rc Modified: 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/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/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.rbuild 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 Sun Jun 3 01:47:06 2007 @@ -55,6 +55,13 @@ PUSHBUTTON "Abbrechen",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 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 Sun Jun 3 01:47:06 2007 @@ -54,6 +54,13 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 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 Sun Jun 3 01:47:06 2007 @@ -53,6 +53,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -39,21 +39,30 @@ 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 @@ -70,7 +79,6 @@ END END #endif // APSTUDIO_INVOKED - #ifdef APSTUDIO_INVOKED 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 Sun Jun 3 01:47:06 2007 @@ -54,6 +54,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -53,6 +53,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -54,6 +54,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -52,6 +52,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -54,6 +54,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -53,6 +53,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -54,6 +54,14 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 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 ///// 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 Sun Jun 3 01:47:06 2007 @@ -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 Removed: trunk/reactos/base/applications/games/solitaire/sol.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/sol.rc (original) +++ trunk/reactos/base/applications/games/solitaire/sol.rc (removed) @@ -1,1 +1,0 @@ -#include "rsrc.rc" 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 Sun Jun 3 01:47:06 2007 @@ -15,7 +15,9 @@ HWND hwndStatus; HINSTANCE hInstance; -TCHAR szAppName[] = _T("Solitaire"); +TCHAR szAppName[128]; +TCHAR MsgQuit[128]; +TCHAR MsgAbout[128]; INT nOptions = 8; CardWindow SolWnd; @@ -48,6 +50,12 @@ HACCEL hAccelTable; 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); @@ -232,7 +240,7 @@ 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 @@ 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) { 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 Sun Jun 3 01:47:06 2007 @@ -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>

17 years, 6 months

[dgorbachev] 26970: - Fix LiveCD boot error. - Remove MPW thread hack.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Jun 3 01:20:12 2007 New Revision: 26970 URL: http://svn.reactos.org/svn/reactos?rev=26970&view=rev Log: - Fix LiveCD boot error. - Remove MPW thread hack. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sun Jun 3 01:20:12 2007 @@ -250,17 +250,27 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&KeyHandle, - KEY_CREATE_LINK, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, - &Disposition); - if (!NT_SUCCESS(Status)) return Status; - - /* Sanity check */ - ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* The key has been created by mkhive */ + if ((CmpMiniNTBoot) && (CmpShareSystemHives)) + { + Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; + } + else + { + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + } /* Initialize the symbolic link name */ sprintf(Buffer, Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Sun Jun 3 01:20:12 2007 @@ -516,7 +516,7 @@ /* * Initialise the modified page writer. */ - if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); + MmInitMpwThread(); /* Initialize the balance set manager */ MmInitBsmThread();

17 years, 6 months

[ekohl] 26969: Add options dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 2 20:32:19 2007 New Revision: 26969 URL: http://svn.reactos.org/svn/reactos?rev=26969&view=rev Log: Add options dialog. Modified: 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/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 trunk/reactos/base/applications/games/solitaire/solitaire.h 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 Sat Jun 2 20:32:19 2007 @@ -37,6 +37,22 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,129,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,129,24,50,14 +END + +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Optionen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Karten", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK",IDOK,35,97,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 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 Sat Jun 2 20:32:19 2007 @@ -37,6 +37,23 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,129,7,50,14 PUSHBUTTON "Cancel",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 + + 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 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 Sat Jun 2 20:32:19 2007 @@ -39,6 +39,21 @@ PUSHBUTTON "Cancelar",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -39,6 +39,21 @@ 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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -40,6 +40,21 @@ PUSHBUTTON "Batal",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -39,6 +39,21 @@ PUSHBUTTON "Annulla",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -40,6 +40,21 @@ PUSHBUTTON "Avbryt",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -38,6 +38,21 @@ PUSHBUTTON "Anuluj",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -40,6 +40,21 @@ PUSHBUTTON "Â¡àÅÔ¡", 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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -39,6 +39,21 @@ PUSHBUTTON "Ñêàñóâàòè",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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -40,6 +40,21 @@ PUSHBUTTON "È¡Ïû", 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 + + 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 +END ///// // DESIGNINFO 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 Sat Jun 2 20:32:19 2007 @@ -5,13 +5,21 @@ #define IDD_DIALOG1 101 #define IDR_MENU1 102 #define IDR_ACCELERATOR1 103 -#define IDI_ICON1 104 + +#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 + +#define IDD_OPTIONS 1200 +#define IDC_OPT_DRAWONE 1201 +#define IDC_OPT_DRAWTHREE 1202 +#define IDC_OPT_SHOWTIME 1203 +#define IDC_OPT_STATUSBAR 1204 // Next default values for new objects // 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 Sat Jun 2 20:32:19 2007 @@ -319,7 +319,7 @@ { TRACE("ENTER DeckClickProc()\n"); CardStack cardstack = stackobj.GetCardStack(); - CardStack pile = pPile->GetCardStack(); + CardStack pile = pPile->GetCardStack(); fGameStarted = true; @@ -336,8 +336,8 @@ } else { - int numcards = min(3, cardstack.NumCards()); - + int numcards = min((nOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); + //make a "visible" copy of these cards CardStack temp; temp = cardstack.Pop(numcards); 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 Sat Jun 2 20:32:19 2007 @@ -16,6 +16,7 @@ HINSTANCE hInstance; TCHAR szAppName[] = _T("Solitaire"); +INT nOptions = 8; CardWindow SolWnd; @@ -44,7 +45,7 @@ MSG msg; WNDCLASSEX wndclass; INITCOMMONCONTROLSEX ice; - HACCEL hAccelTable; + HACCEL hAccelTable; hInstance = hInst; @@ -111,6 +112,51 @@ return msg.wParam; } +VOID LoadSettings(VOID) +{ + +} + +BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE, + (nOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); + + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + nOptions &= ~OPTION_THREE_CARDS; + if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) + nOptions |= OPTION_THREE_CARDS; + + EndDialog(hDlg, TRUE); + return TRUE; + + case IDCANCEL: + EndDialog(hDlg, FALSE); + return TRUE; + } + break; + } + return FALSE; +} + +VOID ShowGameOptionsDlg(HWND hwnd) +{ + INT nOldOptions = nOptions; + + if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) + { + if ((nOldOptions & OPTION_THREE_CARDS) != (nOptions & OPTION_THREE_CARDS)) + NewGame(); + } +} //----------------------------------------------------------------------------- LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) @@ -126,7 +172,7 @@ { case WM_CREATE: hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, "Ready", hwnd, 0); - + //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); @@ -156,14 +202,12 @@ //MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); //parts[0] = nWidth - 256; //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); - return 0; case WM_GETMINMAXINFO: - mmi = (MINMAXINFO *)lParam; + mmi = (MINMAXINFO *)lParam; mmi->ptMinTrackSize.x = 600; mmi->ptMinTrackSize.y = 400; - return 0; case WM_COMMAND: @@ -180,18 +224,15 @@ return 0; case IDM_GAME_OPTIONS: - //ShowGameOptionsDlg(hwnd); + ShowGameOptionsDlg(hwnd); return 0; case IDM_HELP_CONTENTS: - WinHelp(hwnd, szHelpPath, HELP_CONTENTS, 0);//HELP_KEY, (DWORD)"How to play"); - 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); - return 0; case IDM_GAME_EXIT: Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sat Jun 2 20:32:19 2007 @@ -4,6 +4,10 @@ extern CardWindow SolWnd; extern TCHAR szAppName[]; extern bool fGameStarted; + +#define OPTION_THREE_CARDS 8 + +extern INT nOptions; void CreateSol(); void NewGame(void);

17 years, 6 months

[greatlrd] 26968: commited bugfix if we got if (my) dxallocfree and so on, also fixed the alloc macro it always zero the memory buffer

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 2 19:09:52 2007 New Revision: 26968 URL: http://svn.reactos.org/svn/reactos?rev=26968&view=rev Log: commited bugfix if we got if (my) dxallocfree and so on, also fixed the alloc macro it always zero the memory buffer Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat Jun 2 19:09:52 2007 @@ -41,9 +41,17 @@ #define DxHeapMemFree(p) HeapFree(GetProcessHeap(), 0, p); \ p = NULL; */ -#define DxHeapMemAlloc(p, m) p = malloc(m) -#define DxHeapMemFree(p) free(p); \ - p = NULL; +#define DxHeapMemAlloc(p, m) { \ + p = malloc(m); \ + if (p != NULL) \ + { \ + ZeroMemory(p,m); \ + } \ + } +#define DxHeapMemFree(p) { \ + free(p); \ + p = NULL; \ + } /******** Main Object ********/ Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sat Jun 2 19:09:52 2007 @@ -486,8 +486,8 @@ /* Alloc mpFourCC */ - //if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) - { + // if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) + // { //mpFourCC = (DWORD *) DxHeapMemAlloc( sizeof(DWORD) * 21); // DxHeapMemAlloc(mpFourCC, sizeof(DWORD) * 21); @@ -500,7 +500,7 @@ return DD_FALSE; } */ - } + // } DX_STUB_str("Here\n"); @@ -553,7 +553,7 @@ { char buffer[2048]; - sprintf ( buffer, "test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes); + sprintf ( buffer, "3 test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes); OutputDebugStringA(buffer); }

17 years, 6 months

[greatlrd] 26967: sorry startup.c are bit messy but I change heapalloc to malloc and guess what all our weird problem are gone.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 2 18:42:43 2007 New Revision: 26967 URL: http://svn.reactos.org/svn/reactos?rev=26967&view=rev Log: sorry startup.c are bit messy but I change heapalloc to malloc and guess what all our weird problem are gone. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat Jun 2 18:42:43 2007 @@ -106,7 +106,7 @@ DDHAL_CREATESURFACEDATA mDdCreateSurface; - That[0]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); + DxHeapMemAlloc( That[0]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); if (That[0]->lpLcl->lpSurfMore == NULL) { DxHeapMemFree(That); @@ -198,7 +198,7 @@ { - That[t]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); + DxHeapMemAlloc(That[t]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); if (That[t]->lpLcl->lpSurfMore == NULL) { DxHeapMemFree(That); Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sat Jun 2 18:42:43 2007 @@ -35,8 +35,14 @@ VOID Cleanup(LPDIRECTDRAW7 iface); /* own macro to alloc memmory */ + +/* #define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) #define DxHeapMemFree(p) HeapFree(GetProcessHeap(), 0, p); \ + p = NULL; +*/ +#define DxHeapMemAlloc(p, m) p = malloc(m) +#define DxHeapMemFree(p) free(p); \ p = NULL; /******** Main Object ********/ Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sat Jun 2 18:42:43 2007 @@ -106,7 +106,7 @@ /* FIXME HACK linking does not working we need figout why */ LPDDRAWI_DIRECTDRAW_INT memThis; - memThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + DxHeapMemAlloc(memThis, sizeof(DDRAWI_DIRECTDRAW_INT)); This = memThis; if (This == NULL) { @@ -118,7 +118,7 @@ } /* Fixme release memory alloc if we fail */ - This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + DxHeapMemAlloc(This->lpLcl, sizeof(DDRAWI_DIRECTDRAW_INT)); if (This->lpLcl == NULL) { DX_STUB_str("DDERR_OUTOFMEMORY"); @@ -194,7 +194,8 @@ This->lpLcl->lpGbl->dwRefCnt++; if (ddgbl.lpDDCBtmp == NULL) { - ddgbl.lpDDCBtmp = (LPDDHAL_CALLBACKS) DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); + // LPDDHAL_CALLBACKS + DxHeapMemAlloc( ddgbl.lpDDCBtmp , sizeof(DDHAL_CALLBACKS)); if (ddgbl.lpDDCBtmp == NULL) { DX_STUB_str("Out of memmory\n"); @@ -403,7 +404,7 @@ HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable) { - LPDWORD mpFourCC; + LPDWORD mpFourCC = NULL; DDHALINFO mHALInfo; BOOL newmode = FALSE; LPDDSURFACEDESC mpTextures; @@ -411,6 +412,7 @@ D3DHAL_GLOBALDRIVERDATA mD3dDriverData; DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + INT count; DX_WINDBG_trace(); @@ -423,7 +425,7 @@ { if (ddgbl.lpDDCBtmp == NULL) { - ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); + DxHeapMemAlloc(ddgbl.lpDDCBtmp, sizeof(DDHAL_CALLBACKS)); if ( ddgbl.lpDDCBtmp == NULL) { return DD_FALSE; @@ -462,7 +464,7 @@ &mD3dDriverData, &mD3dBufferCallbacks, NULL, - NULL, + mpFourCC, NULL)) { DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); @@ -471,24 +473,44 @@ return DD_FALSE; } + + { + char buffer[2048]; + sprintf ( buffer, "test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes); + OutputDebugStringA(buffer); + } + + // count = mHALInfo.ddCaps.dwNumFourCCCodes; + DX_STUB_str("Here\n"); -#if 0 + /* Alloc mpFourCC */ - mpFourCC = NULL; - if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) - { - mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * mHALInfo.ddCaps.dwNumFourCCCodes); + + //if (mHALInfo.ddCaps.dwNumFourCCCodes > 0 ) + { + //mpFourCC = (DWORD *) DxHeapMemAlloc( sizeof(DWORD) * 21); + // DxHeapMemAlloc(mpFourCC, sizeof(DWORD) * 21); + + // mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * (mHALInfo.ddCaps.dwNumFourCCCodes + 2)); + /* if (mpFourCC == NULL) { DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call return DD_FALSE; } - } - DX_STUB_str("Here\n"); -#else - mpFourCC = NULL; -#endif + */ + } + + DX_STUB_str("Here\n"); + + { + char buffer[2048]; + sprintf ( buffer, "test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes); + OutputDebugStringA(buffer); + } + + /* Alloc mpTextures */ #if 0 mpTextures = NULL; @@ -529,6 +551,12 @@ return DD_FALSE; } + { + char buffer[2048]; + sprintf ( buffer, "test %d %d\n", mpFourCC, mHALInfo.ddCaps.dwNumFourCCCodes); + OutputDebugStringA(buffer); + } + memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO));

17 years, 6 months

[greatlrd] 26966: Fixing Getavil memory

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 2 18:01:43 2007 New Revision: 26966 URL: http://svn.reactos.org/svn/reactos?rev=26966&view=rev Log: Fixing Getavil memory Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat Jun 2 18:01:43 2007 @@ -164,11 +164,12 @@ } DDHAL_GETAVAILDRIVERMEMORYDATA memdata; + ZeroMemory(&memdata, sizeof(DDHAL_GETAVAILDRIVERMEMORYDATA)); memdata.lpDD = This->lpLcl->lpGbl; memdata.ddRVal = DDERR_INVALIDPARAMS; memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); - if (This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) + if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) return DDERR_NODIRECTDRAWHW; if (dwTotal) Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sat Jun 2 18:01:43 2007 @@ -548,12 +548,15 @@ // DxHeapMemFree( mpTextures); /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */ - DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 }; - DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); - DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; - DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->cbDDMiscellaneousCallbacks; - DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); - if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) + DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 }; + DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + + DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->HALDDMiscellaneous; + + DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); + + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) { DxHeapMemFree(mpFourCC); DxHeapMemFree(mpTextures); @@ -562,6 +565,29 @@ return DD_FALSE; } + /* try get the memory and show it */ + if (ddgbl.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory) + { + DDHAL_GETAVAILDRIVERMEMORYDATA memdata; + char buffer[2048]; + + ZeroMemory(&memdata, sizeof(DDHAL_GETAVAILDRIVERMEMORYDATA)); + + + DX_STUB_str("found GetAvailDriverMemory, testing \n"); + memdata.lpDD = &ddgbl; + memdata.ddRVal = DDERR_GENERIC; + ddgbl.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemory(&memdata); + + sprintf ( buffer, "GetAvailDriverMemory : retval %ld, Graphice memory free %ld Bytes, memory total %ld Bytes\n",memdata.ddRVal,memdata.dwFree,memdata.dwTotal); + OutputDebugStringA(buffer); + + + + + } + + DX_STUB_str("Return DD_OK\n"); return DD_OK; }

17 years, 6 months

[greatlrd] 26965: protect DirectDrawCreateEx with seh no more crash

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 2 17:26:33 2007 New Revision: 26965 URL: http://svn.reactos.org/svn/reactos?rev=26965&view=rev Log: protect DirectDrawCreateEx with seh no more crash Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Jun 2 17:26:33 2007 @@ -12,6 +12,9 @@ #include "rosdraw.h" +/* PSEH for SEH Support */ +#include <pseh/pseh.h> + CRITICAL_SECTION ddcs; // This function is exported by the dll @@ -55,27 +58,38 @@ REFIID id, LPUNKNOWN pUnkOuter) { + HRESULT retVal = DDERR_GENERIC; /* remove this when UML digram are in place this api is finish and is working as it should */ DX_WINDBG_trace(); - /* check see if pUnkOuter is null or not */ - if (pUnkOuter) - { - /* we are using same error code as MS*/ - return CLASS_E_NOAGGREGATION; - } - - /* Is it a DirectDraw 7 Request or not */ - if (!IsEqualGUID(id, &IID_IDirectDraw7)) - { - return DDERR_INVALIDPARAMS; - } - - /* Create our DirectDraw interface */ - return Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); + _SEH_TRY + { + /* check see if pUnkOuter is null or not */ + if (pUnkOuter) + { + /* we are using same error code as MS*/ + return CLASS_E_NOAGGREGATION; + } + + /* Is it a DirectDraw 7 Request or not */ + if (!IsEqualGUID(id, &IID_IDirectDraw7)) + { + return DDERR_INVALIDPARAMS; + } + + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); + + /* Create our DirectDraw interface */ + } + _SEH_HANDLE + { + } + _SEH_END; + + return retVal; } /*

17 years, 6 months

[frik85] 26964: MediaWiki: commit new-"old" version, to make upcoming update-process easier

by frik85＠svn.reactos.org

17 years, 6 months

← Newer
1
...
34
35
36
37
38
39
40
41
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007