From e4f748378c4336112c39a073b45ee39928b13c0b Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Tue, 16 Oct 2007 18:33:03 +0000 Subject: [PATCH] Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild. This change obsoletes the old cardsbav.dll, so I removed it. svn path=/trunk/; revision=29630 --- reactos/dll/win32/cards/cards.h | 17 +- reactos/dll/win32/cards/cards.rbuild | 4 + reactos/dll/win32/cards/cards.rc | 211 ++++++++++----- .../win32/cards/res/bavarian}/Eichel10.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel2.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel3.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel4.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel5.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel6.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel7.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel8.bmp | Bin .../dll/win32/cards/res/bavarian}/Eichel9.bmp | Bin .../win32/cards/res/bavarian}/EichelAs.bmp | Bin .../cards/res/bavarian}/EichelKoenig.bmp | Bin .../win32/cards/res/bavarian}/EichelOber.bmp | Bin .../win32/cards/res/bavarian}/EichelUnter.bmp | Bin .../win32/cards/res/bavarian}/FreeCard.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras10.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras2.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras3.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras4.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras5.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras6.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras7.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras8.bmp | Bin .../dll/win32/cards/res/bavarian}/Gras9.bmp | Bin .../dll/win32/cards/res/bavarian}/GrasAs.bmp | Bin .../win32/cards/res/bavarian}/GrasKoenig.bmp | Bin .../win32/cards/res/bavarian}/GrasOber.bmp | Bin .../win32/cards/res/bavarian}/GrasUnter.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz10.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz2.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz3.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz4.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz5.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz6.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz7.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz8.bmp | Bin .../dll/win32/cards/res/bavarian}/Herz9.bmp | Bin .../dll/win32/cards/res/bavarian}/HerzAs.bmp | Bin .../win32/cards/res/bavarian}/HerzKoenig.bmp | Bin .../win32/cards/res/bavarian}/HerzOber.bmp | Bin .../win32/cards/res/bavarian}/HerzUnter.bmp | Bin .../dll/win32/cards/res/bavarian}/Joker.bmp | Bin .../dll/win32/cards/res/bavarian}/OSign.bmp | Bin .../dll/win32/cards/res/bavarian}/Ruecken.bmp | Bin .../win32/cards/res/bavarian}/Schellen10.bmp | Bin .../win32/cards/res/bavarian}/Schellen2.bmp | Bin .../win32/cards/res/bavarian}/Schellen3.bmp | Bin .../win32/cards/res/bavarian}/Schellen4.bmp | Bin .../win32/cards/res/bavarian}/Schellen5.bmp | Bin .../win32/cards/res/bavarian}/Schellen6.bmp | Bin .../win32/cards/res/bavarian}/Schellen7.bmp | Bin .../win32/cards/res/bavarian}/Schellen8.bmp | Bin .../win32/cards/res/bavarian}/Schellen9.bmp | Bin .../win32/cards/res/bavarian}/SchellenAs.bmp | Bin .../cards/res/bavarian}/SchellenKoenig.bmp | Bin .../cards/res/bavarian}/SchellenOber.bmp | Bin .../cards/res/bavarian}/SchellenUnter.bmp | Bin .../dll/win32/cards/res/bavarian}/XSign.bmp | Bin .../cards/res/{ => default}/Background_1.bmp | Bin .../cards/res/{ => default}/Background_10.bmp | Bin .../cards/res/{ => default}/Background_11.bmp | Bin .../cards/res/{ => default}/Background_12.bmp | Bin .../cards/res/{ => default}/Background_2.bmp | Bin .../cards/res/{ => default}/Background_3.bmp | Bin .../cards/res/{ => default}/Background_4.bmp | Bin .../cards/res/{ => default}/Background_5.bmp | Bin .../cards/res/{ => default}/Background_6.bmp | Bin .../cards/res/{ => default}/Background_7.bmp | Bin .../cards/res/{ => default}/Background_8.bmp | Bin .../cards/res/{ => default}/Background_9.bmp | Bin .../cards/res/{ => default}/Clubs_Ace.bmp | Bin .../cards/res/{ => default}/Clubs_Eight.bmp | Bin .../cards/res/{ => default}/Clubs_Five.bmp | Bin .../cards/res/{ => default}/Clubs_Four.bmp | Bin .../cards/res/{ => default}/Clubs_Jack.bmp | Bin .../cards/res/{ => default}/Clubs_King.bmp | Bin .../cards/res/{ => default}/Clubs_Nine.bmp | Bin .../cards/res/{ => default}/Clubs_Queen.bmp | Bin .../cards/res/{ => default}/Clubs_Seven.bmp | Bin .../cards/res/{ => default}/Clubs_Six.bmp | Bin .../cards/res/{ => default}/Clubs_Ten.bmp | Bin .../cards/res/{ => default}/Clubs_Three.bmp | Bin .../cards/res/{ => default}/Clubs_Two.bmp | Bin .../cards/res/{ => default}/Diamonds_Ace.bmp | Bin .../res/{ => default}/Diamonds_Eight.bmp | Bin .../cards/res/{ => default}/Diamonds_Five.bmp | Bin .../cards/res/{ => default}/Diamonds_Four.bmp | Bin .../cards/res/{ => default}/Diamonds_Jack.bmp | Bin .../cards/res/{ => default}/Diamonds_King.bmp | Bin .../cards/res/{ => default}/Diamonds_Nine.bmp | Bin .../res/{ => default}/Diamonds_Queen.bmp | Bin .../res/{ => default}/Diamonds_Seven.bmp | Bin .../cards/res/{ => default}/Diamonds_Six.bmp | Bin .../cards/res/{ => default}/Diamonds_Ten.bmp | Bin .../res/{ => default}/Diamonds_Three.bmp | Bin .../cards/res/{ => default}/Diamonds_Two.bmp | Bin .../cards/res/{ => default}/FreeCard.bmp | Bin .../cards/res/{ => default}/Hearts_Ace.bmp | Bin .../cards/res/{ => default}/Hearts_Eight.bmp | Bin .../cards/res/{ => default}/Hearts_Five.bmp | Bin .../cards/res/{ => default}/Hearts_Four.bmp | Bin .../cards/res/{ => default}/Hearts_Jack.bmp | Bin .../cards/res/{ => default}/Hearts_King.bmp | Bin .../cards/res/{ => default}/Hearts_Nine.bmp | Bin .../cards/res/{ => default}/Hearts_Queen.bmp | Bin .../cards/res/{ => default}/Hearts_Seven.bmp | Bin .../cards/res/{ => default}/Hearts_Six.bmp | Bin .../cards/res/{ => default}/Hearts_Ten.bmp | Bin .../cards/res/{ => default}/Hearts_Three.bmp | Bin .../cards/res/{ => default}/Hearts_Two.bmp | Bin .../win32/cards/res/{ => default}/Joker.bmp | Bin .../win32/cards/res/{ => default}/OSign.bmp | Bin .../cards/res/{ => default}/Spades_Ace.bmp | Bin .../cards/res/{ => default}/Spades_Eight.bmp | Bin .../cards/res/{ => default}/Spades_Five.bmp | Bin .../cards/res/{ => default}/Spades_Four.bmp | Bin .../cards/res/{ => default}/Spades_Jack.bmp | Bin .../cards/res/{ => default}/Spades_King.bmp | Bin .../cards/res/{ => default}/Spades_Nine.bmp | Bin .../cards/res/{ => default}/Spades_Queen.bmp | Bin .../cards/res/{ => default}/Spades_Seven.bmp | Bin .../cards/res/{ => default}/Spades_Six.bmp | Bin .../cards/res/{ => default}/Spades_Ten.bmp | Bin .../cards/res/{ => default}/Spades_Three.bmp | Bin .../cards/res/{ => default}/Spades_Two.bmp | Bin .../win32/cards/res/{ => default}/XSign.bmp | Bin rosapps/cardsbav/cardsbav.c | 249 ------------------ rosapps/cardsbav/cardsbav.def | 8 - rosapps/cardsbav/cardsbav.h | 56 ---- rosapps/cardsbav/cardsbav.rbuild | 10 - rosapps/cardsbav/cardsbav.rc | 99 ------- rosapps/directory.rbuild | 4 - 134 files changed, 156 insertions(+), 502 deletions(-) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel10.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel2.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel3.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel4.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel5.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel6.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel7.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel8.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Eichel9.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/EichelAs.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/EichelKoenig.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/EichelOber.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/EichelUnter.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/FreeCard.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras10.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras2.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras3.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras4.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras5.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras6.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras7.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras8.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Gras9.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/GrasAs.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/GrasKoenig.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/GrasOber.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/GrasUnter.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz10.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz2.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz3.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz4.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz5.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz6.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz7.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz8.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Herz9.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/HerzAs.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/HerzKoenig.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/HerzOber.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/HerzUnter.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Joker.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/OSign.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Ruecken.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen10.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen2.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen3.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen4.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen5.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen6.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen7.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen8.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/Schellen9.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/SchellenAs.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/SchellenKoenig.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/SchellenOber.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/SchellenUnter.bmp (100%) rename {rosapps/cardsbav/res => reactos/dll/win32/cards/res/bavarian}/XSign.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_1.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_10.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_11.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_12.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_2.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_3.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_4.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_5.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_6.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_7.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_8.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Background_9.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Ace.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Eight.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Five.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Four.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Jack.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_King.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Nine.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Queen.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Seven.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Six.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Ten.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Three.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Clubs_Two.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Ace.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Eight.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Five.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Four.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Jack.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_King.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Nine.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Queen.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Seven.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Six.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Ten.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Three.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Diamonds_Two.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/FreeCard.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Ace.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Eight.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Five.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Four.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Jack.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_King.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Nine.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Queen.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Seven.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Six.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Ten.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Three.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Hearts_Two.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Joker.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/OSign.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Ace.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Eight.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Five.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Four.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Jack.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_King.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Nine.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Queen.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Seven.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Six.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Ten.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Three.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/Spades_Two.bmp (100%) rename reactos/dll/win32/cards/res/{ => default}/XSign.bmp (100%) delete mode 100644 rosapps/cardsbav/cardsbav.c delete mode 100644 rosapps/cardsbav/cardsbav.def delete mode 100644 rosapps/cardsbav/cardsbav.h delete mode 100644 rosapps/cardsbav/cardsbav.rbuild delete mode 100644 rosapps/cardsbav/cardsbav.rc diff --git a/reactos/dll/win32/cards/cards.h b/reactos/dll/win32/cards/cards.h index bdf60b4091b..92b33d61a64 100644 --- a/reactos/dll/win32/cards/cards.h +++ b/reactos/dll/win32/cards/cards.h @@ -41,14 +41,15 @@ #define ectGREENO 7 #define ectSAVEEDGESMASK 0x80000000 -/* Microsoft card dimensions */ -/* -#define CARD_WIDTH 71 -#define CARD_HEIGHT 96 -*/ -/* MacSolitaireX's card dimensions */ -#define CARD_WIDTH 72 -#define CARD_HEIGHT 96 +#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 +#elif defined(CARDSTYLE_BAVARIAN) +# define CARD_WIDTH 110 +# define CARD_HEIGHT 198 +#else +# error No or unsupported cardstyle defined +#endif #define ISREDCARD(x) (x >= 13 && x <= 39) diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild index 8480f003be6..64b0904fd71 100644 --- a/reactos/dll/win32/cards/cards.rbuild +++ b/reactos/dll/win32/cards/cards.rbuild @@ -4,6 +4,10 @@ + + + + kernel32 gdi32 user32 diff --git a/reactos/dll/win32/cards/cards.rc b/reactos/dll/win32/cards/cards.rc index b4ba5394fda..b17613f783a 100644 --- a/reactos/dll/win32/cards/cards.rc +++ b/reactos/dll/win32/cards/cards.rc @@ -28,71 +28,146 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 BITMAP "res/Clubs_Ace.bmp" -2 BITMAP "res/Clubs_Two.bmp" -3 BITMAP "res/Clubs_Three.bmp" -4 BITMAP "res/Clubs_Four.bmp" -5 BITMAP "res/Clubs_Five.bmp" -6 BITMAP "res/Clubs_Six.bmp" -7 BITMAP "res/Clubs_Seven.bmp" -8 BITMAP "res/Clubs_Eight.bmp" -9 BITMAP "res/Clubs_Nine.bmp" -10 BITMAP "res/Clubs_Ten.bmp" -11 BITMAP "res/Clubs_Jack.bmp" -12 BITMAP "res/Clubs_Queen.bmp" -13 BITMAP "res/Clubs_King.bmp" -14 BITMAP "res/Diamonds_Ace.bmp" -15 BITMAP "res/Diamonds_Two.bmp" -16 BITMAP "res/Diamonds_Three.bmp" -17 BITMAP "res/Diamonds_Four.bmp" -18 BITMAP "res/Diamonds_Five.bmp" -19 BITMAP "res/Diamonds_Six.bmp" -20 BITMAP "res/Diamonds_Seven.bmp" -21 BITMAP "res/Diamonds_Eight.bmp" -22 BITMAP "res/Diamonds_Nine.bmp" -23 BITMAP "res/Diamonds_Ten.bmp" -24 BITMAP "res/Diamonds_Jack.bmp" -25 BITMAP "res/Diamonds_Queen.bmp" -26 BITMAP "res/Diamonds_King.bmp" -27 BITMAP "res/Hearts_Ace.bmp" -28 BITMAP "res/Hearts_Two.bmp" -29 BITMAP "res/Hearts_Three.bmp" -30 BITMAP "res/Hearts_Four.bmp" -31 BITMAP "res/Hearts_Five.bmp" -32 BITMAP "res/Hearts_Six.bmp" -33 BITMAP "res/Hearts_Seven.bmp" -34 BITMAP "res/Hearts_Eight.bmp" -35 BITMAP "res/Hearts_Nine.bmp" -36 BITMAP "res/Hearts_Ten.bmp" -37 BITMAP "res/Hearts_Jack.bmp" -38 BITMAP "res/Hearts_Queen.bmp" -39 BITMAP "res/Hearts_King.bmp" -40 BITMAP "res/Spades_Ace.bmp" -41 BITMAP "res/Spades_Two.bmp" -42 BITMAP "res/Spades_Three.bmp" -43 BITMAP "res/Spades_Four.bmp" -44 BITMAP "res/Spades_Five.bmp" -45 BITMAP "res/Spades_Six.bmp" -46 BITMAP "res/Spades_Seven.bmp" -47 BITMAP "res/Spades_Eight.bmp" -48 BITMAP "res/Spades_Nine.bmp" -49 BITMAP "res/Spades_Ten.bmp" -50 BITMAP "res/Spades_Jack.bmp" -51 BITMAP "res/Spades_Queen.bmp" -52 BITMAP "res/Spades_King.bmp" -53 BITMAP "res/FreeCard.bmp" -54 BITMAP "res/Background_1.bmp" -55 BITMAP "res/Background_2.bmp" -56 BITMAP "res/Background_3.bmp" -57 BITMAP "res/Background_4.bmp" -58 BITMAP "res/Background_5.bmp" -59 BITMAP "res/Background_6.bmp" -60 BITMAP "res/Background_7.bmp" -61 BITMAP "res/Background_8.bmp" -62 BITMAP "res/Background_9.bmp" -63 BITMAP "res/Background_10.bmp" -64 BITMAP "res/Background_11.bmp" -65 BITMAP "res/Background_12.bmp" -66 BITMAP "res/Joker.bmp" -67 BITMAP "res/XSign.bmp" -68 BITMAP "res/OSign.bmp" +#if defined(CARDSTYLE_DEFAULT) + 1 BITMAP "res/default/Clubs_Ace.bmp" + 2 BITMAP "res/default/Clubs_Two.bmp" + 3 BITMAP "res/default/Clubs_Three.bmp" + 4 BITMAP "res/default/Clubs_Four.bmp" + 5 BITMAP "res/default/Clubs_Five.bmp" + 6 BITMAP "res/default/Clubs_Six.bmp" + 7 BITMAP "res/default/Clubs_Seven.bmp" + 8 BITMAP "res/default/Clubs_Eight.bmp" + 9 BITMAP "res/default/Clubs_Nine.bmp" + 10 BITMAP "res/default/Clubs_Ten.bmp" + 11 BITMAP "res/default/Clubs_Jack.bmp" + 12 BITMAP "res/default/Clubs_Queen.bmp" + 13 BITMAP "res/default/Clubs_King.bmp" + 14 BITMAP "res/default/Diamonds_Ace.bmp" + 15 BITMAP "res/default/Diamonds_Two.bmp" + 16 BITMAP "res/default/Diamonds_Three.bmp" + 17 BITMAP "res/default/Diamonds_Four.bmp" + 18 BITMAP "res/default/Diamonds_Five.bmp" + 19 BITMAP "res/default/Diamonds_Six.bmp" + 20 BITMAP "res/default/Diamonds_Seven.bmp" + 21 BITMAP "res/default/Diamonds_Eight.bmp" + 22 BITMAP "res/default/Diamonds_Nine.bmp" + 23 BITMAP "res/default/Diamonds_Ten.bmp" + 24 BITMAP "res/default/Diamonds_Jack.bmp" + 25 BITMAP "res/default/Diamonds_Queen.bmp" + 26 BITMAP "res/default/Diamonds_King.bmp" + 27 BITMAP "res/default/Hearts_Ace.bmp" + 28 BITMAP "res/default/Hearts_Two.bmp" + 29 BITMAP "res/default/Hearts_Three.bmp" + 30 BITMAP "res/default/Hearts_Four.bmp" + 31 BITMAP "res/default/Hearts_Five.bmp" + 32 BITMAP "res/default/Hearts_Six.bmp" + 33 BITMAP "res/default/Hearts_Seven.bmp" + 34 BITMAP "res/default/Hearts_Eight.bmp" + 35 BITMAP "res/default/Hearts_Nine.bmp" + 36 BITMAP "res/default/Hearts_Ten.bmp" + 37 BITMAP "res/default/Hearts_Jack.bmp" + 38 BITMAP "res/default/Hearts_Queen.bmp" + 39 BITMAP "res/default/Hearts_King.bmp" + 40 BITMAP "res/default/Spades_Ace.bmp" + 41 BITMAP "res/default/Spades_Two.bmp" + 42 BITMAP "res/default/Spades_Three.bmp" + 43 BITMAP "res/default/Spades_Four.bmp" + 44 BITMAP "res/default/Spades_Five.bmp" + 45 BITMAP "res/default/Spades_Six.bmp" + 46 BITMAP "res/default/Spades_Seven.bmp" + 47 BITMAP "res/default/Spades_Eight.bmp" + 48 BITMAP "res/default/Spades_Nine.bmp" + 49 BITMAP "res/default/Spades_Ten.bmp" + 50 BITMAP "res/default/Spades_Jack.bmp" + 51 BITMAP "res/default/Spades_Queen.bmp" + 52 BITMAP "res/default/Spades_King.bmp" + 53 BITMAP "res/default/FreeCard.bmp" + 54 BITMAP "res/default/Background_1.bmp" + 55 BITMAP "res/default/Background_2.bmp" + 56 BITMAP "res/default/Background_3.bmp" + 57 BITMAP "res/default/Background_4.bmp" + 58 BITMAP "res/default/Background_5.bmp" + 59 BITMAP "res/default/Background_6.bmp" + 60 BITMAP "res/default/Background_7.bmp" + 61 BITMAP "res/default/Background_8.bmp" + 62 BITMAP "res/default/Background_9.bmp" + 63 BITMAP "res/default/Background_10.bmp" + 64 BITMAP "res/default/Background_11.bmp" + 65 BITMAP "res/default/Background_12.bmp" + 66 BITMAP "res/default/Joker.bmp" + 67 BITMAP "res/default/XSign.bmp" + 68 BITMAP "res/default/OSign.bmp" + +#elif defined(CARDSTYLE_BAVARIAN) + 1 BITMAP "res/bavarian/EichelAs.bmp" + 2 BITMAP "res/bavarian/Eichel2.bmp" + 3 BITMAP "res/bavarian/Eichel3.bmp" + 4 BITMAP "res/bavarian/Eichel4.bmp" + 5 BITMAP "res/bavarian/Eichel5.bmp" + 6 BITMAP "res/bavarian/Eichel6.bmp" + 7 BITMAP "res/bavarian/Eichel7.bmp" + 8 BITMAP "res/bavarian/Eichel8.bmp" + 9 BITMAP "res/bavarian/Eichel9.bmp" + 10 BITMAP "res/bavarian/Eichel10.bmp" + 11 BITMAP "res/bavarian/EichelUnter.bmp" + 12 BITMAP "res/bavarian/EichelOber.bmp" + 13 BITMAP "res/bavarian/EichelKoenig.bmp" + 14 BITMAP "res/bavarian/SchellenAs.bmp" + 15 BITMAP "res/bavarian/Schellen2.bmp" + 16 BITMAP "res/bavarian/Schellen3.bmp" + 17 BITMAP "res/bavarian/Schellen4.bmp" + 18 BITMAP "res/bavarian/Schellen5.bmp" + 19 BITMAP "res/bavarian/Schellen6.bmp" + 20 BITMAP "res/bavarian/Schellen7.bmp" + 21 BITMAP "res/bavarian/Schellen8.bmp" + 22 BITMAP "res/bavarian/Schellen9.bmp" + 23 BITMAP "res/bavarian/Schellen10.bmp" + 24 BITMAP "res/bavarian/SchellenUnter.bmp" + 25 BITMAP "res/bavarian/SchellenOber.bmp" + 26 BITMAP "res/bavarian/SchellenKoenig.bmp" + 27 BITMAP "res/bavarian/HerzAs.bmp" + 28 BITMAP "res/bavarian/Herz2.bmp" + 29 BITMAP "res/bavarian/Herz3.bmp" + 30 BITMAP "res/bavarian/Herz4.bmp" + 31 BITMAP "res/bavarian/Herz5.bmp" + 32 BITMAP "res/bavarian/Herz6.bmp" + 33 BITMAP "res/bavarian/Herz7.bmp" + 34 BITMAP "res/bavarian/Herz8.bmp" + 35 BITMAP "res/bavarian/Herz9.bmp" + 36 BITMAP "res/bavarian/Herz10.bmp" + 37 BITMAP "res/bavarian/HerzUnter.bmp" + 38 BITMAP "res/bavarian/HerzOber.bmp" + 39 BITMAP "res/bavarian/HerzKoenig.bmp" + 40 BITMAP "res/bavarian/GrasAs.bmp" + 41 BITMAP "res/bavarian/Gras2.bmp" + 42 BITMAP "res/bavarian/Gras3.bmp" + 43 BITMAP "res/bavarian/Gras4.bmp" + 44 BITMAP "res/bavarian/Gras5.bmp" + 45 BITMAP "res/bavarian/Gras6.bmp" + 46 BITMAP "res/bavarian/Gras7.bmp" + 47 BITMAP "res/bavarian/Gras8.bmp" + 48 BITMAP "res/bavarian/Gras9.bmp" + 49 BITMAP "res/bavarian/Gras10.bmp" + 50 BITMAP "res/bavarian/GrasUnter.bmp" + 51 BITMAP "res/bavarian/GrasOber.bmp" + 52 BITMAP "res/bavarian/GrasKoenig.bmp" + 53 BITMAP "res/bavarian/FreeCard.bmp" + 54 BITMAP "res/bavarian/Ruecken.bmp" + 55 BITMAP "res/bavarian/Ruecken.bmp" + 56 BITMAP "res/bavarian/Ruecken.bmp" + 57 BITMAP "res/bavarian/Ruecken.bmp" + 58 BITMAP "res/bavarian/Ruecken.bmp" + 59 BITMAP "res/bavarian/Ruecken.bmp" + 60 BITMAP "res/bavarian/Ruecken.bmp" + 61 BITMAP "res/bavarian/Ruecken.bmp" + 62 BITMAP "res/bavarian/Ruecken.bmp" + 63 BITMAP "res/bavarian/Ruecken.bmp" + 64 BITMAP "res/bavarian/Ruecken.bmp" + 65 BITMAP "res/bavarian/Ruecken.bmp" + 66 BITMAP "res/bavarian/Joker.bmp" + 67 BITMAP "res/bavarian/XSign.bmp" + 68 BITMAP "res/bavarian/OSign.bmp" + +#else +# error No or unsupported cardstyle defined +#endif diff --git a/rosapps/cardsbav/res/Eichel10.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel10.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel10.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel10.bmp diff --git a/rosapps/cardsbav/res/Eichel2.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel2.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel2.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel2.bmp diff --git a/rosapps/cardsbav/res/Eichel3.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel3.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel3.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel3.bmp diff --git a/rosapps/cardsbav/res/Eichel4.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel4.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel4.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel4.bmp diff --git a/rosapps/cardsbav/res/Eichel5.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel5.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel5.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel5.bmp diff --git a/rosapps/cardsbav/res/Eichel6.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel6.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel6.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel6.bmp diff --git a/rosapps/cardsbav/res/Eichel7.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel7.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel7.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel7.bmp diff --git a/rosapps/cardsbav/res/Eichel8.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel8.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel8.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel8.bmp diff --git a/rosapps/cardsbav/res/Eichel9.bmp b/reactos/dll/win32/cards/res/bavarian/Eichel9.bmp similarity index 100% rename from rosapps/cardsbav/res/Eichel9.bmp rename to reactos/dll/win32/cards/res/bavarian/Eichel9.bmp diff --git a/rosapps/cardsbav/res/EichelAs.bmp b/reactos/dll/win32/cards/res/bavarian/EichelAs.bmp similarity index 100% rename from rosapps/cardsbav/res/EichelAs.bmp rename to reactos/dll/win32/cards/res/bavarian/EichelAs.bmp diff --git a/rosapps/cardsbav/res/EichelKoenig.bmp b/reactos/dll/win32/cards/res/bavarian/EichelKoenig.bmp similarity index 100% rename from rosapps/cardsbav/res/EichelKoenig.bmp rename to reactos/dll/win32/cards/res/bavarian/EichelKoenig.bmp diff --git a/rosapps/cardsbav/res/EichelOber.bmp b/reactos/dll/win32/cards/res/bavarian/EichelOber.bmp similarity index 100% rename from rosapps/cardsbav/res/EichelOber.bmp rename to reactos/dll/win32/cards/res/bavarian/EichelOber.bmp diff --git a/rosapps/cardsbav/res/EichelUnter.bmp b/reactos/dll/win32/cards/res/bavarian/EichelUnter.bmp similarity index 100% rename from rosapps/cardsbav/res/EichelUnter.bmp rename to reactos/dll/win32/cards/res/bavarian/EichelUnter.bmp diff --git a/rosapps/cardsbav/res/FreeCard.bmp b/reactos/dll/win32/cards/res/bavarian/FreeCard.bmp similarity index 100% rename from rosapps/cardsbav/res/FreeCard.bmp rename to reactos/dll/win32/cards/res/bavarian/FreeCard.bmp diff --git a/rosapps/cardsbav/res/Gras10.bmp b/reactos/dll/win32/cards/res/bavarian/Gras10.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras10.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras10.bmp diff --git a/rosapps/cardsbav/res/Gras2.bmp b/reactos/dll/win32/cards/res/bavarian/Gras2.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras2.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras2.bmp diff --git a/rosapps/cardsbav/res/Gras3.bmp b/reactos/dll/win32/cards/res/bavarian/Gras3.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras3.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras3.bmp diff --git a/rosapps/cardsbav/res/Gras4.bmp b/reactos/dll/win32/cards/res/bavarian/Gras4.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras4.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras4.bmp diff --git a/rosapps/cardsbav/res/Gras5.bmp b/reactos/dll/win32/cards/res/bavarian/Gras5.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras5.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras5.bmp diff --git a/rosapps/cardsbav/res/Gras6.bmp b/reactos/dll/win32/cards/res/bavarian/Gras6.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras6.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras6.bmp diff --git a/rosapps/cardsbav/res/Gras7.bmp b/reactos/dll/win32/cards/res/bavarian/Gras7.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras7.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras7.bmp diff --git a/rosapps/cardsbav/res/Gras8.bmp b/reactos/dll/win32/cards/res/bavarian/Gras8.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras8.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras8.bmp diff --git a/rosapps/cardsbav/res/Gras9.bmp b/reactos/dll/win32/cards/res/bavarian/Gras9.bmp similarity index 100% rename from rosapps/cardsbav/res/Gras9.bmp rename to reactos/dll/win32/cards/res/bavarian/Gras9.bmp diff --git a/rosapps/cardsbav/res/GrasAs.bmp b/reactos/dll/win32/cards/res/bavarian/GrasAs.bmp similarity index 100% rename from rosapps/cardsbav/res/GrasAs.bmp rename to reactos/dll/win32/cards/res/bavarian/GrasAs.bmp diff --git a/rosapps/cardsbav/res/GrasKoenig.bmp b/reactos/dll/win32/cards/res/bavarian/GrasKoenig.bmp similarity index 100% rename from rosapps/cardsbav/res/GrasKoenig.bmp rename to reactos/dll/win32/cards/res/bavarian/GrasKoenig.bmp diff --git a/rosapps/cardsbav/res/GrasOber.bmp b/reactos/dll/win32/cards/res/bavarian/GrasOber.bmp similarity index 100% rename from rosapps/cardsbav/res/GrasOber.bmp rename to reactos/dll/win32/cards/res/bavarian/GrasOber.bmp diff --git a/rosapps/cardsbav/res/GrasUnter.bmp b/reactos/dll/win32/cards/res/bavarian/GrasUnter.bmp similarity index 100% rename from rosapps/cardsbav/res/GrasUnter.bmp rename to reactos/dll/win32/cards/res/bavarian/GrasUnter.bmp diff --git a/rosapps/cardsbav/res/Herz10.bmp b/reactos/dll/win32/cards/res/bavarian/Herz10.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz10.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz10.bmp diff --git a/rosapps/cardsbav/res/Herz2.bmp b/reactos/dll/win32/cards/res/bavarian/Herz2.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz2.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz2.bmp diff --git a/rosapps/cardsbav/res/Herz3.bmp b/reactos/dll/win32/cards/res/bavarian/Herz3.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz3.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz3.bmp diff --git a/rosapps/cardsbav/res/Herz4.bmp b/reactos/dll/win32/cards/res/bavarian/Herz4.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz4.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz4.bmp diff --git a/rosapps/cardsbav/res/Herz5.bmp b/reactos/dll/win32/cards/res/bavarian/Herz5.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz5.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz5.bmp diff --git a/rosapps/cardsbav/res/Herz6.bmp b/reactos/dll/win32/cards/res/bavarian/Herz6.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz6.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz6.bmp diff --git a/rosapps/cardsbav/res/Herz7.bmp b/reactos/dll/win32/cards/res/bavarian/Herz7.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz7.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz7.bmp diff --git a/rosapps/cardsbav/res/Herz8.bmp b/reactos/dll/win32/cards/res/bavarian/Herz8.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz8.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz8.bmp diff --git a/rosapps/cardsbav/res/Herz9.bmp b/reactos/dll/win32/cards/res/bavarian/Herz9.bmp similarity index 100% rename from rosapps/cardsbav/res/Herz9.bmp rename to reactos/dll/win32/cards/res/bavarian/Herz9.bmp diff --git a/rosapps/cardsbav/res/HerzAs.bmp b/reactos/dll/win32/cards/res/bavarian/HerzAs.bmp similarity index 100% rename from rosapps/cardsbav/res/HerzAs.bmp rename to reactos/dll/win32/cards/res/bavarian/HerzAs.bmp diff --git a/rosapps/cardsbav/res/HerzKoenig.bmp b/reactos/dll/win32/cards/res/bavarian/HerzKoenig.bmp similarity index 100% rename from rosapps/cardsbav/res/HerzKoenig.bmp rename to reactos/dll/win32/cards/res/bavarian/HerzKoenig.bmp diff --git a/rosapps/cardsbav/res/HerzOber.bmp b/reactos/dll/win32/cards/res/bavarian/HerzOber.bmp similarity index 100% rename from rosapps/cardsbav/res/HerzOber.bmp rename to reactos/dll/win32/cards/res/bavarian/HerzOber.bmp diff --git a/rosapps/cardsbav/res/HerzUnter.bmp b/reactos/dll/win32/cards/res/bavarian/HerzUnter.bmp similarity index 100% rename from rosapps/cardsbav/res/HerzUnter.bmp rename to reactos/dll/win32/cards/res/bavarian/HerzUnter.bmp diff --git a/rosapps/cardsbav/res/Joker.bmp b/reactos/dll/win32/cards/res/bavarian/Joker.bmp similarity index 100% rename from rosapps/cardsbav/res/Joker.bmp rename to reactos/dll/win32/cards/res/bavarian/Joker.bmp diff --git a/rosapps/cardsbav/res/OSign.bmp b/reactos/dll/win32/cards/res/bavarian/OSign.bmp similarity index 100% rename from rosapps/cardsbav/res/OSign.bmp rename to reactos/dll/win32/cards/res/bavarian/OSign.bmp diff --git a/rosapps/cardsbav/res/Ruecken.bmp b/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp similarity index 100% rename from rosapps/cardsbav/res/Ruecken.bmp rename to reactos/dll/win32/cards/res/bavarian/Ruecken.bmp diff --git a/rosapps/cardsbav/res/Schellen10.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen10.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen10.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen10.bmp diff --git a/rosapps/cardsbav/res/Schellen2.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen2.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen2.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen2.bmp diff --git a/rosapps/cardsbav/res/Schellen3.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen3.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen3.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen3.bmp diff --git a/rosapps/cardsbav/res/Schellen4.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen4.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen4.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen4.bmp diff --git a/rosapps/cardsbav/res/Schellen5.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen5.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen5.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen5.bmp diff --git a/rosapps/cardsbav/res/Schellen6.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen6.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen6.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen6.bmp diff --git a/rosapps/cardsbav/res/Schellen7.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen7.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen7.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen7.bmp diff --git a/rosapps/cardsbav/res/Schellen8.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen8.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen8.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen8.bmp diff --git a/rosapps/cardsbav/res/Schellen9.bmp b/reactos/dll/win32/cards/res/bavarian/Schellen9.bmp similarity index 100% rename from rosapps/cardsbav/res/Schellen9.bmp rename to reactos/dll/win32/cards/res/bavarian/Schellen9.bmp diff --git a/rosapps/cardsbav/res/SchellenAs.bmp b/reactos/dll/win32/cards/res/bavarian/SchellenAs.bmp similarity index 100% rename from rosapps/cardsbav/res/SchellenAs.bmp rename to reactos/dll/win32/cards/res/bavarian/SchellenAs.bmp diff --git a/rosapps/cardsbav/res/SchellenKoenig.bmp b/reactos/dll/win32/cards/res/bavarian/SchellenKoenig.bmp similarity index 100% rename from rosapps/cardsbav/res/SchellenKoenig.bmp rename to reactos/dll/win32/cards/res/bavarian/SchellenKoenig.bmp diff --git a/rosapps/cardsbav/res/SchellenOber.bmp b/reactos/dll/win32/cards/res/bavarian/SchellenOber.bmp similarity index 100% rename from rosapps/cardsbav/res/SchellenOber.bmp rename to reactos/dll/win32/cards/res/bavarian/SchellenOber.bmp diff --git a/rosapps/cardsbav/res/SchellenUnter.bmp b/reactos/dll/win32/cards/res/bavarian/SchellenUnter.bmp similarity index 100% rename from rosapps/cardsbav/res/SchellenUnter.bmp rename to reactos/dll/win32/cards/res/bavarian/SchellenUnter.bmp diff --git a/rosapps/cardsbav/res/XSign.bmp b/reactos/dll/win32/cards/res/bavarian/XSign.bmp similarity index 100% rename from rosapps/cardsbav/res/XSign.bmp rename to reactos/dll/win32/cards/res/bavarian/XSign.bmp diff --git a/reactos/dll/win32/cards/res/Background_1.bmp b/reactos/dll/win32/cards/res/default/Background_1.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_1.bmp rename to reactos/dll/win32/cards/res/default/Background_1.bmp diff --git a/reactos/dll/win32/cards/res/Background_10.bmp b/reactos/dll/win32/cards/res/default/Background_10.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_10.bmp rename to reactos/dll/win32/cards/res/default/Background_10.bmp diff --git a/reactos/dll/win32/cards/res/Background_11.bmp b/reactos/dll/win32/cards/res/default/Background_11.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_11.bmp rename to reactos/dll/win32/cards/res/default/Background_11.bmp diff --git a/reactos/dll/win32/cards/res/Background_12.bmp b/reactos/dll/win32/cards/res/default/Background_12.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_12.bmp rename to reactos/dll/win32/cards/res/default/Background_12.bmp diff --git a/reactos/dll/win32/cards/res/Background_2.bmp b/reactos/dll/win32/cards/res/default/Background_2.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_2.bmp rename to reactos/dll/win32/cards/res/default/Background_2.bmp diff --git a/reactos/dll/win32/cards/res/Background_3.bmp b/reactos/dll/win32/cards/res/default/Background_3.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_3.bmp rename to reactos/dll/win32/cards/res/default/Background_3.bmp diff --git a/reactos/dll/win32/cards/res/Background_4.bmp b/reactos/dll/win32/cards/res/default/Background_4.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_4.bmp rename to reactos/dll/win32/cards/res/default/Background_4.bmp diff --git a/reactos/dll/win32/cards/res/Background_5.bmp b/reactos/dll/win32/cards/res/default/Background_5.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_5.bmp rename to reactos/dll/win32/cards/res/default/Background_5.bmp diff --git a/reactos/dll/win32/cards/res/Background_6.bmp b/reactos/dll/win32/cards/res/default/Background_6.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_6.bmp rename to reactos/dll/win32/cards/res/default/Background_6.bmp diff --git a/reactos/dll/win32/cards/res/Background_7.bmp b/reactos/dll/win32/cards/res/default/Background_7.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_7.bmp rename to reactos/dll/win32/cards/res/default/Background_7.bmp diff --git a/reactos/dll/win32/cards/res/Background_8.bmp b/reactos/dll/win32/cards/res/default/Background_8.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_8.bmp rename to reactos/dll/win32/cards/res/default/Background_8.bmp diff --git a/reactos/dll/win32/cards/res/Background_9.bmp b/reactos/dll/win32/cards/res/default/Background_9.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Background_9.bmp rename to reactos/dll/win32/cards/res/default/Background_9.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Ace.bmp b/reactos/dll/win32/cards/res/default/Clubs_Ace.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Ace.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Ace.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Eight.bmp b/reactos/dll/win32/cards/res/default/Clubs_Eight.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Eight.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Eight.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Five.bmp b/reactos/dll/win32/cards/res/default/Clubs_Five.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Five.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Five.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Four.bmp b/reactos/dll/win32/cards/res/default/Clubs_Four.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Four.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Four.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Jack.bmp b/reactos/dll/win32/cards/res/default/Clubs_Jack.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Jack.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Jack.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_King.bmp b/reactos/dll/win32/cards/res/default/Clubs_King.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_King.bmp rename to reactos/dll/win32/cards/res/default/Clubs_King.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Nine.bmp b/reactos/dll/win32/cards/res/default/Clubs_Nine.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Nine.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Nine.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Queen.bmp b/reactos/dll/win32/cards/res/default/Clubs_Queen.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Queen.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Queen.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Seven.bmp b/reactos/dll/win32/cards/res/default/Clubs_Seven.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Seven.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Seven.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Six.bmp b/reactos/dll/win32/cards/res/default/Clubs_Six.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Six.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Six.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Ten.bmp b/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Ten.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Ten.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Three.bmp b/reactos/dll/win32/cards/res/default/Clubs_Three.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Three.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Three.bmp diff --git a/reactos/dll/win32/cards/res/Clubs_Two.bmp b/reactos/dll/win32/cards/res/default/Clubs_Two.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Clubs_Two.bmp rename to reactos/dll/win32/cards/res/default/Clubs_Two.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Ace.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Ace.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Eight.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Eight.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Five.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Five.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Five.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Five.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Four.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Four.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Four.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Four.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Jack.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Jack.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_King.bmp b/reactos/dll/win32/cards/res/default/Diamonds_King.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_King.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_King.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Nine.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Nine.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Queen.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Queen.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Seven.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Seven.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Six.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Six.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Six.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Six.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Ten.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Ten.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Three.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Three.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Three.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Three.bmp diff --git a/reactos/dll/win32/cards/res/Diamonds_Two.bmp b/reactos/dll/win32/cards/res/default/Diamonds_Two.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Diamonds_Two.bmp rename to reactos/dll/win32/cards/res/default/Diamonds_Two.bmp diff --git a/reactos/dll/win32/cards/res/FreeCard.bmp b/reactos/dll/win32/cards/res/default/FreeCard.bmp similarity index 100% rename from reactos/dll/win32/cards/res/FreeCard.bmp rename to reactos/dll/win32/cards/res/default/FreeCard.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Ace.bmp b/reactos/dll/win32/cards/res/default/Hearts_Ace.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Ace.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Ace.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Eight.bmp b/reactos/dll/win32/cards/res/default/Hearts_Eight.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Eight.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Eight.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Five.bmp b/reactos/dll/win32/cards/res/default/Hearts_Five.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Five.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Five.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Four.bmp b/reactos/dll/win32/cards/res/default/Hearts_Four.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Four.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Four.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Jack.bmp b/reactos/dll/win32/cards/res/default/Hearts_Jack.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Jack.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Jack.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_King.bmp b/reactos/dll/win32/cards/res/default/Hearts_King.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_King.bmp rename to reactos/dll/win32/cards/res/default/Hearts_King.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Nine.bmp b/reactos/dll/win32/cards/res/default/Hearts_Nine.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Nine.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Nine.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Queen.bmp b/reactos/dll/win32/cards/res/default/Hearts_Queen.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Queen.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Queen.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Seven.bmp b/reactos/dll/win32/cards/res/default/Hearts_Seven.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Seven.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Seven.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Six.bmp b/reactos/dll/win32/cards/res/default/Hearts_Six.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Six.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Six.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Ten.bmp b/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Ten.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Ten.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Three.bmp b/reactos/dll/win32/cards/res/default/Hearts_Three.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Three.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Three.bmp diff --git a/reactos/dll/win32/cards/res/Hearts_Two.bmp b/reactos/dll/win32/cards/res/default/Hearts_Two.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Hearts_Two.bmp rename to reactos/dll/win32/cards/res/default/Hearts_Two.bmp diff --git a/reactos/dll/win32/cards/res/Joker.bmp b/reactos/dll/win32/cards/res/default/Joker.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Joker.bmp rename to reactos/dll/win32/cards/res/default/Joker.bmp diff --git a/reactos/dll/win32/cards/res/OSign.bmp b/reactos/dll/win32/cards/res/default/OSign.bmp similarity index 100% rename from reactos/dll/win32/cards/res/OSign.bmp rename to reactos/dll/win32/cards/res/default/OSign.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Ace.bmp b/reactos/dll/win32/cards/res/default/Spades_Ace.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Ace.bmp rename to reactos/dll/win32/cards/res/default/Spades_Ace.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Eight.bmp b/reactos/dll/win32/cards/res/default/Spades_Eight.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Eight.bmp rename to reactos/dll/win32/cards/res/default/Spades_Eight.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Five.bmp b/reactos/dll/win32/cards/res/default/Spades_Five.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Five.bmp rename to reactos/dll/win32/cards/res/default/Spades_Five.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Four.bmp b/reactos/dll/win32/cards/res/default/Spades_Four.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Four.bmp rename to reactos/dll/win32/cards/res/default/Spades_Four.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Jack.bmp b/reactos/dll/win32/cards/res/default/Spades_Jack.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Jack.bmp rename to reactos/dll/win32/cards/res/default/Spades_Jack.bmp diff --git a/reactos/dll/win32/cards/res/Spades_King.bmp b/reactos/dll/win32/cards/res/default/Spades_King.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_King.bmp rename to reactos/dll/win32/cards/res/default/Spades_King.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Nine.bmp b/reactos/dll/win32/cards/res/default/Spades_Nine.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Nine.bmp rename to reactos/dll/win32/cards/res/default/Spades_Nine.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Queen.bmp b/reactos/dll/win32/cards/res/default/Spades_Queen.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Queen.bmp rename to reactos/dll/win32/cards/res/default/Spades_Queen.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Seven.bmp b/reactos/dll/win32/cards/res/default/Spades_Seven.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Seven.bmp rename to reactos/dll/win32/cards/res/default/Spades_Seven.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Six.bmp b/reactos/dll/win32/cards/res/default/Spades_Six.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Six.bmp rename to reactos/dll/win32/cards/res/default/Spades_Six.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Ten.bmp b/reactos/dll/win32/cards/res/default/Spades_Ten.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Ten.bmp rename to reactos/dll/win32/cards/res/default/Spades_Ten.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Three.bmp b/reactos/dll/win32/cards/res/default/Spades_Three.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Three.bmp rename to reactos/dll/win32/cards/res/default/Spades_Three.bmp diff --git a/reactos/dll/win32/cards/res/Spades_Two.bmp b/reactos/dll/win32/cards/res/default/Spades_Two.bmp similarity index 100% rename from reactos/dll/win32/cards/res/Spades_Two.bmp rename to reactos/dll/win32/cards/res/default/Spades_Two.bmp diff --git a/reactos/dll/win32/cards/res/XSign.bmp b/reactos/dll/win32/cards/res/default/XSign.bmp similarity index 100% rename from reactos/dll/win32/cards/res/XSign.bmp rename to reactos/dll/win32/cards/res/default/XSign.bmp diff --git a/rosapps/cardsbav/cardsbav.c b/rosapps/cardsbav/cardsbav.c deleted file mode 100644 index ae61200a53a..00000000000 --- a/rosapps/cardsbav/cardsbav.c +++ /dev/null @@ -1,249 +0,0 @@ -/* - * ReactOS Bavarian Cards - * - * Copyright (C) 2007 Filip Navara - * Daniel Reimer - * - * 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 - -#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; -} diff --git a/rosapps/cardsbav/cardsbav.def b/rosapps/cardsbav/cardsbav.def deleted file mode 100644 index 100243359c8..00000000000 --- a/rosapps/cardsbav/cardsbav.def +++ /dev/null @@ -1,8 +0,0 @@ -LIBRARY cardsbav.dll -EXPORTS -WEP -cdtAnimate -cdtDraw -cdtDrawExt -cdtInit -cdtTerm diff --git a/rosapps/cardsbav/cardsbav.h b/rosapps/cardsbav/cardsbav.h deleted file mode 100644 index d5a4baedf64..00000000000 --- a/rosapps/cardsbav/cardsbav.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * ReactOS Bavarian Cards - * - * Copyright (C) 2007 Filip Navara - * Daniel Reimer - * - * 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 - -#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 */ diff --git a/rosapps/cardsbav/cardsbav.rbuild b/rosapps/cardsbav/cardsbav.rbuild deleted file mode 100644 index 955fa53de43..00000000000 --- a/rosapps/cardsbav/cardsbav.rbuild +++ /dev/null @@ -1,10 +0,0 @@ - - - . - - kernel32 - gdi32 - user32 - cardsbav.c - cardsbav.rc - diff --git a/rosapps/cardsbav/cardsbav.rc b/rosapps/cardsbav/cardsbav.rc deleted file mode 100644 index 1ce2386afc3..00000000000 --- a/rosapps/cardsbav/cardsbav.rc +++ /dev/null @@ -1,99 +0,0 @@ -/* - * ReactOS Bavarian Cards - * - * Copyright (C) 2007 Filip Navara - * Daniel Reimer - * - * 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 - -#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 - -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" diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild index 87959c5c86b..014bca23fad 100644 --- a/rosapps/directory.rbuild +++ b/rosapps/directory.rbuild @@ -7,10 +7,6 @@ --> - - - -