Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28180: My Present for ya all. A new cards.dll with bigger, photorealistic Bavarian Style Cards. I theory Number 2-5 are NON existant. But to be fully compatible I sat down and made them by myself. Its fully compatible to Windows Solitaire, not ROS Solitaire, which does not like the bigger cards. This needs a fix. Btw if someone finds out how to modify the edges on the cards to be transparent, plz tell me. They need to be waay more round.
by dreimer＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: dreimer Date: Mon Aug 6 00:38:19 2007 New Revision: 28180 URL: http://svn.reactos.org/svn/reactos?rev=28180&view=rev Log: My Present for ya all. A new cards.dll with bigger, photorealistic Bavarian Style Cards. I theory Number 2-5 are NON existant. But to be fully compatible I sat down and made them by myself. Its fully compatible to Windows Solitaire, not ROS Solitaire, which does not like the bigger cards. This needs a fix. Btw if someone finds out how to modify the edges on the cards to be transparent, plz tell me. They need to be waay more round. Added: trunk/rosapps/cardsbav/ trunk/rosapps/cardsbav/cardsbav.c trunk/rosapps/cardsbav/cardsbav.def trunk/rosapps/cardsbav/cardsbav.h trunk/rosapps/cardsbav/cardsbav.rbuild trunk/rosapps/cardsbav/cardsbav.rc trunk/rosapps/cardsbav/res/ trunk/rosapps/cardsbav/res/Eichel10.bmp (with props) trunk/rosapps/cardsbav/res/Eichel2.bmp (with props) trunk/rosapps/cardsbav/res/Eichel3.bmp (with props) trunk/rosapps/cardsbav/res/Eichel4.bmp (with props) trunk/rosapps/cardsbav/res/Eichel5.bmp (with props) trunk/rosapps/cardsbav/res/Eichel6.bmp (with props) trunk/rosapps/cardsbav/res/Eichel7.bmp (with props) trunk/rosapps/cardsbav/res/Eichel8.bmp (with props) trunk/rosapps/cardsbav/res/Eichel9.bmp (with props) trunk/rosapps/cardsbav/res/EichelAs.bmp (with props) trunk/rosapps/cardsbav/res/EichelKoenig.bmp (with props) trunk/rosapps/cardsbav/res/EichelOber.bmp (with props) trunk/rosapps/cardsbav/res/EichelUnter.bmp (with props) trunk/rosapps/cardsbav/res/FreeCard.bmp (with props) trunk/rosapps/cardsbav/res/Gras10.bmp (with props) trunk/rosapps/cardsbav/res/Gras2.bmp (with props) trunk/rosapps/cardsbav/res/Gras3.bmp (with props) trunk/rosapps/cardsbav/res/Gras4.bmp (with props) trunk/rosapps/cardsbav/res/Gras5.bmp (with props) trunk/rosapps/cardsbav/res/Gras6.bmp (with props) trunk/rosapps/cardsbav/res/Gras7.bmp (with props) trunk/rosapps/cardsbav/res/Gras8.bmp (with props) trunk/rosapps/cardsbav/res/Gras9.bmp (with props) trunk/rosapps/cardsbav/res/GrasAs.bmp (with props) trunk/rosapps/cardsbav/res/GrasKoenig.bmp (with props) trunk/rosapps/cardsbav/res/GrasOber.bmp (with props) trunk/rosapps/cardsbav/res/GrasUnter.bmp (with props) trunk/rosapps/cardsbav/res/Herz10.bmp (with props) trunk/rosapps/cardsbav/res/Herz2.bmp (with props) trunk/rosapps/cardsbav/res/Herz3.bmp (with props) trunk/rosapps/cardsbav/res/Herz4.bmp (with props) trunk/rosapps/cardsbav/res/Herz5.bmp (with props) trunk/rosapps/cardsbav/res/Herz6.bmp (with props) trunk/rosapps/cardsbav/res/Herz7.bmp (with props) trunk/rosapps/cardsbav/res/Herz8.bmp (with props) trunk/rosapps/cardsbav/res/Herz9.bmp (with props) trunk/rosapps/cardsbav/res/HerzAs.bmp (with props) trunk/rosapps/cardsbav/res/HerzKoenig.bmp (with props) trunk/rosapps/cardsbav/res/HerzOber.bmp (with props) trunk/rosapps/cardsbav/res/HerzUnter.bmp (with props) trunk/rosapps/cardsbav/res/Joker.bmp (with props) trunk/rosapps/cardsbav/res/OSign.bmp (with props) trunk/rosapps/cardsbav/res/Ruecken.bmp (with props) trunk/rosapps/cardsbav/res/Schellen10.bmp (with props) trunk/rosapps/cardsbav/res/Schellen2.bmp (with props) trunk/rosapps/cardsbav/res/Schellen3.bmp (with props) trunk/rosapps/cardsbav/res/Schellen4.bmp (with props) trunk/rosapps/cardsbav/res/Schellen5.bmp (with props) trunk/rosapps/cardsbav/res/Schellen6.bmp (with props) trunk/rosapps/cardsbav/res/Schellen7.bmp (with props) trunk/rosapps/cardsbav/res/Schellen8.bmp (with props) trunk/rosapps/cardsbav/res/Schellen9.bmp (with props) trunk/rosapps/cardsbav/res/SchellenAs.bmp (with props) trunk/rosapps/cardsbav/res/SchellenKoenig.bmp (with props) trunk/rosapps/cardsbav/res/SchellenOber.bmp (with props) trunk/rosapps/cardsbav/res/SchellenUnter.bmp (with props) trunk/rosapps/cardsbav/res/XSign.bmp (with props) Added: trunk/rosapps/cardsbav/cardsbav.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.c?rev=28… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.c (added) +++ trunk/rosapps/cardsbav/cardsbav.c Mon Aug 6 00:38:19 2007 @@ -1,0 +1,249 @@ +/* + * ReactOS Bavarian Cards + * + * Copyright (C) 2007 Filip Navara <xnavara(a)volny.org> + * Daniel Reimer <reimer.daniel(a)freenet.de> + * + * This library 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. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windows.h" +#include "cardsbav.h" + +HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; +HINSTANCE g_hModule = 0; + +/* + * Redundant function from 16-bit Windows time + */ +BOOL WINAPI WEP(DWORD Unknown) +{ + UNREFERENCED_PARAMETER(Unknown); + return TRUE; +} + +/* + * Initialize card library and return cards width and height + */ +BOOL WINAPI cdtInit(INT *Width, INT *Height) +{ + DWORD dwIndex; + + /* Report card width and height to user */ + *Width = CARD_WIDTH; + *Height = CARD_HEIGHT; + + /* Load images */ + for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; ++dwIndex) + g_CardBitmaps[dwIndex] = + (HBITMAP)LoadBitmapA(g_hModule, MAKEINTRESOURCEA(dwIndex + 1)); + + return TRUE; +} + +/* + * Terminate card library + */ +VOID WINAPI cdtTerm(VOID) +{ + DWORD dwIndex; + + /* Unload images */ + for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++) + DeleteObject(g_CardBitmaps[dwIndex]); +} + +/* + * Render card with no stretching + */ +BOOL WINAPI cdtDraw(HDC hdc, INT x, INT y, INT card, INT type, COLORREF color) +{ + return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color); +} + +/* + * internal + */ +static __inline VOID BltCard(HDC hdc, INT x, INT y, INT dx, INT dy, HDC hdcCard, DWORD dwRasterOp, BOOL bStretch) +{ + if (bStretch) + { + StretchBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, CARD_WIDTH, CARD_HEIGHT, dwRasterOp); + } else + { + BitBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, dwRasterOp); +/* + * This is need when using Microsoft images, because they use two-color red/white images for + * red cards and thus needs fix-up of the edge to black color. + */ +#if 0 + if (ISREDCARD(card)) + { + PatBlt(hdc, x, y + 2, 1, dy - 4, BLACKNESS); + PatBlt(hdc, x + dx - 1, y + 2, 1, dy - 4, BLACKNESS); + PatBlt(hdc, x + 2, y, dx - 4, 1, BLACKNESS); + PatBlt(hdc, x + 2, y + dy - 1, dx - 4, 1, BLACKNESS); + SetPixel(hdc, x + 1, y + 1, 0); + SetPixel(hdc, x + dx - 2, y + 1, 0); + SetPixel(hdc, x + 1, y + dy - 2, 0); + SetPixel(hdc, x + dx - 2, y + dy - 2, 0); + } +#endif + } +} + +/* + * Render card + * + * Parameters: + * hdc - Handle of destination device context + * x - Position left + * y - Position right + * dx - Destination width + * dy - Destination height + * card - Image id (meaning depend on type) + * type - One of edt* constants + * color - Background color (?) + */ +BOOL WINAPI cdtDrawExt(HDC hdc, INT x, INT y, INT dx, INT dy, INT card, INT type, COLORREF color) +{ + HDC hdcCard; + DWORD dwRasterOp = SRCCOPY, OldBkColor; + BOOL bSaveEdges = TRUE; + BOOL bStretch = FALSE; + + if (type & ectSAVEEDGESMASK) + { + type &= ~ectSAVEEDGESMASK; + bSaveEdges = FALSE; + } + + if (dx != CARD_WIDTH || dy != CARD_HEIGHT) + { + bStretch = TRUE; + bSaveEdges = FALSE; + } + + switch (type) + { + case ectINVERTED: + dwRasterOp = NOTSRCCOPY; + case ectFACES: + card = (card % 4) * 13 + (card / 4); + break; + case ectBACKS: + --card; + break; + case ectEMPTYNOBG: + dwRasterOp = SRCAND; + case ectEMPTY: + card = 52; + break; + case ectERASE: + break; + case ectREDX: + card = 66; + break; + case ectGREENO: + card = 67; + break; + default: + return FALSE; + } + + if (type == ectEMPTY || type == ectERASE) + { + POINT pPoint; + HBRUSH hBrush; + + hBrush = CreateSolidBrush(color); + GetDCOrgEx(hdc, &pPoint); + SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0); + SelectObject(hdc, hBrush); + PatBlt(hdc, x, y, dx, dy, PATCOPY); + } + if (type != ectERASE) + { + hdcCard = CreateCompatibleDC(hdc); + SelectObject(hdcCard, g_CardBitmaps[card]); + OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color); + if (bSaveEdges) + { + COLORREF SavedPixels[12]; + SavedPixels[0] = GetPixel(hdc, x, y); + SavedPixels[1] = GetPixel(hdc, x + 1, y); + SavedPixels[2] = GetPixel(hdc, x, y + 1); + SavedPixels[3] = GetPixel(hdc, x + dx - 1, y); + SavedPixels[4] = GetPixel(hdc, x + dx - 2, y); + SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); + SavedPixels[6] = GetPixel(hdc, x, y + dy - 1); + SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); + SavedPixels[8] = GetPixel(hdc, x, y + dy - 2); + SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); + SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1); + SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2); + + BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); + + SetPixel(hdc, x, y, SavedPixels[0]); + SetPixel(hdc, x + 1, y, SavedPixels[1]); + SetPixel(hdc, x, y + 1, SavedPixels[2]); + SetPixel(hdc, x + dx - 1, y, SavedPixels[3]); + SetPixel(hdc, x + dx - 2, y, SavedPixels[4]); + SetPixel(hdc, x + dx - 1, y + 1, SavedPixels[5]); + SetPixel(hdc, x, y + dy - 1, SavedPixels[6]); + SetPixel(hdc, x + 1, y + dy - 1, SavedPixels[7]); + SetPixel(hdc, x, y + dy - 2, SavedPixels[8]); + SetPixel(hdc, x + dx - 1, y + dy - 1, SavedPixels[9]); + SetPixel(hdc, x + dx - 2, y + dy - 1, SavedPixels[10]); + SetPixel(hdc, x + dx - 1, y + dy - 2, SavedPixels[11]); + } + else + { + BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); + } + SetBkColor(hdc, OldBkColor); + DeleteDC(hdcCard); + } + + return TRUE; +} + + +/*********************************************************************** + * cdtAnimate (CARDS.@) + * + * Animate card background, we don't use it + */ +BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame) +{ + UNREFERENCED_PARAMETER(frame); + UNREFERENCED_PARAMETER(y); + UNREFERENCED_PARAMETER(x); + UNREFERENCED_PARAMETER(cardback); + UNREFERENCED_PARAMETER(hdc); + return TRUE; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + if (fdwReason == DLL_PROCESS_ATTACH) + g_hModule = hinstDLL; + + return TRUE; +} Added: trunk/rosapps/cardsbav/cardsbav.def URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.def?rev=… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.def (added) +++ trunk/rosapps/cardsbav/cardsbav.def Mon Aug 6 00:38:19 2007 @@ -1,0 +1,8 @@ +LIBRARY cardsbav.dll +EXPORTS +WEP +cdtAnimate +cdtDraw +cdtDrawExt +cdtInit +cdtTerm Added: trunk/rosapps/cardsbav/cardsbav.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.h?rev=28… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.h (added) +++ trunk/rosapps/cardsbav/cardsbav.h Mon Aug 6 00:38:19 2007 @@ -1,0 +1,62 @@ +/* + * ReactOS Bavarian Cards + * + * Copyright (C) 2007 Filip Navara <xnavara(a)volny.org> + * Daniel Reimer <reimer.daniel(a)freenet.de> + * + * This library 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. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _CARDS_H +#define _CARDS_H + +/* + * 52 card faces + + * 12 card backs + + * X Sign + + * O Sign + + * FreeCard + + * Joker + */ +#define MAX_CARD_BITMAPS 68 + +#define ectFACES 0 +#define ectBACKS 1 +#define ectINVERTED 2 +#define ectEMPTY 3 +#define ectERASE 4 +#define ectEMPTYNOBG 5 +#define ectREDX 6 +#define ectGREENO 7 +#define ectSAVEEDGESMASK 0x80000000 + +/* Microsoft card dimensions */ +/* +#define CARD_WIDTH 110 +#define CARD_HEIGHT 198 +*/ +/* MacSolitaireX's card dimensions */ +#define CARD_WIDTH 110 +#define CARD_HEIGHT 198 + +#define ISREDCARD(x) (x >= 13 && x <= 39) + +BOOL WINAPI cdtInit(int *width, int *height); +BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int type, DWORD color); +BOOL WINAPI cdtDrawExt(HDC hdc, int x, int y, int dx, int dy, int card, int suit, DWORD color); +BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame); +void WINAPI cdtTerm(void); + +#endif /* _CARDS_H */ Added: trunk/rosapps/cardsbav/cardsbav.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.rbuild?r… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.rbuild (added) +++ trunk/rosapps/cardsbav/cardsbav.rbuild Mon Aug 6 00:38:19 2007 @@ -1,0 +1,12 @@ +<module name="cardsbav" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cardsbav.dll"> + <importlibrary definition="cardsbav.def" /> + <include base="cardsbav">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <file>cardsbav.c</file> + <file>cardsbav.rc</file> +</module> Added: trunk/rosapps/cardsbav/cardsbav.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/cardsbav.rc?rev=2… ============================================================================== --- trunk/rosapps/cardsbav/cardsbav.rc (added) +++ trunk/rosapps/cardsbav/cardsbav.rc Mon Aug 6 00:38:19 2007 @@ -1,0 +1,99 @@ +/* + * ReactOS Bavarian Cards + * + * Copyright (C) 2007 Filip Navara <xnavara(a)volny.org> + * Daniel Reimer <reimer.daniel(a)freenet.de> + * + * This library 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. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Bavarian Cardplaying Helper DLL\0" +#define REACTOS_STR_INTERNAL_NAME "cardsbav\0" +#define REACTOS_STR_ORIGINAL_FILENAME "cardsbav.dll\0" +#include <reactos/version.rc> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 BITMAP "res/EichelAs.bmp" +2 BITMAP "res/Eichel2.bmp" +3 BITMAP "res/Eichel3.bmp" +4 BITMAP "res/Eichel4.bmp" +5 BITMAP "res/Eichel5.bmp" +6 BITMAP "res/Eichel6.bmp" +7 BITMAP "res/Eichel7.bmp" +8 BITMAP "res/Eichel8.bmp" +9 BITMAP "res/Eichel9.bmp" +10 BITMAP "res/Eichel10.bmp" +11 BITMAP "res/EichelUnter.bmp" +12 BITMAP "res/EichelOber.bmp" +13 BITMAP "res/EichelKoenig.bmp" +14 BITMAP "res/SchellenAs.bmp" +15 BITMAP "res/Schellen2.bmp" +16 BITMAP "res/Schellen3.bmp" +17 BITMAP "res/Schellen4.bmp" +18 BITMAP "res/Schellen5.bmp" +19 BITMAP "res/Schellen6.bmp" +20 BITMAP "res/Schellen7.bmp" +21 BITMAP "res/Schellen8.bmp" +22 BITMAP "res/Schellen9.bmp" +23 BITMAP "res/Schellen10.bmp" +24 BITMAP "res/SchellenUnter.bmp" +25 BITMAP "res/SchellenOber.bmp" +26 BITMAP "res/SchellenKoenig.bmp" +27 BITMAP "res/HerzAs.bmp" +28 BITMAP "res/Herz2.bmp" +29 BITMAP "res/Herz3.bmp" +30 BITMAP "res/Herz4.bmp" +31 BITMAP "res/Herz5.bmp" +32 BITMAP "res/Herz6.bmp" +33 BITMAP "res/Herz7.bmp" +34 BITMAP "res/Herz8.bmp" +35 BITMAP "res/Herz9.bmp" +36 BITMAP "res/Herz10.bmp" +37 BITMAP "res/HerzUnter.bmp" +38 BITMAP "res/HerzOber.bmp" +39 BITMAP "res/HerzKoenig.bmp" +40 BITMAP "res/GrasAs.bmp" +41 BITMAP "res/Gras2.bmp" +42 BITMAP "res/Gras3.bmp" +43 BITMAP "res/Gras4.bmp" +44 BITMAP "res/Gras5.bmp" +45 BITMAP "res/Gras6.bmp" +46 BITMAP "res/Gras7.bmp" +47 BITMAP "res/Gras8.bmp" +48 BITMAP "res/Gras9.bmp" +49 BITMAP "res/Gras10.bmp" +50 BITMAP "res/GrasUnter.bmp" +51 BITMAP "res/GrasOber.bmp" +52 BITMAP "res/GrasKoenig.bmp" +53 BITMAP "res/FreeCard.bmp" +54 BITMAP "res/Ruecken.bmp" +55 BITMAP "res/Ruecken.bmp" +56 BITMAP "res/Ruecken.bmp" +57 BITMAP "res/Ruecken.bmp" +58 BITMAP "res/Ruecken.bmp" +59 BITMAP "res/Ruecken.bmp" +60 BITMAP "res/Ruecken.bmp" +61 BITMAP "res/Ruecken.bmp" +62 BITMAP "res/Ruecken.bmp" +63 BITMAP "res/Ruecken.bmp" +64 BITMAP "res/Ruecken.bmp" +65 BITMAP "res/Ruecken.bmp" +66 BITMAP "res/Joker.bmp" +67 BITMAP "res/XSign.bmp" +68 BITMAP "res/OSign.bmp" Added: trunk/rosapps/cardsbav/res/Eichel10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel10.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel2.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel3.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel4.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel5.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel6.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel7.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel8.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Eichel9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel9.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Eichel9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/EichelAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelAs.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/EichelAs.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/EichelKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelKoenig.… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/EichelKoenig.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/EichelOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelOber.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/EichelOber.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/EichelUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelUnter.b… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/EichelUnter.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/FreeCard.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/FreeCard.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras10.bmp?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras2.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras3.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras4.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras5.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras6.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras7.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras8.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Gras9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras9.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Gras9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/GrasAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasAs.bmp?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/GrasAs.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/GrasKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasKoenig.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/GrasKoenig.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/GrasOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasOber.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/GrasOber.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/GrasUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasUnter.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/GrasUnter.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz10.bmp?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz2.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz3.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz4.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz5.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz6.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz7.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz8.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Herz9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz9.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Herz9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/HerzAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzAs.bmp?re… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/HerzAs.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/HerzKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzKoenig.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/HerzKoenig.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/HerzOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzOber.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/HerzOber.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/HerzUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzUnter.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/HerzUnter.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Joker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Joker.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Joker.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/OSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/OSign.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/OSign.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Ruecken.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Ruecken.bmp?r… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Ruecken.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen10.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen2.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen2.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen3.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen4.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen4.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen5.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen5.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen6.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen6.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen7.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen7.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen8.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen8.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/Schellen9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen9.bmp… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/Schellen9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/SchellenAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenAs.bm… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/SchellenAs.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/SchellenKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenKoeni… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/SchellenKoenig.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/SchellenOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenOber.… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/SchellenOber.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/SchellenUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenUnter… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/SchellenUnter.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rosapps/cardsbav/res/XSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/XSign.bmp?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/cardsbav/res/XSign.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[ekohl] 28179: Add the status bar.
by ekohl＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: ekohl Date: Sun Aug 5 22:56:39 2007 New Revision: 28179 URL: http://svn.reactos.org/svn/reactos?rev=28179&view=rev Log: Add the status bar. 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/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 Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,35,97,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14 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 Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ 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 | WS_DISABLED - AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sun Aug 5 22:56:39 2007 @@ -23,7 +23,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sun Aug 5 22:56:39 2007 @@ -23,7 +23,7 @@ AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sun Aug 5 22:56:39 2007 @@ -23,7 +23,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sun Aug 5 22:56:39 2007 @@ -21,7 +21,7 @@ AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 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 Sun Aug 5 22:56:39 2007 @@ -17,7 +17,7 @@ AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14 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 Sun Aug 5 22:56:39 2007 @@ -24,7 +24,7 @@ AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sun Aug 5 22:56:39 2007 @@ -23,7 +23,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14 PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sun Aug 5 22:56:39 2007 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sun Aug 5 22:56:39 2007 @@ -23,7 +23,7 @@ AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 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 + AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14 PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Aug 5 22:56:39 2007 @@ -206,6 +206,9 @@ CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE, (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); + CheckDlgButton(hDlg, + IDC_OPT_STATUSBAR, + (dwOptions & OPTION_SHOW_STATUS) ? BST_CHECKED : BST_UNCHECKED); return TRUE; case WM_COMMAND: @@ -216,6 +219,11 @@ if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED) dwOptions |= OPTION_THREE_CARDS; + if (IsDlgButtonChecked(hDlg, IDC_OPT_STATUSBAR) == BST_CHECKED) + dwOptions |= OPTION_SHOW_STATUS; + else + dwOptions &= ~OPTION_SHOW_STATUS; + EndDialog(hDlg, TRUE); return TRUE; @@ -231,11 +239,34 @@ VOID ShowGameOptionsDlg(HWND hwnd) { DWORD dwOldOptions = dwOptions; + RECT rcMain, rcStatus; + int nWidth, nHeight, nStatusHeight; if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc)) { if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS)) NewGame(); + + if ((dwOldOptions & OPTION_SHOW_STATUS) != (dwOptions & OPTION_SHOW_STATUS)) + { + GetClientRect(hwndMain, &rcMain); + nHeight = rcMain.bottom - rcMain.top; + nWidth = rcMain.right - rcMain.left; + + if (dwOptions & OPTION_SHOW_STATUS) + { + ShowWindow(hwndStatus, SW_SHOW); + GetWindowRect(hwndStatus, &rcStatus); + nStatusHeight = rcStatus.bottom - rcStatus.top; + MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE); + MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); + } + else + { + ShowWindow(hwndStatus, SW_HIDE); + MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE); + } + } } } @@ -413,9 +444,10 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { static int nWidth, nHeight; - int nStatusHeight = 0;//20; int parts[] = { 100, -1 }; int ret; + RECT rc; + int nStatusHeight = 0; MINMAXINFO *mmi; @@ -428,8 +460,6 @@ SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); - - ShowWindow(hwndStatus, SW_HIDE); SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); @@ -449,8 +479,17 @@ nWidth = LOWORD(lParam); nHeight = HIWORD(lParam); - MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE); - //MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); + if (dwOptions & OPTION_SHOW_STATUS) + { + GetWindowRect(hwndStatus, &rc); + nStatusHeight = rc.bottom - rc.top; + MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE); + MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE); + } + else + { + MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE); + } //parts[0] = nWidth - 256; //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); return 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 Sun Aug 5 22:56:39 2007 @@ -5,6 +5,7 @@ extern TCHAR szAppName[]; extern bool fGameStarted; +#define OPTION_SHOW_STATUS 4 #define OPTION_THREE_CARDS 8 #define CARDBACK_START IDC_CARDBACK1 #define CARDBACK_END IDC_CARDBACK4

1 0

[spetreolle] 28178: fix build
by spetreolle＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: spetreolle Date: Sun Aug 5 18:58:58 2007 New Revision: 28178 URL: http://svn.reactos.org/svn/reactos?rev=28178&view=rev Log: fix build Modified: trunk/rostests/apitests/gdi32api/tests/CreateFont.c trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c Modified: trunk/rostests/apitests/gdi32api/tests/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateFont.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateFont.c Sun Aug 5 18:58:58 2007 @@ -1,4 +1,4 @@ -#include "..\gdi32api.h" +#include "../gdi32api.h" #define INVALIDFONT "ThisFontDoesNotExist" Modified: trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreateRectRgn.c Sun Aug 5 18:58:58 2007 @@ -1,4 +1,4 @@ -#include "..\gdi32api.h" +#include "../gdi32api.h" INT Test_CreateRectRgn(PTESTINFO pti)

1 0

[tkreuzer] 28177: set svn:ignore: *.vcproj, *.user, *.cbp, *.depend, *.layout
by tkreuzer＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: tkreuzer Date: Sun Aug 5 16:34:42 2007 New Revision: 28177 URL: http://svn.reactos.org/svn/reactos?rev=28177&view=rev Log: set svn:ignore: *.vcproj, *.user, *.cbp, *.depend, *.layout Modified: trunk/rostests/apitests/ (props changed) trunk/rostests/apitests/gdi32api/ (props changed) trunk/rostests/apitests/gdi32api/tests/ (props changed) trunk/rostests/apitests/user32api/ (props changed) trunk/rostests/apitests/user32api/tests/ (props changed) trunk/rostests/apitests/w32kdll/ (props changed) trunk/rostests/apitests/w32knapi/ (props changed) trunk/rostests/apitests/w32knapi/ntdd/ (props changed) trunk/rostests/apitests/w32knapi/ntgdi/ (props changed) trunk/rostests/apitests/w32knapi/ntuser/ (props changed) Propchange: trunk/rostests/apitests/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/gdi32api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/gdi32api/tests/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/user32api/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/user32api/tests/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/w32kdll/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/w32knapi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/w32knapi/ntdd/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/w32knapi/ntgdi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout Propchange: trunk/rostests/apitests/w32knapi/ntuser/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Aug 5 16:34:42 2007 @@ -1,0 +1,5 @@ +*.vcproj +*.user +*.cbp +*.depend +*.layout

1 0

[dreimer] 28176: - Update Help. - Fix one small bug in Scut. (In my eyes this tool is completed now)
by dreimer＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: dreimer Date: Sun Aug 5 15:54:37 2007 New Revision: 28176 URL: http://svn.reactos.org/svn/reactos?rev=28176&view=rev Log: - Update Help. - Fix one small bug in Scut. (In my eyes this tool is completed now) Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Aug 5 15:54:37 2007 @@ -26,8 +26,8 @@ echo with the appropriate number. echo basedir - Switch back to the ReactOS source directory. echo. - echo scut - Define, Remove and Switch to Shortcutted Source- - echo Directories. + echo scut - Define, Remove, Switch and Default to Shortcutted + echo Source-Directories. echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. echo clean [logs] - Fully clean the ReactOS source directory and/or @@ -112,7 +112,9 @@ ) if "%1" == "scut" ( echo Usage: scut [OPTIONS] - echo Defines, Removes and Switches to Shortcutted Source Directories. + echo Defines, Removes, Switches and Defaults to Shortcutted Source Directories. + echo scut started without a parameter or with the name of a Shortcut as + echo parameter sets this Shortcut active. echo. echo add - Adds a Shortcut. echo (Optional: "Shortcut" "Directory" as second and third parameter) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Sun Aug 5 15:54:37 2007 @@ -30,14 +30,12 @@ ) goto :END +:: +:: Load Shortcut from XML and set it active. +:: :DEF echo Choose your Source Folder: SET /P XY= -goto :RUN - -:: -:: Load Shortcut from XML and set it active. -:: :RUN grep name=\"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" test -s "%ROSBEBASEDIR%\aaa.tmp" @@ -47,7 +45,7 @@ goto :END ) else ( set /P dir=<"%ROSBEBASEDIR%\aaa.tmp" - cd /D %dir% + call cd /D %dir% del "%ROSBEBASEDIR%\aaa.tmp" goto :END )

1 0

[dreimer] 28175: Optimize scut to tell if the shortcuts exist or not.
by dreimer＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: dreimer Date: Sun Aug 5 15:37:44 2007 New Revision: 28175 URL: http://svn.reactos.org/svn/reactos?rev=28175&view=rev Log: Optimize scut to tell if the shortcuts exist or not. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Aug 5 15:37:44 2007 @@ -5,8 +5,7 @@ *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) -- Updated NASM to 0.99.01 (Daniel Reimer, David Leon) - (Small Fix by David Leon to bypass Bug in 0.99.01 which prevents our Bootsectors to build) +- Updated NASM to 0.99.02 (Daniel Reimer, David Leon) - Updated Binutils 2.17.50 to Build 20070730 (Hervé Poussineau, David Leon, Daniel Reimer) (Small modification by Hervé Poussineau in LD to fix Bug 1244) - Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Sun Aug 5 15:37:44 2007 @@ -39,10 +39,22 @@ :: Load Shortcut from XML and set it active. :: :RUN -for /f "usebackq" %%i in (`"grep name=\"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir"`) do @SET dir=%%i -cd /D %dir% -goto :END +grep name=\"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Shortcut with that name does not exist. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + set /P dir=<"%ROSBEBASEDIR%\aaa.tmp" + cd /D %dir% + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) +:: +:: Add new Shortcut to XML. +:: :ADD if not "%2" == "" ( if not "%3" == "" ( @@ -57,9 +69,6 @@ goto :ADD1 ) -:: -:: Add new Shortcut to XML. -:: :ADD1 echo Choose your Shortcut: SET /P CUT= @@ -71,6 +80,7 @@ copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" del "%ROSBEBASEDIR%\srclist.xml" ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +del "%ROSBEBASEDIR%\aaa.tmp" goto :END :: @@ -84,10 +94,19 @@ echo Choose your Shortcut: SET /P CUTREM= :REM1 -grep -v name=\"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml -goto :END +grep name=\"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Shortcut with that name does not exist. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + grep -v name=\"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" + del "%ROSBEBASEDIR%\srclist.xml" + ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) :: :: Set Default Shortcut. @@ -100,9 +119,21 @@ echo Choose your new Default Shortcut: SET /P DEF= :DEF1 -sed "s/base=\".*\"/base=\"%DEF%\"/g" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" -del "%ROSBEBASEDIR%\srclist.xml" -ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +grep name=\"%DEF%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Shortcut with that name does not exist. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + sed "s/base=\".*\"/base=\"%DEF%\"/g" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" + del "%ROSBEBASEDIR%\srclist.xml" + ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml + del "%ROSBEBASEDIR%\aaa.tmp" + goto :PREEND +) + +:PREEND call "%ROSBEBASEDIR%\RosBE.cmd" :END

1 0

[fireball] 28174: - More MSVC fixes
by fireball＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: fireball Date: Sun Aug 5 15:27:39 2007 New Revision: 28174 URL: http://svn.reactos.org/svn/reactos?rev=28174&view=rev Log: - More MSVC fixes Modified: trunk/reactos/include/ndk/halfuncs.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/controller.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/error.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/iospace.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Sun Aug 5 15:27:39 2007 @@ -55,8 +55,8 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -//void _enable(void); -//void _disable(void); +void _enable(void); +void _disable(void); #pragma intrinsic(_enable) #pragma intrinsic(_disable) #endif Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=281… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Aug 5 15:27:39 2007 @@ -1094,7 +1094,7 @@ } /* Update length */ - CmCSDVersionString.MaximumLength = (USHORT)sizeof(Buffer) - Remaining; + CmCSDVersionString.MaximumLength = sizeof(Buffer) - (USHORT)Remaining; } /* Check if we have an RC number */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Sun Aug 5 15:27:39 2007 @@ -165,7 +165,7 @@ typedef struct _MM_SECTION_SEGMENT { - LONGLONG FileOffset; /* start offset into the file for image sections */ + LONG FileOffset; /* start offset into the file for image sections */ ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ ULONG RawLength; /* length of the segment which is part of the mapped file */ ULONG Length; /* absolute length of the segment */ @@ -184,8 +184,8 @@ ULONG_PTR StackReserve; ULONG_PTR StackCommit; ULONG_PTR EntryPoint; - ULONG Subsystem; - ULONG ImageCharacteristics; + USHORT Subsystem; + USHORT ImageCharacteristics; USHORT MinorSubsystemVersion; USHORT MajorSubsystemVersion; USHORT Machine; Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Sun Aug 5 15:27:39 2007 @@ -12,15 +12,14 @@ #include <ntverp.h> #define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1 -#define NTKERNELAPI -#define NOEXTAPI /* DDK/IFS/NDK Headers */ -#define NTKERNELAPI -#define NOEXTAPI +#ifdef _MSC_VER +#include <ntdef.h> +#undef DECLSPEC_IMPORT +#define DECLSPEC_IMPORT +#endif #include <ntifs.h> -#undef _KPROCESS -#undef _EPROCESS #include <wdmguid.h> #include <arc/arc.h> #include <ntndk.h> @@ -55,6 +54,7 @@ #include <arc/setupblk.h> /* KD Support */ +#define NOEXTAPI #include <windbgkd.h> #include <wdbgexts.h> #include <kddll.h> Modified: trunk/reactos/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/controll… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/controller.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/controller.c Sun Aug 5 15:27:39 2007 @@ -92,7 +92,7 @@ /* Zero the Object and set its data */ RtlZeroMemory(Controller, sizeof(CONTROLLER_OBJECT) + Size); Controller->Type = IO_TYPE_CONTROLLER; - Controller->Size = (CSHORT)sizeof(CONTROLLER_OBJECT) + Size; + Controller->Size = sizeof(CONTROLLER_OBJECT) + (CSHORT)Size; Controller->ControllerExtension = (Controller + 1); /* Initialize its Queue */ Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sun Aug 5 15:27:39 2007 @@ -765,7 +765,7 @@ * because that's only padding for the DevObjExt and not part of the Object. */ CreatedDeviceObject->Type = IO_TYPE_DEVICE; - CreatedDeviceObject->Size = (USHORT)sizeof(DEVICE_OBJECT) + DeviceExtensionSize; + CreatedDeviceObject->Size = sizeof(DEVICE_OBJECT) + (USHORT)DeviceExtensionSize; /* The kernel extension is after the driver internal extension */ DeviceObjectExtension = (PDEVOBJ_EXTENSION) Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Aug 5 15:27:39 2007 @@ -1126,7 +1126,9 @@ if (!DriverName) { /* Create a random name and set up the string*/ - NameLength = swprintf(NameBuffer, L"\\Driver\\%08u", KeTickCount); + NameLength = (USHORT)swprintf(NameBuffer, + L"\\Driver\\%08u", + KeTickCount); LocalDriverName.Length = NameLength * sizeof(WCHAR); LocalDriverName.MaximumLength = LocalDriverName.Length + sizeof(UNICODE_NULL); LocalDriverName.Buffer = NameBuffer; Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c Sun Aug 5 15:27:39 2007 @@ -338,8 +338,8 @@ if (NT_SUCCESS(Status)) { /* Success, update the information */ - ObjectNameInfo->Name.Length = (USHORT)100 - - DriverNameLength; + ObjectNameInfo->Name.Length = + 100 - (USHORT)DriverNameLength; } } } Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Aug 5 15:27:39 2007 @@ -183,8 +183,8 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); - last = min(HighestAcceptableAddress.QuadPart / PAGE_SIZE, MmPageArraySize - 1); - boundary = BoundaryAddressMultiple.QuadPart / PAGE_SIZE; + last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmPageArraySize - 1); + boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; for (j = 0; j < 2; j++) { @@ -195,7 +195,7 @@ * pages above the 16MB area because the caller has specify an upper limit. * The second try uses the specified lower limit. */ - for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.QuadPart / PAGE_SIZE; i <= last; ) + for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.LowPart / PAGE_SIZE; i <= last; ) { if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -1017,8 +1017,8 @@ if (NumberOfPages == 0) return 0; - LowestPage = LowestAddress.QuadPart / PAGE_SIZE; - HighestPage = HighestAddress.QuadPart / PAGE_SIZE; + LowestPage = LowestAddress.LowPart / PAGE_SIZE; + HighestPage = HighestAddress.LowPart / PAGE_SIZE; if ((HighestAddress.u.LowPart % PAGE_SIZE) != 0) HighestPage++; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Sun Aug 5 15:27:39 2007 @@ -625,7 +625,7 @@ if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { - PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); + PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.LowPart)); if (PageDir == NULL) { KEBUGCHECK(0); Modified: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/iospace.c (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c Sun Aug 5 15:27:39 2007 @@ -95,7 +95,7 @@ DPRINT("MmMapIoSpace failed (%lx)\n", Status); return (NULL); } - Pfn = PhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = PhysicalAddress.LowPart >> PAGE_SHIFT; for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) { Status = MmCreateVirtualMappingForKernel((char*)Result + i, Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=28174… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Sun Aug 5 15:27:39 2007 @@ -273,7 +273,7 @@ break; case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; + Pfn = MmSharedDataPagePhysicalAddress.LowPart >> PAGE_SHIFT; Status = MmCreateVirtualMapping(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sun Aug 5 15:27:39 2007 @@ -611,7 +611,7 @@ * Retrieve the page from the cache segment that we actually want. */ (*Page) = MmGetPhysicalAddress((char*)BaseAddress + - FileOffset - BaseOffset).QuadPart >> PAGE_SHIFT; + FileOffset - BaseOffset).LowPart >> PAGE_SHIFT; CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, TRUE); }

1 0

[ekohl] 28173: Implement toggle keys option.
by ekohl＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: ekohl Date: Sun Aug 5 13:48:34 2007 New Revision: 28173 URL: http://svn.reactos.org/svn/reactos?rev=28173&view=rev Log: Implement toggle keys option. Modified: trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sun Aug 5 13:48:34 2007 @@ -20,7 +20,9 @@ STICKYKEYS stickyKeys; STICKYKEYS oldStickyKeys; FILTERKEYS filterKeys; + FILTERKEYS oldFilterKeys; TOGGLEKEYS toggleKeys; + TOGGLEKEYS oldToggleKeys; BOOL bKeyboardPref; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -166,13 +168,26 @@ pGlobalData = (PGLOBAL_DATA)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + memcpy(&pGlobalData->oldToggleKeys, + &pGlobalData->toggleKeys, + sizeof(STICKYKEYS)); + + CheckDlgButton(hwndDlg, + IDC_TOGGLE_ACTIVATE_CHECK, + pGlobalData->toggleKeys.dwFlags & TKF_HOTKEYACTIVE ? BST_CHECKED : BST_UNCHECKED); + break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_TOGGLE_ACTIVATE_CHECK: + pGlobalData->toggleKeys.dwFlags ^= TKF_HOTKEYACTIVE; + break; + case IDOK: - EndDialog(hwndDlg, TRUE); + EndDialog(hwndDlg, + (pGlobalData->toggleKeys.dwFlags != pGlobalData->oldToggleKeys.dwFlags)); break; case IDCANCEL: Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sun Aug 5 13:48:34 2007 @@ -130,7 +130,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sun Aug 5 13:48:34 2007 @@ -132,7 +132,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sun Aug 5 13:48:34 2007 @@ -129,7 +129,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sun Aug 5 13:48:34 2007 @@ -133,7 +133,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sun Aug 5 13:48:34 2007 @@ -131,7 +131,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sun Aug 5 13:48:34 2007 @@ -131,7 +131,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sun Aug 5 13:48:34 2007 @@ -132,7 +132,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sun Aug 5 13:48:34 2007 @@ -130,7 +130,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sun Aug 5 13:48:34 2007 @@ -130,7 +130,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sun Aug 5 13:48:34 2007 @@ -132,7 +132,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sun Aug 5 13:48:34 2007 @@ -133,7 +133,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sun Aug 5 13:48:34 2007 @@ -130,7 +130,9 @@ CAPTION "Toggle Keys Settings" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Sun Aug 5 13:48:34 2007 @@ -66,6 +66,8 @@ #define IDC_STICKY_SOUND_CHECK 224 #define IDC_STICKY_STATUS_CHECK 225 +#define IDC_TOGGLE_ACTIVATE_CHECK 246 + #endif /* __CPL_RESOURCE_H */ /* EOF */

1 0

[jimtabor] 28172: Started CreateMetaFile, port from wine. Made changes to the structures. Added new support routines.
by jimtabor＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: jimtabor Date: Sun Aug 5 13:21:00 2007 New Revision: 28172 URL: http://svn.reactos.org/svn/reactos?rev=28172&view=rev Log: Started CreateMetaFile, port from wine. Made changes to the structures. Added new support routines. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sun Aug 5 13:21:00 2007 @@ -35,12 +35,12 @@ /* TYPES *********************************************************************/ -// Based on wmfapi.h and Wine. This is the DC_ATTR for a MetaDC file. +// Based on wmfapi.h and Wine. typedef struct tagMETAFILEDC { PVOID pvMetaBuffer; HANDLE hFile; DWORD Size; - PMETAHEADER mf; + METAHEADER mh; UINT handles_size, cur_handles; HGDIOBJ *handles; @@ -49,9 +49,17 @@ HGDIOBJ Brush; HGDIOBJ Palette; HGDIOBJ Font; + + WCHAR Filename[MAX_PATH+2]; // Add more later. } METAFILEDC,*PMETAFILEDC; +// Metafile Entry handle +typedef struct tagMF_ENTRY { + LIST_ENTRY List; + HGDIOBJ hmDC; // Handle return from NtGdiCreateClientObj. + PMETAFILEDC pmfDC; +} MF_ENTRY, *PMF_ENTRY; typedef struct tagENHMETAFILE { PVOID pvMetaBuffer; Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Aug 5 13:21:00 2007 @@ -33,37 +33,7 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - -/* - * @unimplemented - */ -HMETAFILE -STDCALL -CloseMetaFile( - HDC a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -DeleteMetaFile( - HMETAFILE a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - + /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Sun Aug 5 13:21:00 2007 @@ -1,4 +1,93 @@ #include "precomp.h" + +/* DEFINES *******************************************************************/ + + +/* PRIVATE DATA **************************************************************/ + +PMF_ENTRY hMF_List = NULL; +DWORD hMFCount = 0; + +/* INTERNAL FUNCTIONS ********************************************************/ + +BOOL +MF_CreateMFDC ( HGDIOBJ hMDC, + PMETAFILEDC pmfDC ) +{ + PMF_ENTRY pMFME; + + pMFME = LocalAlloc(LMEM_ZEROINIT, sizeof(MF_ENTRY)); + if (!pMFME) + { + return FALSE; + } + + if (hMF_List == NULL) + { + hMF_List = pMFME; + InitializeListHead(&hMF_List->List); + } + else + InsertTailList(&hMF_List->List, &pMFME->List); + + pMFME->hmDC = hMDC; + pMFME->pmfDC = pmfDC; + + hMFCount++; + return TRUE; +} + + +PMETAFILEDC +MF_GetMFDC ( HGDIOBJ hMDC ) +{ + PMF_ENTRY pMFME = hMF_List; + + do + { + if ( pMFME->hmDC == hMDC ) return pMFME->pmfDC; + pMFME = (PMF_ENTRY) pMFME->List.Flink; + } + while ( pMFME != hMF_List ); + + return NULL; +} + + +BOOL +MF_DeleteMFDC ( HGDIOBJ hMDC ) +{ + PMF_ENTRY pMFME = hMF_List; + + do + { + if ( pMFME->hmDC == hMDC) + { + RemoveEntryList(&pMFME->List); + LocalFree ( pMFME ); + hMFCount--; + return TRUE; + } + pMFME = (PMF_ENTRY) pMFME->List.Flink; + } + while ( pMFME != hMF_List ); + + return FALSE; +} + +/* FUNCTIONS *****************************************************************/ + +/* + * @unimplemented + */ +HMETAFILE +STDCALL +CloseMetaFile( + HDC a0 + ) +{ + return 0; +} /* @@ -34,8 +123,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - - rc = NULL; + rc = CopyMetaFileW( hmfSrc, lpszFileW ); HEAP_free ( lpszFileW ); } @@ -52,7 +140,50 @@ LPCWSTR lpszFile ) { - return NULL; + HANDLE hFile; + HDC hmDC; + PMETAFILEDC pmfDC = LocalAlloc(LMEM_ZEROINIT, sizeof(METAFILEDC)); + if (!pmfDC) return NULL; + + pmfDC->mh.mtHeaderSize = sizeof(METAHEADER) / sizeof(WORD); + pmfDC->mh.mtVersion = 0x0300; + pmfDC->mh.mtSize = pmfDC->mh.mtHeaderSize; + + if (lpszFile) /* disk based metafile */ + { + pmfDC->mh.mtType = METAFILE_DISK; + + if(!GetFullPathName( lpszFile, + MAX_PATH, + (LPTSTR) &pmfDC->Filename, + (LPTSTR*) &lpszFile)) + { +// MFDRV_DeleteDC( dc->physDev ); + return NULL; + } + + if ((hFile = CreateFileW(pmfDC->Filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) + { +// MFDRV_DeleteDC( dc->physDev ); + return NULL; + } + + if (!WriteFile( hFile, &pmfDC->mh, sizeof(pmfDC->mh), NULL, NULL )) + { +// MFDRV_DeleteDC( dc->physDev ); + return NULL; + } + pmfDC->hFile = hFile; + } + else /* memory based metafile */ + pmfDC->mh.mtType = METAFILE_MEMORY; + + hmDC = NtGdiCreateClientObj ( GDI_OBJECT_TYPE_METADC ); + + MF_CreateMFDC ( hmDC, pmfDC ); + + return hmDC; } @@ -74,11 +205,23 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NULL; - + rc = CreateMetaFileW( lpszFileW ); HEAP_free ( lpszFileW ); } return rc; +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +DeleteMetaFile( + HMETAFILE a0 + ) +{ + return FALSE; } @@ -113,8 +256,7 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NULL; - + rc = GetMetaFileW( lpszMetaFileW ); HEAP_free ( lpszMetaFileW ); }

1 0

[fireball] 28171: - Comment out those lines again (sorry), to prevent having lots of uninstallable revisions built by buildbot. Please re-commit when the real bug is fixed.
by fireball＠svn.reactos.org 05 Aug '07

05 Aug '07

Author: fireball Date: Sun Aug 5 12:27:41 2007 New Revision: 28171 URL: http://svn.reactos.org/svn/reactos?rev=28171&view=rev Log: - Comment out those lines again (sorry), to prevent having lots of uninstallable revisions built by buildbot. Please re-commit when the real bug is fixed. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sun Aug 5 12:27:41 2007 @@ -88,8 +88,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" +;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" +;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters"

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