Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[aandrejevic] 61535: [NTVDM] Fix the interleaved shift mode. Don't halve the vertical resolution twice.
by aandrejevic＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: aandrejevic Date: Sat Jan 4 22:33:05 2014 New Revision: 61535 URL: http://svn.reactos.org/svn/reactos?rev=61535&view=rev Log: [NTVDM] Fix the interleaved shift mode. Don't halve the vertical resolution twice. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Sat Jan 4 22:33:05 2014 @@ -797,9 +797,9 @@ * then 2 bits shifted from plane 1 and 3 for the next 4 */ BYTE LowPlaneData = VgaMemory[((j / 4) % 2) * VGA_BANK_SIZE - + (Address + (j / 4)) * AddressSize]; + + (Address + (j / 8)) * AddressSize]; BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 2) * VGA_BANK_SIZE - + (Address + (j / 4)) * AddressSize]; + + (Address + (j / 8)) * AddressSize]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; @@ -1032,9 +1032,11 @@ /* Halve the vertical resolution */ Resolution.Y >>= 1; } - - /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ - Resolution.Y /= MaximumScanLine; + else + { + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine; + } /* Return the resolution */ return Resolution;

1 0

[akhaldi] 61534: [SPIDER] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Dedicated to Daniel Reimer. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:12:53 2014 New Revision: 61534 URL: http://svn.reactos.org/svn/reactos?rev=61534&view=rev Log: [SPIDER] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Dedicated to Daniel Reimer. CORE-7716 Modified: trunk/reactos/base/applications/games/spider/spider.cpp trunk/reactos/base/applications/games/spider/spider.h Modified: trunk/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Sat Jan 4 15:12:53 2014 @@ -7,6 +7,9 @@ */ #include "spider.h" + +#include <commctrl.h> +#include <tchar.h> TCHAR szHelpPath[MAX_PATH]; Modified: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] Sat Jan 4 15:12:53 2014 @@ -1,10 +1,3 @@ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> -#include <tchar.h> #include <cardlib.h> #include "resource.h"

1 0

[akhaldi] 61533: [CARDLIB] * Fix build.
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:07:36 2014 New Revision: 61533 URL: http://svn.reactos.org/svn/reactos?rev=61533&view=rev Log: [CARDLIB] * Fix build. Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] Sat Jan 4 15:07:36 2014 @@ -19,6 +19,7 @@ // count.Clear(); // +#include "cardlib.h" #include "cardcount.h" CardCount::CardCount() Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] Sat Jan 4 15:07:36 2014 @@ -5,7 +5,7 @@ // Copyright J Brown 2001 // -#include "cardstack.h" +#include "cardlib.h" Card &CardStack::operator[] (size_t index) {

1 0

[akhaldi] 61532: [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 15:01:58 2014 New Revision: 61532 URL: http://svn.reactos.org/svn/reactos?rev=61532&view=rev Log: [CARDLIB] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/lib/3rdparty/cardlib/card.h trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp trunk/reactos/lib/3rdparty/cardlib/cardbutton.h trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp trunk/reactos/lib/3rdparty/cardlib/cardcolor.h trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp trunk/reactos/lib/3rdparty/cardlib/cardcount.h trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp trunk/reactos/lib/3rdparty/cardlib/cardlib.h trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp trunk/reactos/lib/3rdparty/cardlib/cardregion.h trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp trunk/reactos/lib/3rdparty/cardlib/cardstack.h trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp trunk/reactos/lib/3rdparty/cardlib/cardwindow.h trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp trunk/reactos/lib/3rdparty/cardlib/dropzone.h trunk/reactos/lib/3rdparty/cardlib/globals.h Modified: trunk/reactos/lib/3rdparty/cardlib/card.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/card.… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/card.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/card.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -102,4 +102,4 @@ bool fFaceUp; }; -#endif +#endif /* _CARD_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbitmaps.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -5,16 +5,7 @@ // Copyright J Brown 2001 // -//#include <windows.h> -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - -#include "globals.h" -#include "cardcolor.h" +#include "cardlib.h" #ifndef __REACTOS__ #pragma comment( lib, "..\\CardLib\\cards16.lib" ) Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,16 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> -//#include <tchar.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardwindow.h" -//#include "cardbutton.h" -#include "cardcolor.h" HPALETTE UseNicePalette(HDC, HPALETTE); void RestorePalette(HDC, HPALETTE); Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -2,8 +2,6 @@ #define CARDBUTTON_INCLUDED #define MAXBUTTONTEXT 64 - -//#include "cardlib.h" class CardButton { @@ -98,4 +96,4 @@ pButtonProc ButtonCallback; }; -#endif +#endif /* CARDBUTTON_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,11 +1,8 @@ // // Colour support // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> -#include <wingdi.h> + +#include "cardlib.h" #define MakeRGB RGB Modified: trunk/reactos/lib/3rdparty/cardlib/cardcolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcolor.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcolor.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,3 +1,4 @@ +#pragma once COLORREF ColorScaleRGB( const COLORREF Col1, const COLORREF Col2, Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -18,6 +18,7 @@ // // count.Clear(); // + #include "cardcount.h" CardCount::CardCount() Modified: trunk/reactos/lib/3rdparty/cardlib/cardcount.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardc… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardcount.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardcount.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,17 +1,5 @@ #ifndef _CARDCOUNT_INCLUDED #define _CARDCOUNT_INCLUDED - -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <stdlib.h> - -#include "cardstack.h" class CardCount { @@ -36,4 +24,4 @@ //(ace,2,3,4,5,6,7,8,9,10,J,Q,K) }; -#endif +#endif /* _CARDCOUNT_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardlib.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,13 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "globals.h" void LoadCardBitmaps(void); Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -2,11 +2,13 @@ #define CARDLIB_INCLUDED #include <stdarg.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winuser.h> #define CARDLIBPROC __stdcall @@ -91,12 +93,13 @@ typedef void (CARDLIBPROC *pButtonProc) (CardButton &pButton); - -//#include "card.h" +#include "globals.h" +#include "card.h" #include "cardbutton.h" -//#include "cardstack.h" +#include "cardcolor.h" +#include "cardstack.h" #include "cardregion.h" -#include "cardcount.h" +#include "dropzone.h" #include "cardwindow.h" #ifdef _DEBUG @@ -104,5 +107,4 @@ void CardLib_SetStackClickProc(pDebugClickProc proc); #endif - -#endif +#endif /* CARDLIB_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardregion.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardregion.h" -//#include "cardwindow.h" -//#include "cardcolor.h" HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height); Modified: trunk/reactos/lib/3rdparty/cardlib/cardregion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardregion.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardregion.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,9 +1,5 @@ #ifndef CARDREGION_INCLUDED #define CARDREGION_INCLUDED - -#include "globals.h" -#include "cardstack.h" -//#include "cardlib.h" class CardWindow; @@ -215,5 +211,4 @@ HANDLE mxlock; }; -#endif - +#endif /* CARDREGION_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgndraw.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,15 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> - -//#include <stdlib.h> + #include "cardlib.h" -//#include "cardregion.h" -//#include "cardcolor.h" HPALETTE UseNicePalette(HDC hdc, HPALETTE hPalette); void PaintRect(HDC hdc, RECT *rect, COLORREF colour); Modified: trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardr… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardrgnmouse.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,17 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> + +#include "cardlib.h" #include <math.h> -//#include <stdio.h> - -#include "cardlib.h" -//#include "cardwindow.h" -//#include "cardregion.h" #if 1 #define TRACE(s) Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,12 +4,6 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> - -#include <stdlib.h> #include "cardstack.h" Modified: trunk/reactos/lib/3rdparty/cardlib/cardstack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cards… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardstack.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardstack.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -1,7 +1,5 @@ #ifndef CARDSTACK_INCLUDED #define CARDSTACK_INCLUDED - -#include "card.h" #define MAX_CARDSTACK_SIZE 128 @@ -50,4 +48,5 @@ int nNumCards; }; -#endif +#endif /* CARDSTACK_INCLUDED */ + Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,20 +4,10 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> + +#include "cardlib.h" #include <tchar.h> -//#include <stdlib.h> - -//#include "globals.h" -#include "cardlib.h" -//#include "cardbutton.h" -//#include "cardregion.h" -//#include "cardwindow.h" -#include "cardcolor.h" extern HPALETTE __holdplacepal; Modified: trunk/reactos/lib/3rdparty/cardlib/cardwindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardw… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardwindow.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardwindow.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,9 +4,6 @@ #define MAXBUTTONS 32 #define MAXCARDSTACKS 32 #define MAXDROPZONES 8 - -#include "dropzone.h" -//#include "cardlib.h" class CardRegion; class CardButton; @@ -116,5 +113,4 @@ }; - -#endif +#endif /* CARDBOARD_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/dropzone.cpp [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -4,14 +4,8 @@ // Freeware // Copyright J Brown 2001 // -//#include <windows.h> - -#define WIN32_NO_STATUS -#include <windef.h> #include "cardlib.h" -//#include "cardwindow.h" -//#include "dropzone.h" bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc) { Modified: trunk/reactos/lib/3rdparty/cardlib/dropzone.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/dropz… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/dropzone.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/dropzone.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -36,4 +36,4 @@ pDropZoneProc DropZoneCallback; }; -#endif +#endif /* DROPZONE_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/cardlib/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/globa… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/globals.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/globals.h [iso-8859-1] Sat Jan 4 15:01:58 2014 @@ -12,4 +12,4 @@ extern HPALETTE __hPalette; -#endif +#endif /* GLOBALS_INCLUDED */

1 0

[akhaldi] 61531: [CARDLIB] * Forgot this file. Fixes build.
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 14:28:53 2014 New Revision: 61531 URL: http://svn.reactos.org/svn/reactos?rev=61531&view=rev Log: [CARDLIB] * Forgot this file. Fixes build. Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.h Modified: trunk/reactos/lib/3rdparty/cardlib/cardlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardl… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardlib.h [iso-8859-1] Sat Jan 4 14:28:53 2014 @@ -1,5 +1,12 @@ #ifndef CARDLIB_INCLUDED #define CARDLIB_INCLUDED + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> #define CARDLIBPROC __stdcall

1 0

[akhaldi] 61530: [SOL] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 14:25:09 2014 New Revision: 61530 URL: http://svn.reactos.org/svn/reactos?rev=61530&view=rev Log: [SOL] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/games/solitaire/solitaire.h Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solcreate.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp [iso-8859-1] Sat Jan 4 14:25:09 2014 @@ -1,4 +1,3 @@ - #include "solitaire.h" CardRegion *pDeck; Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Sat Jan 4 14:25:09 2014 @@ -1,4 +1,3 @@ - #include "solitaire.h" #if 1 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Sat Jan 4 14:25:09 2014 @@ -1,5 +1,10 @@ - #include "solitaire.h" + +#include <winreg.h> +#include <commctrl.h> +#include <tchar.h> + +#include "resource.h" TCHAR szHelpPath[MAX_PATH]; 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] Sat Jan 4 14:25:09 2014 @@ -1,14 +1,4 @@ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <commctrl.h> -#include <tchar.h> #include <cardlib.h> - -#include "resource.h" extern CardWindow SolWnd; extern TCHAR szAppName[]; @@ -49,7 +39,6 @@ extern CardRegion *pSuitStack[]; extern CardRegion *pRowStack[]; - bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards); bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, CardStack &dragcards);

1 0

[akhaldi] 61529: [DXDIAG] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 14:13:48 2014 New Revision: 61529 URL: http://svn.reactos.org/svn/reactos?rev=61529&view=rev Log: [DXDIAG] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/dxdiag/d3dtest.c trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/input.c trunk/reactos/base/applications/dxdiag/network.c trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c Modified: trunk/reactos/base/applications/dxdiag/d3dtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/d3dtest.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/d3dtest.c [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -7,6 +7,8 @@ */ #include "precomp.h" + +#include <stdio.h> #define WIDTH 800 #define HEIGHT 600 Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -8,6 +8,7 @@ */ #include "precomp.h" + #include <d3d9.h> BOOL Modified: trunk/reactos/base/applications/dxdiag/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/i… ============================================================================== --- trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -8,6 +8,7 @@ */ #include "precomp.h" + #include <dinput.h> typedef struct Modified: trunk/reactos/base/applications/dxdiag/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/n… ============================================================================== --- trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/network.c [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -8,6 +8,8 @@ */ #include "precomp.h" + +#include <winver.h> typedef struct { Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -5,7 +5,7 @@ #define DIRECTSOUND_VERSION 0x0800 #define D3D_OVERLOADS -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -14,17 +14,13 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <winsvc.h> #include <wingdi.h> #include <winnls.h> -#include <winver.h> #include <winuser.h> -#include <mmsystem.h> #include <setupapi.h> #include <ddraw.h> #include <initguid.h> #include <devguid.h> -#include <mmreg.h> #include "resource.h" @@ -73,4 +69,5 @@ BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size); VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId); VOID EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData); -#endif + +#endif /* PRECOMP_H__ */ Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Sat Jan 4 14:13:48 2014 @@ -8,6 +8,9 @@ */ #include "precomp.h" + +#include <mmsystem.h> +#include <mmreg.h> #include <dsound.h> #if 0

1 0

[akhaldi] 61528: [CHARMAP] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 14:06:39 2014 New Revision: 61528 URL: http://svn.reactos.org/svn/reactos?rev=61528&view=rev Log: [CHARMAP] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/base/applications/charmap/settings.c Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/about.c [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -7,9 +7,7 @@ * */ - #include <precomp.h> - static INT_PTR Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -8,6 +8,9 @@ */ #include <precomp.h> + +#include <commctrl.h> +#include <richedit.h> #define ID_ABOUT 0x1 Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -8,7 +8,6 @@ */ #include <precomp.h> - static HFONT Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -8,6 +8,8 @@ */ #include <precomp.h> + +#include <stdlib.h> static const WCHAR szMapWndClass[] = L"FontMapWnd"; static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -5,14 +5,7 @@ #include <windef.h> #include <winbase.h> #include <winuser.h> -#include <winreg.h> #include <wingdi.h> -#include <windowsx.h> -#include <tchar.h> -//#include <stdio.h> -#include <stdlib.h> -#include <commctrl.h> -#include <richedit.h> #include "resource.h" Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Sat Jan 4 14:06:39 2014 @@ -9,6 +9,9 @@ #include <precomp.h> +#include <winreg.h> +#include <windowsx.h> +#include <tchar.h> const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\CharMap"); HWND hWnd;

1 0

[akhaldi] 61527: [CALC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 14:00:02 2014 New Revision: 61527 URL: http://svn.reactos.org/svn/reactos?rev=61527&view=rev Log: [CALC] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/function.c trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Sat Jan 4 14:00:02 2014 @@ -1,19 +1,13 @@ #include <stdarg.h> #include <windef.h> -#include <winbase.h> #include <winuser.h> -#include <wingdi.h> -#include <winreg.h> #include <tchar.h> -//#include <stdio.h> -//#include <string.h> #include <math.h> #include <float.h> #include <malloc.h> #ifndef DISABLE_HTMLHELP_SUPPORT #include <htmlhelp.h> #endif -#include <limits.h> /* Messages reserved for the main dialog */ #define WM_CLOSE_STATS (WM_APP+1) @@ -160,7 +154,6 @@ extern calc_t calc; -// #define CALC_E 2.7182818284590452354 #define CALC_PI_2 1.57079632679489661923 @@ -223,17 +216,11 @@ void rpn_alloc(calc_number_t *c); void rpn_free(calc_number_t *c); -// - void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base); void convert_text2number_2(calc_number_t *a); void convert_real_integer(unsigned int base); -// - INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); - -// void ConvExecute(HWND hWnd); void ConvAdjust(HWND hWnd, int n_cat); Modified: trunk/reactos/base/applications/calc/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/fun… ============================================================================== --- trunk/reactos/base/applications/calc/function.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/function.c [iso-8859-1] Sat Jan 4 14:00:02 2014 @@ -1,4 +1,6 @@ #include "calc.h" + +#include <limits.h> void apply_int_mask(calc_number_t *r) { Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat Jan 4 14:00:02 2014 @@ -1,4 +1,8 @@ #include "calc.h" + +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)

1 0

[akhaldi] 61526: [RTL] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 13:53:47 2014 New Revision: 61526 URL: http://svn.reactos.org/svn/reactos?rev=61526&view=rev Log: [RTL] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716 Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/memstream.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=61526… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Jan 4 13:53:47 2014 @@ -14,7 +14,6 @@ /* Based on Wine 1.1.26 */ -/* INCLUDES *****************************************************************/ #include <rtl.h> #define NDEBUG Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=61526&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sat Jan 4 13:53:47 2014 @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> + +#include <ndk/kdfuncs.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=61… ============================================================================== --- trunk/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/memstream.c [iso-8859-1] Sat Jan 4 13:53:47 2014 @@ -6,9 +6,6 @@ */ /* INCLUDES *******************************************************************/ - -#define COBJMACROS -#define CONST_VTABLE #include <rtl.h> Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=615… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sat Jan 4 13:53:47 2014 @@ -10,6 +10,9 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> + +#include <ndk/cmfuncs.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=61526&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Sat Jan 4 13:53:47 2014 @@ -5,8 +5,6 @@ * PURPOSE: Run-Time Libary Header * PROGRAMMER: Alex Ionescu */ - -/* INCLUDES ******************************************************************/ #ifndef RTL_H #define RTL_H @@ -23,14 +21,14 @@ #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS +#define CONST_VTABLE #include <windef.h> #include <winbase.h> #include <winreg.h> #include <objbase.h> -#include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> -#include <ndk/kdfuncs.h> #include <ndk/kefuncs.h> #include <ndk/ldrfuncs.h> #include <ndk/mmfuncs.h> @@ -44,11 +42,6 @@ /* Internal RTL header */ #include "rtlp.h" -/* PSEH Support */ -#include <pseh/pseh2.h> - -#include <intrin.h> - /* Use intrinsics for x86 and x64 */ #if defined(_M_IX86) || defined(_M_AMD64) #define InterlockedCompareExchange _InterlockedCompareExchange @@ -61,5 +54,3 @@ #endif #endif /* RTL_H */ - -/* EOF */

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014