Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 27958: Fix definition of DbgPrint to be compatible
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 22:03:17 2007 New Revision: 27958 URL: http://svn.reactos.org/svn/reactos?rev=27958&view=rev Log: Fix definition of DbgPrint to be compatible Modified: trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Sat Jul 28 22:03:17 2007 @@ -25,7 +25,7 @@ #define inline __inline #endif -unsigned long DbgPrint(const char *Format,...); +ULONG DbgPrint(const char *Format,...); struct _GUID;

1 0

[weiden] 27957: Fix incompatible pointer types
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 22:01:30 2007 New Revision: 27957 URL: http://svn.reactos.org/svn/reactos?rev=27957&view=rev Log: Fix incompatible pointer types Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c Sat Jul 28 22:01:30 2007 @@ -88,7 +88,7 @@ void PerfDataRefresh(void) { - ULONG ulSize; + SIZE_T ulSize; NTSTATUS status; LPBYTE pBuffer; ULONG BufferSize;

1 0

[weiden] 27956: Fix return types
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 21:55:58 2007 New Revision: 27956 URL: http://svn.reactos.org/svn/reactos?rev=27956&view=rev Log: Fix return types Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c trunk/reactos/lib/3rdparty/mingw/wcrt1.c Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt1.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt1.c (original) +++ trunk/reactos/lib/3rdparty/mingw/crt1.c Sat Jul 28 21:55:58 2007 @@ -98,11 +98,11 @@ /* This function will be called when a trap occurs. Thanks to Jacob Navia for his contribution. */ -static CALLBACK long +static LONG CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data) { void (*old_handler) (int); - long action = EXCEPTION_CONTINUE_SEARCH; + LONG action = EXCEPTION_CONTINUE_SEARCH; int reset_fpu = 0; switch (exception_data->ExceptionRecord->ExceptionCode) Modified: trunk/reactos/lib/3rdparty/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wcrt1.c… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wcrt1.c (original) +++ trunk/reactos/lib/3rdparty/mingw/wcrt1.c Sat Jul 28 21:55:58 2007 @@ -99,11 +99,11 @@ /* This function will be called when a trap occurs. Thanks to Jacob Navia for his contribution. */ -static CALLBACK long +static LONG CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data) { void (*old_handler) (int); - long action = EXCEPTION_CONTINUE_SEARCH; + LONG action = EXCEPTION_CONTINUE_SEARCH; int reset_fpu = 0; switch (exception_data->ExceptionRecord->ExceptionCode)

1 0

[janderwald] 27955: - fix cmd not to crash when just typing "start" [enter] See issue #2294 for more details.
by janderwald＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: janderwald Date: Sat Jul 28 21:48:23 2007 New Revision: 27955 URL: http://svn.reactos.org/svn/reactos?rev=27955&view=rev Log: - fix cmd not to crash when just typing "start" [enter] See issue #2294 for more details. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Sat Jul 28 21:48:23 2007 @@ -97,7 +97,7 @@ return 1; } SetLastError(0); - size = GetEnvironmentVariable (_T("COMSPEC"), comspec, 512); + size = GetEnvironmentVariable (_T("COMSPEC"), comspec, MAX_PATH); if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) { RestWithoutArgs[0] = _T('c'); @@ -127,7 +127,7 @@ _tcscat(RestWithoutArgs,_T("\"")); } - rest = malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); + rest = malloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL) @@ -136,7 +136,7 @@ return 1; } - param =malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); + param =malloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL)

1 0

[weiden] 27954: Remove duplicate definition of SHChangeNotification_Lock
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 21:47:49 2007 New Revision: 27954 URL: http://svn.reactos.org/svn/reactos?rev=27954&view=rev Log: Remove duplicate definition of SHChangeNotification_Lock Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Sat Jul 28 21:47:49 2007 @@ -1105,8 +1105,6 @@ ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg, int cEntries, SHChangeNotifyEntry *pshcne); BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID); -HANDLE WINAPI SHChangeNotification_Lock(HANDLE hChangeNotification, DWORD dwProcessId, - LPITEMIDLIST **pppidl, LONG *plEvent); BOOL WINAPI SHChangeNotification_Unlock(HANDLE hLock); HRESULT WINAPI SHGetRealIDL(IShellFolder *psf, LPCITEMIDLIST pidlSimple, LPITEMIDLIST * ppidlReal);

1 0

[weiden] 27953: Fix warnings with -O3
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 21:44:39 2007 New Revision: 27953 URL: http://svn.reactos.org/svn/reactos?rev=27953&view=rev Log: Fix warnings with -O3 Modified: trunk/reactos/base/applications/network/arp/arp.c Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/arp.c (original) +++ trunk/reactos/base/applications/network/arp/arp.c Sat Jul 28 21:44:39 2007 @@ -153,7 +153,7 @@ UINT i, k; PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPADDRTABLE pIpAddrTable = NULL; - DWORD Size = 0; + ULONG Size = 0; struct in_addr inaddr, inaddr2; PTCHAR pszIpAddr; TCHAR szIntIpAddr[20]; @@ -413,7 +413,7 @@ { PMIB_IPNETROW pDelHost = NULL; PMIB_IPNETTABLE pIpNetTable = NULL; - DWORD Size = 0; + ULONG Size = 0; DWORD dwIpAddr = 0; INT iRet; BOOL bFlushTable = FALSE;

1 0

[weiden] 27952: Correctly calculate message time. Fixes slow clicks being interpreted as double clicks. See issue #2238 for more details.
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 21:16:51 2007 New Revision: 27952 URL: http://svn.reactos.org/svn/reactos?rev=27952&view=rev Log: Correctly calculate message time. Fixes slow clicks being interpreted as double clicks. See issue #2238 for more details. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h Sat Jul 28 21:16:51 2007 @@ -268,6 +268,12 @@ VOID FASTCALL MsqRemoveTimersWindow(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd); +static __inline LONG +MsqCalculateMessageTime(IN PLARGE_INTEGER TickCount) +{ + return (LONG)(TickCount->QuadPart * (KeQueryTimeIncrement() / 10000)); +} + #endif /* _WIN32K_MSGQUEUE_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Sat Jul 28 21:16:51 2007 @@ -984,7 +984,7 @@ { LARGE_INTEGER LargeTickCount; KeQueryTickCount(&LargeTickCount); - mi->time = LargeTickCount.u.LowPart; + mi->time = MsqCalculateMessageTime(&LargeTickCount); } SwapButtons = CurInfo->SwapButtons; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Sat Jul 28 21:16:51 2007 @@ -1224,7 +1224,7 @@ IntGetCursorLocation(PsGetCurrentThreadWin32Thread()->Desktop->WindowStation, &KernelModeMsg.pt); KeQueryTickCount(&LargeTickCount); - KernelModeMsg.time = LargeTickCount.u.LowPart * (KeQueryTimeIncrement() / 10000); + KernelModeMsg.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(Window->MessageQueue, &KernelModeMsg, NULL != MsgMemoryEntry && 0 != KernelModeMsg.lParam, QS_POSTMESSAGE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Sat Jul 28 21:16:51 2007 @@ -163,7 +163,7 @@ } KeQueryTickCount(&LargeTickCount); - Msg->time = LargeTickCount.u.LowPart; + Msg->time = MsqCalculateMessageTime(&LargeTickCount); /* * If we got WM_MOUSEMOVE and there are already messages in the @@ -694,7 +694,7 @@ Msg.lParam = lParam; KeQueryTickCount(&LargeTickCount); - Msg.time = LargeTickCount.u.LowPart; + Msg.time = MsqCalculateMessageTime(&LargeTickCount); /* We can't get the Msg.pt point here since we don't know thread (and thus the window station) the message will end up in yet. */ @@ -770,7 +770,7 @@ Mesg.wParam = wParam; Mesg.lParam = lParam; KeQueryTickCount(&LargeTickCount); - Mesg.time = LargeTickCount.u.LowPart; + Mesg.time = MsqCalculateMessageTime(&LargeTickCount); IntGetCursorLocation(WinSta, &Mesg.pt); MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); ObmDereferenceObject(Window); @@ -1787,7 +1787,7 @@ Msg->wParam = (WPARAM) Timer->IDEvent; Msg->lParam = (LPARAM) Timer->TimerFunc; KeQueryTickCount(&LargeTickCount); - Msg->time = LargeTickCount.u.LowPart; + Msg->time = MsqCalculateMessageTime(&LargeTickCount); IntGetCursorLocation(PsGetCurrentThreadWin32Thread()->Desktop->WindowStation, &Msg->pt);

1 0

[janderwald] 27951: - set USERNAME environment variable See issue #2487 for more details.
by janderwald＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: janderwald Date: Sat Jul 28 20:29:33 2007 New Revision: 27951 URL: http://svn.reactos.org/svn/reactos?rev=27951&view=rev Log: - set USERNAME environment variable See issue #2487 for more details. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c (original) +++ trunk/reactos/dll/win32/userenv/environment.c Sat Jul 28 20:29:33 2007 @@ -383,7 +383,17 @@ /* FIXME: Set 'USERDOMAIN' variable */ - /* FIXME: Set 'USERNAME' variable */ + Length = MAX_PATH; + if (GetUserNameW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERNAME", + Buffer, + FALSE); + } + + /* Set user environment variables */ SetUserEnvironment (lpEnvironment,

1 0

[weiden] 27950: Also hand 0 read bytes to XML_Parse to make sure we always signal that we're done reading the document
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 19:47:56 2007 New Revision: 27950 URL: http://svn.reactos.org/svn/reactos?rev=27950&view=rev Log: Also hand 0 read bytes to XML_Parse to make sure we always signal that we're done reading the document Modified: trunk/rosapps/downloader/xml.c Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=27950… ============================================================================== --- trunk/rosapps/downloader/xml.c (original) +++ trunk/rosapps/downloader/xml.c Sat Jul 28 19:47:56 2007 @@ -190,7 +190,7 @@ size_t len = fread (buffer, 1, sizeof(buffer), file); done = len < sizeof(buffer); - if(len > 0 && !XML_Parse(parser, buffer, len, done)) + if(!XML_Parse(parser, buffer, len, done)) { MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); return FALSE;

1 0

[ekohl] 27949: - Load and save game settings. - Disable unused dialog controls and menu items.
by ekohl＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: ekohl Date: Sat Jul 28 17:03:13 2007 New Revision: 27949 URL: http://svn.reactos.org/svn/reactos?rev=27949&view=rev Log: - Load and save game settings. - Disable unused dialog controls and menu items. Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/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/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Èçòåãëè &åäíà", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Ðàçäàâàíå\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Òåñòå...", IDM_GAME_DECK + MENUITEM "&Òåñòå...", IDM_GAME_DECK, GRAYED MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Èç&õîä", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ 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 + AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK",IDOK,35,97,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Karten geben\t F2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Deckblatt...", IDM_GAME_DECK + MENUITEM "&Deckblatt...", IDM_GAME_DECK, GRAYED MENUITEM "&Optionen...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Beenden", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc Sat Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "Ñßîå ¸&íá", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK + MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED MENUITEM "&ÅðéëïãÝò...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "¸&îïäïò", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK + MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Exit", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Barajar...", IDM_GAME_DECK + MENUITEM "&Barajar...", IDM_GAME_DECK, GRAYED MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Salir", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ 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 "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 + AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Donne\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Jeux...", IDM_GAME_DECK + MENUITEM "&Jeux...", IDM_GAME_DECK, GRAYED MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Giliran\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Dek...", IDM_GAME_DECK + MENUITEM "&Dek...", IDM_GAME_DECK, GRAYED MENUITEM "&Opsi...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Keluar", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Dai carte\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Maz&zo...", IDM_GAME_DECK + MENUITEM "Maz&zo...", IDM_GAME_DECK, GRAYED MENUITEM "O&pzioni...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Esci", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "&Del ut\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "Kort&stokk...", IDM_GAME_DECK + MENUITEM "Kort&stokk...", IDM_GAME_DECK, GRAYED MENUITEM "&Valg...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Avslutt", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -20,8 +20,8 @@ AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 @@ -47,7 +47,7 @@ BEGIN MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Talia...", IDM_GAME_DECK + MENUITEM "&Talia...", IDM_GAME_DECK, GRAYED MENUITEM "&Opcje...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Zakoñcz", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Sat Jul 28 17:03:13 2007 @@ -16,8 +16,8 @@ AUTORADIOBUTTON "Ïî &îäíîé", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14 @@ -43,7 +43,7 @@ BEGIN MENUITEM "Í&îâàÿ èãðà\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK + MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK, GRAYED MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Âûõîä", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 28 17:03:13 2007 @@ -23,8 +23,8 @@ AUTORADIOBUTTON "aha &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP - AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 @@ -50,7 +50,7 @@ BEGIN MENUITEM "&Rozda\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Balíèek...", IDM_GAME_DECK + MENUITEM "&Balíèek...", IDM_GAME_DECK, GRAYED MENUITEM "&Monosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Sk&onèi", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14 PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "á&¨¡ä¾è\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK + MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK, GRAYED MENUITEM "&µÑÇàÅ×Í¡...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&ÍÍ¡", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -21,8 +21,8 @@ AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 - AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP - AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Ðîçäàòè êàðòè\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Êîëîäà...", IDM_GAME_DECK + MENUITEM "&Êîëîäà...", IDM_GAME_DECK, GRAYED MENUITEM "&Ïàðàìåòðè...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "Â&èõ³ä", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -22,8 +22,8 @@ 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 + AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14 PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 @@ -49,7 +49,7 @@ BEGIN MENUITEM "·¢ÅÆ(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK + MENUITEM "±³ÃæÍ¼°¸(&C)...", IDM_GAME_DECK, GRAYED MENUITEM "Ñ¡Ïî(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "ÍË³ö(&X)", IDM_GAME_EXIT 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 Jul 28 17:03:13 2007 @@ -338,7 +338,7 @@ } else { - int numcards = min((nOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); + int numcards = min((dwOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); //make a "visible" copy of these cards CardStack temp; 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 Jul 28 17:03:13 2007 @@ -19,7 +19,7 @@ TCHAR MsgQuit[128]; TCHAR MsgAbout[128]; TCHAR MsgWin[128]; -INT nOptions = 8; +DWORD dwOptions = 8; CardWindow SolWnd; @@ -28,10 +28,64 @@ void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt) { TCHAR *ptr; - + ptr = szDest + GetModuleFileName(GetModuleHandle(0), szDest, nDestLen) - 1; while(*ptr-- != '.'); lstrcpy(ptr + 1, szExt); +} + +VOID LoadSettings(VOID) +{ + DWORD dwDisposition; + DWORD dwSize; + HKEY hKey; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + &dwDisposition)) + return; + + dwSize = sizeof(DWORD); + RegQueryValueEx(hKey, + _T("Options"), + NULL, + NULL, + (LPBYTE)&dwOptions, + &dwSize); + + RegCloseKey(hKey); +} + +VOID SaveSettings(VOID) +{ + DWORD dwDisposition; + HKEY hKey; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition)) + return; + + RegSetValueEx(hKey, + _T("Options"), + 0, + REG_DWORD, + (CONST BYTE *)&dwOptions, + sizeof(DWORD)); + + RegCloseKey(hKey); } // @@ -76,11 +130,11 @@ // InitCardLib(); -// LoadSettings(); + LoadSettings(); //Construct the path to our help file MakePath(szHelpPath, MAX_PATH, _T(".hlp")); - + hwnd = CreateWindow(szAppName, // window class name szAppName, // window caption WS_OVERLAPPEDWINDOW @@ -110,15 +164,11 @@ } } -// SaveSettings(); + SaveSettings(); return msg.wParam; } -VOID LoadSettings(VOID) -{ - -} BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -126,7 +176,7 @@ { case WM_INITDIALOG: CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE, - (nOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); + (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); return TRUE; @@ -134,9 +184,9 @@ switch(LOWORD(wParam)) { case IDOK: - nOptions &= ~OPTION_THREE_CARDS; + dwOptions &= ~OPTION_THREE_CARDS; if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) - nOptions |= OPTION_THREE_CARDS; + dwOptions |= OPTION_THREE_CARDS; EndDialog(hDlg, TRUE); return TRUE; @@ -152,13 +202,13 @@ 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(); - } + DWORD dwOldOptions = dwOptions; + + if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) + { + if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS)) + NewGame(); + } } //----------------------------------------------------------------------------- @@ -214,7 +264,6 @@ return 0; case WM_COMMAND: - switch(LOWORD(wParam)) { case IDM_GAME_NEW: @@ -246,9 +295,7 @@ return 0; case WM_CLOSE: - ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); - if(ret == IDOK) { WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); 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 Jul 28 17:03:13 2007 @@ -7,7 +7,7 @@ #define OPTION_THREE_CARDS 8 -extern INT nOptions; +extern DWORD dwOptions; void CreateSol(); void NewGame(void);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs