Author: hbelusca
Date: Fri Mar 14 20:59:02 2014
New Revision: 62496
URL:
http://svn.reactos.org/svn/reactos?rev=62496&view=rev
Log:
[CARDS]: Code formatting only (tabs --> spaces).
Modified:
trunk/reactos/dll/win32/cards/cards.c
trunk/reactos/dll/win32/cards/cards.h
Modified: trunk/reactos/dll/win32/cards/cards.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Mar 14 20:59:02 2014
@@ -1,7 +1,7 @@
/*
- * ReactOS Cards
- *
- * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org>
+ * ReactOS Cards
+ *
+ * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -33,8 +33,8 @@
*/
BOOL WINAPI WEP(DWORD Unknown)
{
- UNREFERENCED_PARAMETER(Unknown);
- return TRUE;
+ UNREFERENCED_PARAMETER(Unknown);
+ return TRUE;
}
/*
@@ -45,15 +45,15 @@
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;
+ *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;
}
/*
@@ -64,8 +64,8 @@
DWORD dwIndex;
/* Unload images */
- for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++)
- DeleteObject(g_CardBitmaps[dwIndex]);
+ for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++)
+ DeleteObject(g_CardBitmaps[dwIndex]);
}
/*
@@ -73,7 +73,7 @@
*/
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);
+ return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color);
}
/*
@@ -81,30 +81,31 @@
*/
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);
+ 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);
- }
+ 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
- }
+ }
}
/*
@@ -122,106 +123,106 @@
*/
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;
+ 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;
}
@@ -232,19 +233,19 @@
*/
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;
+ 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;
-}
+ UNREFERENCED_PARAMETER(lpvReserved);
+ if (fdwReason == DLL_PROCESS_ATTACH)
+ g_hModule = hinstDLL;
+
+ return TRUE;
+}
Modified: trunk/reactos/dll/win32/cards/cards.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re…
==============================================================================
--- trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] Fri Mar 14 20:59:02 2014
@@ -1,7 +1,7 @@
/*
- * ReactOS Cards
+ * ReactOS Cards
*
- * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org>
+ * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,29 +28,29 @@
* FreeCard +
* Joker
*/
-#define MAX_CARD_BITMAPS 68
+#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
+#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
#if defined(CARDSTYLE_DEFAULT)
-# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken
from MacSolitaireX
-# define CARD_HEIGHT 96
+# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours
are taken from MacSolitaireX
+# define CARD_HEIGHT 96
#elif defined(CARDSTYLE_BAVARIAN)
-# define CARD_WIDTH 110
-# define CARD_HEIGHT 198
+# define CARD_WIDTH 110
+# define CARD_HEIGHT 198
#else
-# error No or unsupported cardstyle defined
+# error No or unsupported cardstyle defined
#endif
-#define ISREDCARD(x) (x >= 13 && x <= 39)
+#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);