Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[weiden] 28137: Patch by Frode Lillerud <frode@enkelt.no> - Basic implementation of logoff.exe See issue #2509 for more details.
by weiden＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: weiden Date: Fri Aug 3 19:14:49 2007 New Revision: 28137 URL: http://svn.reactos.org/svn/reactos?rev=28137&view=rev Log: Patch by Frode Lillerud <frode(a)enkelt.no> - Basic implementation of logoff.exe See issue #2509 for more details. Added: trunk/reactos/base/applications/logoff/ trunk/reactos/base/applications/logoff/lang/ trunk/reactos/base/applications/logoff/lang/en-US.rc (with props) trunk/reactos/base/applications/logoff/lang/nb-NO.rc (with props) trunk/reactos/base/applications/logoff/logoff.c (with props) trunk/reactos/base/applications/logoff/logoff.rbuild (with props) trunk/reactos/base/applications/logoff/logoff.rc (with props) trunk/reactos/base/applications/logoff/misc.c (with props) trunk/reactos/base/applications/logoff/precomp.h (with props) trunk/reactos/base/applications/logoff/resource.h (with props) trunk/reactos/base/applications/logoff/rsrc.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Fri Aug 3 19:14:49 2007 @@ -24,6 +24,9 @@ </directory> <directory name="hostname"> <xi:include href="hostname/hostname.rbuild" /> +</directory> +<directory name="logoff"> + <xi:include href="logoff/logoff.rbuild" /> </directory> <directory name="msconfig"> <xi:include href="msconfig/msconfig.rbuild" /> Added: trunk/reactos/base/applications/logoff/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/en-US.rc (added) +++ trunk/reactos/base/applications/logoff/lang/en-US.rc Fri Aug 3 19:14:49 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Terminates a session.\n\n\ + /v\t\tDisplays information about the actions performed.\n\ + /?\t\tShows this information.\n\n" + +IDS_LOGOFF_REMOTE, "Terminating session on remote machine." +IDS_LOGOFF_LOCAL, "Terminating the current session on this machine." + +IDS_ILLEGAL_PARAM, "Invalid parameter(s)\n" +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/logoff/lang/nb-NO.rc Fri Aug 3 19:14:49 2007 @@ -1,0 +1,16 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Avslutter en sesjon.\n\n\ + /v\t\tViser informasjon om handlingen som utføres.\n\ + /?\t\tViser denne informasjonen.\n\n" + +IDS_LOGOFF_REMOTE, "Logger av økt på en annen maskin" +IDS_LOGOFF_LOCAL, "Logger av økten på denne maskinen." + +IDS_ILLEGAL_PARAM, "En eller flere ugyldige parametre.\n" +} + +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/logoff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/logoff.c (added) +++ trunk/reactos/base/applications/logoff/logoff.c Fri Aug 3 19:14:49 2007 @@ -1,0 +1,146 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS logoff utility + * FILE: base\applications\logoff\logoff.c + * PURPOSE: Logoff current session, or another session, potentially on another machine + * AUTHOR: 30.07.2007 - Frode Lillerud + */ + +/* Note + * This application is a lightweight version of shutdown.exe. It is intended to be function-compatible + * with Windows' system32\logoff.exe commandline application. + */ + +#define NDEBUG +#include "precomp.h" + +//Commandline argument switches +LPTSTR szRemoteServerName = NULL; +BOOL bVerbose; + +//---------------------------------------------------------------------- +// +//Retrieve resource string and output the Usage to the console +// +//---------------------------------------------------------------------- +static void PrintUsage() { + LPTSTR lpUsage = NULL; + + if (AllocAndLoadString(&lpUsage, GetModuleHandle(NULL), IDS_USAGE)) { + _putts(lpUsage); + } + +} + +//---------------------------------------------------------------------- +// +// Writes the last error as both text and error code to the console. +// +//---------------------------------------------------------------------- +void DisplayLastError() +{ + int errorCode = GetLastError(); + LPTSTR lpMsgBuf; + + // Display the error message to the user + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errorCode, + LANG_USER_DEFAULT, + (LPTSTR) &lpMsgBuf, + 0, + NULL); + + _ftprintf(stderr, lpMsgBuf); + _ftprintf(stderr, _T("Error code: %d\n"), errorCode); + + LocalFree(lpMsgBuf); +} + +//---------------------------------------------------------------------- +// +//Sets flags based on commandline arguments +// +//---------------------------------------------------------------------- +BOOL ParseCommandLine(int argc, TCHAR *argv[]) +{ + int i; + LPTSTR lpIllegalMsg; + + //FIXME: Add handling of commandline arguments to select the session number and name, and also name of remote machine + //Example: logoff.exe 4 /SERVER:Master should logoff session number 4 on remote machine called Master. + + for (i = 1; i < argc; i++) { + switch(argv[i][0]){ + case '-': + case '/': + // -v (verbose) + if (argv[i][1] == 'v') { + bVerbose = TRUE; + break; //continue parsing the arguments + } + // -? (usage) + else if(argv[i][1] == '?') { + return FALSE; //display the Usage + } + default: + //Invalid parameter detected + if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM)) + _putts(lpIllegalMsg); + return FALSE; + } + } + + return TRUE; +} + +//---------------------------------------------------------------------- +// +//Main entry for program +// +//---------------------------------------------------------------------- +int _tmain(int argc, TCHAR *argv[]) +{ + LPTSTR lpLogoffRemote, lpLogoffLocal; + + // + // Parse command line + // + if (!ParseCommandLine(argc, argv)) { + PrintUsage(); + return 1; + } + + // + //Should we log off session on remote server? + // + if (szRemoteServerName) { + if (bVerbose) { + if (AllocAndLoadString(&lpLogoffRemote, GetModuleHandle(NULL), IDS_LOGOFF_REMOTE)) + _putts(lpLogoffRemote); + } + + //FIXME: Add Remote Procedure Call to logoff user on a remote machine + _ftprintf(stderr, "Remote Procedure Call in logoff.exe has not been implemented"); + } + // + //Perform logoff of current session on local machine instead + // + else { + if (bVerbose) { + //Get resource string, and print it. + if (AllocAndLoadString(&lpLogoffLocal, GetModuleHandle(NULL), IDS_LOGOFF_LOCAL)) + _putts(lpLogoffLocal); + } + + //Actual logoff + if (!ExitWindows(NULL, NULL)) { + DisplayLastError(); + return 1; + } + } + + return 0; +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/logoff.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/logoff.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/logoff.rbuild (added) +++ trunk/reactos/base/applications/logoff/logoff.rbuild Fri Aug 3 19:14:49 2007 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe"> + <include base="logoff">.</include> + <define name="__USE_W32API" /> + <define name="WINVER">0x0501</define> + <library>advapi32</library> + <library>user32</library> + <library>kernel32</library> + <file>misc.c</file> + <file>logoff.c</file> + <file>logoff.rc</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/base/applications/logoff/logoff.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/logoff.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/logoff.rc (added) +++ trunk/reactos/base/applications/logoff/logoff.rc Fri Aug 3 19:14:49 2007 @@ -1,0 +1,9 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logoff Utility\0" +#define REACTOS_STR_INTERNAL_NAME "logoff\0" +#define REACTOS_STR_ORIGINAL_FILENAME "logoff.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/base/applications/logoff/logoff.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/m… ============================================================================== --- trunk/reactos/base/applications/logoff/misc.c (added) +++ trunk/reactos/base/applications/logoff/misc.c Fri Aug 3 19:14:49 2007 @@ -1,0 +1,63 @@ +#include "precomp.h" + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = (WCHAR*) LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + +INT +AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadString(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} Propchange: trunk/reactos/base/applications/logoff/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/p… ============================================================================== --- trunk/reactos/base/applications/logoff/precomp.h (added) +++ trunk/reactos/base/applications/logoff/precomp.h Fri Aug 3 19:14:49 2007 @@ -1,0 +1,16 @@ +#ifndef __SHUTDOWN_PRECOMP_H +#define __SHUTDOWN_PRECOMP_H + +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> +#include <tchar.h> +#include <reason.h> //shutdown codes +#include "resource.h" + +// misc.c +INT AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID); + +#endif Propchange: trunk/reactos/base/applications/logoff/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/resource.h (added) +++ trunk/reactos/base/applications/logoff/resource.h Fri Aug 3 19:14:49 2007 @@ -1,0 +1,4 @@ +#define IDS_USAGE 1000 +#define IDS_LOGOFF_REMOTE 1001 +#define IDS_LOGOFF_LOCAL 1002 +#define IDS_ILLEGAL_PARAM 1003 Propchange: trunk/reactos/base/applications/logoff/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (added) +++ trunk/reactos/base/applications/logoff/rsrc.rc Fri Aug 3 19:14:49 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" +#include "lang/nb-NO.rc" Propchange: trunk/reactos/base/applications/logoff/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Aug 3 19:14:49 2007 @@ -41,6 +41,7 @@ base\applications\games\winemine\winemine.exe 1 base\applications\hh\hh.exe 1 base\applications\hostname\hostname.exe 1 +base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\network\arp\arp.exe 1 base\applications\network\route\route.exe 1

1 0

[cfinck] 28136: Updated ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2524 for more details.
by cfinck＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: cfinck Date: Fri Aug 3 19:12:08 2007 New Revision: 28136 URL: http://svn.reactos.org/svn/reactos?rev=28136&view=rev Log: Updated ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2524 for more details. Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/dll/win32/aclui/aclui_Uk.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Fri Aug 3 19:12:08 2007 @@ -29,7 +29,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Âèáðàòè ñîðî÷êó" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -38,7 +38,7 @@ CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Fri Aug 3 19:12:08 2007 @@ -67,7 +67,7 @@ WS_VSCROLL | WS_TABSTOP CONTROL "Íàï³â&æèðíèé øðèôò",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 - CTEXT "Çàñòàâêà \"Ìàòðèöÿ\" www.catch22.org.uk",IDC_ABOUT,140, + CTEXT "Çàñòàâêà ""Ìàòðèöÿ"" www.catch22.org.uk",IDC_ABOUT,140, 158,75,18 END Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc Fri Aug 3 19:12:08 2007 @@ -179,7 +179,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Äèñïåò÷åð çàâäàíü" +CAPTION "Äèñïåò÷åð çàâäàíü ReactOS" MENU IDR_TASKMANAGER FONT 8, "Tahoma" BEGIN @@ -593,15 +593,15 @@ ID_PROCESS_PAGE_SETAFFINITY "Âèçíà÷àº, ÿê³ ïðîöåñîðè ìîæå âèêîðèñòîâóâàòè ïðîöåñ" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Ðåàëüíîãî ÷àñó\" äëÿ ïðîöåñó" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Âèñîêèé\" äëÿ ïðîöåñó" + "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Ðåàëüíîãî ÷àñó"" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Âèñîêèé"" äëÿ ïðîöåñó" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Âèùå ñåðåäíüîãî\" äëÿ ïðîöåñó" + "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Âèùå ñåðåäíüîãî"" äëÿ ïðîöåñó" ID_PROCESS_PAGE_SETPRIORITY_NORMAL - "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Ñåðåäí³é\" äëÿ ïðîöåñó" + "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Ñåðåäí³é"" äëÿ ïðîöåñó" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Íèæ÷å ñåðåäíüîãî\" äëÿ ïðîöåñó" - ID_PROCESS_PAGE_SETPRIORITY_LOW "Óñòàíîâëþº êëàñ ïð³îðèòåòó \"Íèçüêèé\" äëÿ ïðîöåñó" + "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Íèæ÷å ñåðåäíüîãî"" äëÿ ïðîöåñó" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Óñòàíîâëþº êëàñ ïð³îðèòåòó ""Íèçüêèé"" äëÿ ïðîöåñó" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc Fri Aug 3 19:12:08 2007 @@ -19,6 +19,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" -#ifdef __GCC__ #include "lang/uk-UA.rc" -#endif Modified: trunk/reactos/dll/win32/aclui/aclui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Uk.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Uk.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_Uk.rc Fri Aug 3 19:12:08 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Access Control List Editor + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/aclui/aclui_Uk.rc + * PURPOSE: Ukraianian Language File for aclui + * TRANSLATOR: Artem Reznikov + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 @@ -5,8 +13,10 @@ CAPTION "Áåçïåêà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Ãðóïè àáî êîðèñòóâà÷³:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Ãðóïè àáî êîðèñòóâà÷³:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Âëàñíèê:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Äîäàòè...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "Â&èäàëèòè", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX @@ -24,5 +34,7 @@ IDS_SPECIAL_PERMISSIONS "Îñîáëèâ³ äîçâîëè" IDS_PERMISSIONS_FOR "Äîçâîëè äëÿ %1" IDS_PERMISSIONS "Äîçâîëè" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" }

1 0

[hpoussin] 28135: syssetup.inf really belongs to output directory, not intermediate one
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 18:33:43 2007 New Revision: 28135 URL: http://svn.reactos.org/svn/reactos?rev=28135&view=rev Log: syssetup.inf really belongs to output directory, not intermediate one Modified: trunk/reactos/Makefile trunk/reactos/media/inf/inf.rbuild trunk/reactos/tools/rbuild/syssetupgenerator.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28135&r1=2813… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 18:33:43 2007 @@ -415,7 +415,7 @@ $(NCI_SERVICE_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) - ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) + ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw @$(MAKE) psdk Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Fri Aug 3 18:33:43 2007 @@ -14,7 +14,7 @@ <installfile base="inf">nettcpip.inf</installfile> <installfile base="inf">ports.inf</installfile> <installfile base="inf">scsi.inf</installfile> -<installfile base="inf" root="intermediate">syssetup.inf</installfile> +<installfile base="inf" root="output">syssetup.inf</installfile> <installfile base="inf">usbport.inf</installfile> <installfile base="inf">usbstor.inf</installfile> <installfile base="inf">xboxdisp.inf</installfile> Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener… ============================================================================== --- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Fri Aug 3 18:33:43 2007 @@ -39,7 +39,7 @@ unsigned long errorLine; string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl"; - string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf"; + string syssetup = Environment::GetOutputPath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf"; if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) ) throw new FileNotFoundException ( syssetupTemplate );

1 0

[hpoussin] 28134: Extract resources to intermediate directory
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 17:51:19 2007 New Revision: 28134 URL: http://svn.reactos.org/svn/reactos?rev=28134&view=rev Log: Extract resources to intermediate directory Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Aug 3 17:51:19 2007 @@ -233,12 +233,12 @@ GenerateHeader (); GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); + UnpackWineResources (); ProcessModules (); GenerateInstallTarget (); GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); - UnpackWineResources (); GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); GenerateSysSetup (); Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Fri Aug 3 17:51:19 2007 @@ -103,8 +103,10 @@ module.name.c_str () ); } - string outputDirectory = module.GetBasePath (); - string parameters = ssprintf ( "-b %s -f -x %s", + string relativeDirectory = module.GetBasePath (); + string outputDirectory = Environment::GetIntermediatePath() + sSep + module.GetBasePath (); + string parameters = ssprintf ( "-b %s -O %s -f -x %s", + NormalizeFilename ( relativeDirectory ).c_str (), NormalizeFilename ( outputDirectory ).c_str (), NormalizeFilename ( resourceFilename ).c_str () ); string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters; @@ -114,4 +116,7 @@ throw InvocationFailedException ( command, exitcode ); } + module.non_if_data.includes.push_back( new Include ( module.project, + module.GetBasePath (), + "$(INTERMEDIATE)" ) ); }

1 0

[hpoussin] 28133: Add -O option, to define where are stored extracted resources
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 17:47:51 2007 New Revision: 28133 URL: http://svn.reactos.org/svn/reactos?rev=28133&view=rev Log: Add -O option, to define where are stored extracted resources Modified: trunk/reactos/tools/bin2res/bin2res.c Modified: trunk/reactos/tools/bin2res/bin2res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.c?re… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.c (original) +++ trunk/reactos/tools/bin2res/bin2res.c Fri Aug 3 17:47:51 2007 @@ -48,7 +48,7 @@ extern int mkstemps(char *template, int suffix_len); int process_resources(const char* input_file_name, const char* specific_file_name, - const char* relative_path, + const char* relative_path, const char* output_path, int inserting, int force_processing, int verbose); static const char* help = @@ -172,7 +172,7 @@ } void process_includes(const char* input_file_name, const char* specific_file_name, - const char* relative_path, + const char* relative_path, const char* output_path, int inserting, int force_processing, int verbose) { char filename[PATH_MAX]; @@ -187,14 +187,14 @@ if (!(include_file_name = parse_include(buffer))) continue; if ( verbose ) printf ( "Processing included file %s\n", include_file_name); process_resources(get_filename_with_full_path(filename, include_file_name, relative_path), - specific_file_name, relative_path, + specific_file_name, relative_path, output_path, inserting, force_processing, verbose); } fclose(fin); } int process_resources(const char* input_file_name, const char* specific_file_name, - const char* relative_path, + const char* relative_path, const char* output_path, int inserting, int force_processing, int verbose) { char filename[PATH_MAX]; @@ -237,15 +237,17 @@ if (inserting) fputc(c, ftmp); if (c == EOF) break; - if (!(fres = fopen(get_filename_with_full_path(filename, res_file_name, relative_path), - inserting ? "rb" : "wb"))) break; if (inserting) { + if (!(fres = fopen(get_filename_with_full_path(filename, res_file_name, relative_path), + "rb"))) break; if (!insert_hexdump(ftmp, fres)) break; while ( (c = fgetc(fin)) != EOF && c != '}') /**/; } else { + if (!(fres = fopen(get_filename_with_full_path(filename, res_file_name, output_path), + "wb"))) break; if (!extract_hexdump(fres, fin)) break; } fclose(fres); @@ -272,7 +274,7 @@ } else { - process_includes(input_file_name, specific_file_name, relative_path, + process_includes(input_file_name, specific_file_name, relative_path, output_path, inserting, force_processing, verbose); } @@ -302,8 +304,9 @@ const char* input_file_name = 0; const char* specific_file_name = 0; const char* relative_path = 0; - - while((optc = getopt(argc, argv, "axi:o:b:fhv")) != EOF) + const char* output_path = 0; + + while((optc = getopt(argc, argv, "axi:o:b:O:fhv")) != EOF) { switch(optc) { @@ -320,6 +323,10 @@ if (convert_dir && convert_dir != optc) usage(); convert_dir = optc; break; + case 'O': + if (output_path) usage(); + output_path = fix_path_sep(optarg); + break; case 'b': if (relative_path) usage(); relative_path = fix_path_sep(optarg); @@ -345,6 +352,7 @@ if (!convert_dir) usage(); if (!process_resources(input_file_name, specific_file_name, relative_path, + output_path ? output_path : relative_path, convert_dir == 'a', force_overwrite, verbose)) { perror("Processing failed");

1 0

[dreimer] 28132: Translate new stuff in German RC File.
by dreimer＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: dreimer Date: Fri Aug 3 16:57:12 2007 New Revision: 28132 URL: http://svn.reactos.org/svn/reactos?rev=28132&view=rev Log: Translate new stuff in German RC File. Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Aug 3 16:57:12 2007 @@ -29,7 +29,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Kartenhintergrund wählen" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -38,7 +38,7 @@ CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + PUSHBUTTON "Abbrechen", IDCANCEL, 162, 77, 54, 13 END

1 0

[gedmurphy] 28131: add language resources
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 16:54:41 2007 New Revision: 28131 URL: http://svn.reactos.org/svn/reactos?rev=28131&view=rev Log: add language resources 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/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 Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "OK",IDOK,35,97,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END 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 Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Fri Aug 3 16:54:41 2007 @@ -27,6 +27,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Fri Aug 3 16:54:41 2007 @@ -27,6 +27,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Fri Aug 3 16:54:41 2007 @@ -27,6 +27,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Fri Aug 3 16:54:41 2007 @@ -25,6 +25,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Fri Aug 3 16:54:41 2007 @@ -21,6 +21,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Aug 3 16:54:41 2007 @@ -28,6 +28,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 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 Fri Aug 3 16:54:41 2007 @@ -27,6 +27,19 @@ DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14 PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Fri Aug 3 16:54:41 2007 @@ -26,6 +26,19 @@ DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Fri Aug 3 16:54:41 2007 @@ -27,6 +27,19 @@ DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14 PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 END

1 0

[gedmurphy] 28130: add a few more card back bitmaps
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 16:50:49 2007 New Revision: 28130 URL: http://svn.reactos.org/svn/reactos?rev=28130&view=rev Log: add a few more card back bitmaps Added: trunk/reactos/dll/win32/cards/res/Background_2.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_3.bmp (with props) trunk/reactos/dll/win32/cards/res/Background_4.bmp (with props) Modified: trunk/reactos/dll/win32/cards/cards.rc Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc (original) +++ trunk/reactos/dll/win32/cards/cards.rc Fri Aug 3 16:50:49 2007 @@ -82,9 +82,9 @@ 52 BITMAP "res/Spades_King.bmp" 53 BITMAP "res/FreeCard.bmp" 54 BITMAP "res/Background_1.bmp" -55 BITMAP "res/Background_1.bmp" -56 BITMAP "res/Background_1.bmp" -57 BITMAP "res/Background_1.bmp" +55 BITMAP "res/Background_2.bmp" +56 BITMAP "res/Background_3.bmp" +57 BITMAP "res/Background_4.bmp" 58 BITMAP "res/Background_1.bmp" 59 BITMAP "res/Background_1.bmp" 60 BITMAP "res/Background_1.bmp" Added: trunk/reactos/dll/win32/cards/res/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/cards/res/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/cards/res/Background_4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[gedmurphy] 28129: - add a dialog to allow users to change the card backs - highlights a few drawing bugs in ros
by gedmurphy＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: gedmurphy Date: Fri Aug 3 16:47:40 2007 New Revision: 28129 URL: http://svn.reactos.org/svn/reactos?rev=28129&view=rev Log: - add a dialog to allow users to change the card backs - highlights a few drawing bugs in ros Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/resource.h trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp Fri Aug 3 16:47:40 2007 @@ -263,7 +263,7 @@ lp = (LOGPALETTE *)HeapAlloc( GetProcessHeap(), 0, sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * nNumColours); - lp->palNumEntries = nNumColours; + lp->palNumEntries = (WORD)nNumColours; lp->palVersion = 0x300; //copy the colours into the logical palette format Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp Fri Aug 3 16:47:40 2007 @@ -334,7 +334,7 @@ return 0; } -#define _countof(array) (sizeof(array)/sizeof(array[0])) +//#define _countof(array) (sizeof(array)/sizeof(array[0])) CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fVisible, int x, int y, int width, int height) { Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Fri Aug 3 16:47:40 2007 @@ -735,6 +735,11 @@ } +UINT CardWindow::GetBackCardIdx() +{ + return nBackCardIdx; +} + void CardWindow::PaintCardRgn(HDC hdc, int dx, int dy, int width, int height, int sx, int sy) { RECT rect; Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h Fri Aug 3 16:47:40 2007 @@ -46,6 +46,7 @@ void SetBackColor(COLORREF cr); COLORREF GetBackColor(); void SetBackCardIdx(UINT uBackIdx); + UINT GetBackCardIdx(); void SetBackImage(HBITMAP hBitmap); void EmptyStacks(void); Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Fri Aug 3 16:47:40 2007 @@ -29,6 +29,20 @@ END +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Select Card Back" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 +END + + /* Strings */ STRINGTABLE @@ -48,7 +62,7 @@ BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED + MENUITEM "De&ck...", IDM_GAME_DECK MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Exit", IDM_GAME_EXIT Modified: trunk/reactos/base/applications/games/solitaire/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/resource.h (original) +++ trunk/reactos/base/applications/games/solitaire/resource.h Fri Aug 3 16:47:40 2007 @@ -20,6 +20,11 @@ #define IDC_OPT_DRAWTHREE 1202 #define IDC_OPT_SHOWTIME 1203 #define IDC_OPT_STATUSBAR 1204 +#define IDD_CARDBACK 1250 +#define IDC_CARDBACK1 1251 +#define IDC_CARDBACK2 1252 +#define IDC_CARDBACK3 1253 +#define IDC_CARDBACK4 1254 /* Strings */ #define IDS_SOL_NAME 1300 Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Fri Aug 3 16:47:40 2007 @@ -23,6 +23,15 @@ CardWindow SolWnd; +typedef struct _CardBack +{ + HWND hSelf; + WNDPROC hOldProc; + INT hdcNum; + INT imgNum; + BOOL bSelected; +} CARDBACK, *PCARDBACK; + LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam); void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt) @@ -38,10 +47,11 @@ { DWORD dwDisposition; DWORD dwSize; + DWORD dwBack; HKEY hKey; if (RegCreateKeyEx(HKEY_CURRENT_USER, - _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + _T("Software\\ReactOS\\Solitaire"), 0, NULL, REG_OPTION_NON_VOLATILE, @@ -59,16 +69,26 @@ (LPBYTE)&dwOptions, &dwSize); + dwSize = sizeof(DWORD); + RegQueryValueEx(hKey, + _T("Back"), + NULL, + NULL, + (LPBYTE)&dwBack, + &dwSize); + SolWnd.SetBackCardIdx(dwBack); + RegCloseKey(hKey); } VOID SaveSettings(VOID) { DWORD dwDisposition; + DWORD dwBack; HKEY hKey; if (RegCreateKeyEx(HKEY_CURRENT_USER, - _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"), + _T("Software\\ReactOS\\Solitaire"), 0, NULL, REG_OPTION_NON_VOLATILE, @@ -83,6 +103,14 @@ 0, REG_DWORD, (CONST BYTE *)&dwOptions, + sizeof(DWORD)); + + dwBack = SolWnd.GetBackCardIdx(); + RegSetValueEx(hKey, + _T("Back"), + 0, + REG_DWORD, + (CONST BYTE *)&dwBack, sizeof(DWORD)); RegCloseKey(hKey); @@ -138,13 +166,13 @@ hwnd = CreateWindow(szAppName, // window class name szAppName, // window caption WS_OVERLAPPEDWINDOW - ,//|WS_CLIPCHILDREN, // window style + ,//|WS_CLIPCHILDREN, // window style CW_USEDEFAULT, // initial x position CW_USEDEFAULT, // initial y position - CW_USEDEFAULT, // initial x size - CW_USEDEFAULT, // initial y size - NULL, // parent window handle - NULL, // use window class menu + 600, // initial x size + 450, // initial y size + NULL, // parent window handle + NULL, // use window class menu hInst, // program instance handle NULL); // creation parameters @@ -208,6 +236,176 @@ { if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS)) NewGame(); + } +} + + +LRESULT CALLBACK +CardImageWndProc(HWND hwnd, + UINT msg, + WPARAM wParam, + LPARAM lParam) +{ + PCARDBACK pCardBack = (PCARDBACK)GetWindowLongPtr(hwnd, + GWL_USERDATA); + static WNDPROC hOldProc = NULL; + + if (!hOldProc && pCardBack) + hOldProc = pCardBack->hOldProc; + + switch (msg) + { + case WM_PAINT: + { + HDC hdc; + PAINTSTRUCT ps; + HPEN hPen, hOldPen; + HBRUSH hBrush, hOldBrush; + RECT rc; + + hdc = BeginPaint(hwnd, &ps); + + if (pCardBack->bSelected) + { + hPen = CreatePen(PS_SOLID, 2, RGB(0,0,0)); + } + else + { + DWORD Face = GetSysColor(COLOR_3DFACE); + hPen = CreatePen(PS_SOLID, 2, Face); + } + + GetClientRect(hwnd, &rc); + hBrush = (HBRUSH)GetStockObject(NULL_BRUSH); + hOldPen = (HPEN)SelectObject(hdc, hPen); + hOldBrush = (HBRUSH)SelectObject(hdc, hBrush); + + Rectangle(hdc, + rc.left+1, + rc.top+1, + rc.right, + rc.bottom); + + BitBlt(hdc, + 2, + 2, + __cardwidth, + __cardheight, + __hdcCardBitmaps, + pCardBack->hdcNum * __cardwidth, + 0, + SRCCOPY); + + SelectObject(hdc, hOldPen); + SelectObject(hdc, hOldBrush); + + EndPaint(hwnd, &ps); + + break; + } + + case WM_LBUTTONDOWN: + pCardBack->bSelected = pCardBack->bSelected ? FALSE : TRUE; + break; + } + + return CallWindowProc(hOldProc, + hwnd, + msg, + wParam, + lParam); +} + + +BOOL CALLBACK CardBackDlgProc(HWND hDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + static PCARDBACK pCardBacks = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + { + INT i, c; + SIZE_T size = sizeof(CARDBACK) * NUM_CARDBACKS; + + pCardBacks = (PCARDBACK)HeapAlloc(GetProcessHeap(), + 0, + size); + + for (i = 0, c = CARDBACK_START; c <= CARDBACK_END; i++, c++) + { + pCardBacks[i].hSelf = GetDlgItem(hDlg, c); + pCardBacks[i].bSelected = FALSE; + pCardBacks[i].hdcNum = CARDBACK_RES_START + i; + pCardBacks[i].imgNum = i + 1; + pCardBacks[i].hOldProc = (WNDPROC)SetWindowLongPtr(pCardBacks[i].hSelf, + GWLP_WNDPROC, + (LONG_PTR)CardImageWndProc); + + SetWindowLongPtr(pCardBacks[i].hSelf, + GWL_USERDATA, + (LONG_PTR)&pCardBacks[i]); + } + + return TRUE; + } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + INT i, num = 0; + for (i = 0; i < NUM_CARDBACKS; i++) + { + if (pCardBacks[i].bSelected) + { + num = pCardBacks[i].imgNum; + } + } + + EndDialog(hDlg, LOWORD(wParam) == IDOK ? num : FALSE); + HeapFree(GetProcessHeap(), 0, pCardBacks); + return TRUE; + } + + if (HIWORD(wParam) == STN_CLICKED) + { + INT i; + RECT rc; + for (i = 0; i < NUM_CARDBACKS; i++) + { + if (pCardBacks[i].hSelf == (HWND)lParam) + { + pCardBacks[i].bSelected = TRUE; + } + else + pCardBacks[i].bSelected = FALSE; + + GetClientRect(pCardBacks[i].hSelf, &rc); + InvalidateRect(pCardBacks[i].hSelf, &rc, TRUE); + } + + break; + } + } + + return FALSE; +} + + +VOID ShowDeckOptionsDlg(HWND hwnd) +{ + INT cardBack; + + if ((cardBack = DialogBox(hInstance, + MAKEINTRESOURCE(IDD_CARDBACK), + hwnd, + CardBackDlgProc))) + { + SolWnd.SetBackCardIdx(CARDBACK_RES_START + (cardBack - 1)); + SolWnd.Redraw(); } } @@ -272,7 +470,7 @@ return 0; case IDM_GAME_DECK: - //ShowDeckOptionsDlg(hwnd); + ShowDeckOptionsDlg(hwnd); return 0; case IDM_GAME_OPTIONS: 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 Fri Aug 3 16:47:40 2007 @@ -6,6 +6,10 @@ extern bool fGameStarted; #define OPTION_THREE_CARDS 8 +#define CARDBACK_START IDC_CARDBACK1 +#define CARDBACK_END IDC_CARDBACK4 +#define NUM_CARDBACKS (CARDBACK_END - CARDBACK_START + 1) +#define CARDBACK_RES_START 53 extern DWORD dwOptions;

1 0

[hpoussin] 28128: Add missing include directory
by hpoussin＠svn.reactos.org 03 Aug '07

03 Aug '07

Author: hpoussin Date: Fri Aug 3 16:12:41 2007 New Revision: 28128 URL: http://svn.reactos.org/svn/reactos?rev=28128&view=rev Log: Add missing include directory Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28128&r1=2812… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Aug 3 16:12:41 2007 @@ -418,6 +418,7 @@ ${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw + @$(MAKE) psdk world: all bootcd livecd Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=28… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Fri Aug 3 16:12:41 2007 @@ -57,6 +57,7 @@ <include>.</include> <include>include</include> + <include root="intermediate">include</include> <include>include/psdk</include> <include root="intermediate">include/psdk</include> <include>include/dxsdk</include>

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007