From af07a1f3d97ff48f0fb31525746bbb06c853d02b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 7 Feb 2014 17:32:20 +0000 Subject: [PATCH] [WIN32SS] * Add header guards to the main headers. CORE-7716 svn path=/trunk/; revision=62023 --- reactos/win32ss/drivers/displays/framebuf/dd.c | 2 -- reactos/win32ss/drivers/displays/framebuf/ddenable.c | 1 - reactos/win32ss/drivers/displays/framebuf_new/screen.c | 1 + reactos/win32ss/drivers/displays/vga/vgaddi.h | 5 +++++ reactos/win32ss/drivers/font/bmfd/bmfd.h | 4 ++++ reactos/win32ss/drivers/font/ftfd/ftfd.h | 4 ++++ reactos/win32ss/drivers/miniport/vbe/vbemp.h | 5 +++++ reactos/win32ss/drivers/miniport/vga_new/vga.h | 5 +++++ reactos/win32ss/gdi/gdi32/include/precomp.h | 5 ++++- reactos/win32ss/reactx/dxg/dxg_int.h | 5 +++++ reactos/win32ss/user/user32/include/user32.h | 5 +++++ 11 files changed, 38 insertions(+), 4 deletions(-) diff --git a/reactos/win32ss/drivers/displays/framebuf/dd.c b/reactos/win32ss/drivers/displays/framebuf/dd.c index 09a0e9b1684..c27b87432cc 100644 --- a/reactos/win32ss/drivers/displays/framebuf/dd.c +++ b/reactos/win32ss/drivers/displays/framebuf/dd.c @@ -22,7 +22,6 @@ #include "framebuf.h" - DWORD CALLBACK DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd) { @@ -113,4 +112,3 @@ DdCreateSurface(PDD_CREATESURFACEDATA pcsd) pcsd->ddRVal = DD_OK; return DDHAL_DRIVER_HANDLED; } - diff --git a/reactos/win32ss/drivers/displays/framebuf/ddenable.c b/reactos/win32ss/drivers/displays/framebuf/ddenable.c index 5b93b918902..964dd24eaec 100644 --- a/reactos/win32ss/drivers/displays/framebuf/ddenable.c +++ b/reactos/win32ss/drivers/displays/framebuf/ddenable.c @@ -257,4 +257,3 @@ DrvGetDirectDrawInfo( return TRUE; } - diff --git a/reactos/win32ss/drivers/displays/framebuf_new/screen.c b/reactos/win32ss/drivers/displays/framebuf_new/screen.c index a02a002930b..a4fa3d0ebf5 100644 --- a/reactos/win32ss/drivers/displays/framebuf_new/screen.c +++ b/reactos/win32ss/drivers/displays/framebuf_new/screen.c @@ -6,6 +6,7 @@ * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation * ReactOS Portable Systems Group */ + #include "driver.h" #define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE,L"System"} diff --git a/reactos/win32ss/drivers/displays/vga/vgaddi.h b/reactos/win32ss/drivers/displays/vga/vgaddi.h index e43474b24bf..e2b4ef46342 100644 --- a/reactos/win32ss/drivers/displays/vga/vgaddi.h +++ b/reactos/win32ss/drivers/displays/vga/vgaddi.h @@ -1,3 +1,6 @@ +#ifndef _VGADDI_PCH_ +#define _VGADDI_PCH_ + #define _WINBASE_ #define _WINDOWS_H #include @@ -281,3 +284,5 @@ vgaReadScan(int x, int y, int w, void *b); VOID FASTCALL vgaWriteScan(int x, int y, int w, void *b); + +#endif /* _VGADDI_PCH_ */ diff --git a/reactos/win32ss/drivers/font/bmfd/bmfd.h b/reactos/win32ss/drivers/font/bmfd/bmfd.h index ef091ca29bf..e117de802f4 100644 --- a/reactos/win32ss/drivers/font/bmfd/bmfd.h +++ b/reactos/win32ss/drivers/font/bmfd/bmfd.h @@ -5,6 +5,9 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer@reactos.org) */ +#ifndef _BMFD_PCH_ +#define _BMFD_PCH_ + #include #include #include @@ -364,3 +367,4 @@ APIENTRY BmfdDestroyFont( IN FONTOBJ *pfo); +#endif /* _BMFD_PCH_ */ diff --git a/reactos/win32ss/drivers/font/ftfd/ftfd.h b/reactos/win32ss/drivers/font/ftfd/ftfd.h index 7fdeb6373b1..3e517a7bbbf 100644 --- a/reactos/win32ss/drivers/font/ftfd/ftfd.h +++ b/reactos/win32ss/drivers/font/ftfd/ftfd.h @@ -5,6 +5,9 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer@reactos.org) */ +#ifndef _FTFD_PCH_ +#define _FTFD_PCH_ + #include #include #include @@ -148,3 +151,4 @@ FtfdQueryFontData( PVOID pv, ULONG cjSize); +#endif /* _FTFD_PCH_ */ diff --git a/reactos/win32ss/drivers/miniport/vbe/vbemp.h b/reactos/win32ss/drivers/miniport/vbe/vbemp.h index 2a1aa2b74b2..a8d1ac6a47c 100644 --- a/reactos/win32ss/drivers/miniport/vbe/vbemp.h +++ b/reactos/win32ss/drivers/miniport/vbe/vbemp.h @@ -18,6 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef _VBEMP_PCH_ +#define _VBEMP_PCH_ + /* INCLUDES *******************************************************************/ #include @@ -300,3 +303,5 @@ VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, PSTATUS_BLOCK StatusBlock); + +#endif /* _VBEMP_PCH_ */ diff --git a/reactos/win32ss/drivers/miniport/vga_new/vga.h b/reactos/win32ss/drivers/miniport/vga_new/vga.h index a30baf60f4f..446a493901c 100644 --- a/reactos/win32ss/drivers/miniport/vga_new/vga.h +++ b/reactos/win32ss/drivers/miniport/vga_new/vga.h @@ -7,6 +7,9 @@ * ReactOS Portable Systems Group */ +#ifndef _VGA_NEW_PCH_ +#define _VGA_NEW_PCH_ + #include #include #include @@ -446,3 +449,5 @@ extern VIDEO_ACCESS_RANGE VgaAccessRange[]; #define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24)) #include "vbe.h" + +#endif /* _VGA_NEW_PCH_ */ diff --git a/reactos/win32ss/gdi/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h index d3baf53a236..f31b729a5fd 100644 --- a/reactos/win32ss/gdi/gdi32/include/precomp.h +++ b/reactos/win32ss/gdi/gdi32/include/precomp.h @@ -6,6 +6,9 @@ * PROGRAMMER: Alex Ionescu (alex@relsoft.net) */ +#ifndef _GDI32_PCH_ +#define _GDI32_PCH_ + /* INCLUDES ******************************************************************/ /* Definitions */ @@ -43,4 +46,4 @@ /* Deprecated NTGDI calls which shouldn't exist */ #include -/* EOF */ +#endif /* _GDI32_PCH_ */ diff --git a/reactos/win32ss/reactx/dxg/dxg_int.h b/reactos/win32ss/reactx/dxg/dxg_int.h index aeedf33c307..4ee8afa9a1a 100644 --- a/reactos/win32ss/reactx/dxg/dxg_int.h +++ b/reactos/win32ss/reactx/dxg/dxg_int.h @@ -1,3 +1,6 @@ +#ifndef _DXG_PCH_ +#define _DXG_PCH_ + #include /* Win32 Headers */ @@ -102,3 +105,5 @@ PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); #define drvDxEngUnlockDC gpEngFuncs[DXENG_INDEX_DxEngUnlockDC] #define drvDxEngUnlockHdev gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev] #define drvDxEngLockHdev gpEngFuncs[DXENG_INDEX_DxEngLockHdev] + +#endif /* _DXG_PCH_ */ diff --git a/reactos/win32ss/user/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h index 554e4185283..3a7cdbd2283 100644 --- a/reactos/win32ss/user/user32/include/user32.h +++ b/reactos/win32ss/user/user32/include/user32.h @@ -6,6 +6,9 @@ * PROGRAMMER: Alex Ionescu (alex@relsoft.net) */ +#ifndef _USER32_PCH_ +#define _USER32_PCH_ + /* INCLUDES ******************************************************************/ /* C Headers */ @@ -54,3 +57,5 @@ /* User macros */ #include "user_x.h" + +#endif /* _USER32_PCH_ */