From e87cb26ad8a37b652db1a597c5bfbddceaadbe94 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 26 Jul 2011 21:44:53 +0000 Subject: [PATCH] [MSPAINT] * Introduce a PCH. * Fix Brush function declaration. svn path=/trunk/; revision=52901 --- .../base/applications/mspaint/CMakeLists.txt | 1 + reactos/base/applications/mspaint/dialogs.c | 5 +---- reactos/base/applications/mspaint/dib.c | 2 +- reactos/base/applications/mspaint/drawing.c | 2 +- reactos/base/applications/mspaint/drawing.h | 2 +- reactos/base/applications/mspaint/history.c | 5 +---- reactos/base/applications/mspaint/main.c | 20 +------------------ reactos/base/applications/mspaint/mouse.c | 5 +---- reactos/base/applications/mspaint/palette.c | 3 +-- reactos/base/applications/mspaint/precomp.h | 20 +++++++++++++++++++ reactos/base/applications/mspaint/registry.c | 3 +-- reactos/base/applications/mspaint/selection.c | 9 +-------- reactos/base/applications/mspaint/sizebox.c | 6 +----- .../base/applications/mspaint/toolsettings.c | 6 +----- reactos/base/applications/mspaint/winproc.c | 13 +----------- 15 files changed, 34 insertions(+), 68 deletions(-) create mode 100644 reactos/base/applications/mspaint/precomp.h diff --git a/reactos/base/applications/mspaint/CMakeLists.txt b/reactos/base/applications/mspaint/CMakeLists.txt index dee6aa9f405..38f0cc35de3 100644 --- a/reactos/base/applications/mspaint/CMakeLists.txt +++ b/reactos/base/applications/mspaint/CMakeLists.txt @@ -17,5 +17,6 @@ add_executable(mspaint rsrc.rc) set_module_type(mspaint win32gui) +add_pch(mspaint precomp.h) add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all) diff --git a/reactos/base/applications/mspaint/dialogs.c b/reactos/base/applications/mspaint/dialogs.c index bf3111b1bb7..0e843c5f7c2 100644 --- a/reactos/base/applications/mspaint/dialogs.c +++ b/reactos/base/applications/mspaint/dialogs.c @@ -8,10 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include -#include "definitions.h" -#include "globalvar.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/dib.c b/reactos/base/applications/mspaint/dib.c index 7c58f43c92d..4c1eaec7a2b 100644 --- a/reactos/base/applications/mspaint/dib.c +++ b/reactos/base/applications/mspaint/dib.c @@ -8,7 +8,7 @@ /* INCLUDES *********************************************************/ -#include +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/drawing.c b/reactos/base/applications/mspaint/drawing.c index e87b9bfe6ba..7a957baddf1 100644 --- a/reactos/base/applications/mspaint/drawing.c +++ b/reactos/base/applications/mspaint/drawing.c @@ -8,7 +8,7 @@ /* INCLUDES *********************************************************/ -#include +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/drawing.h b/reactos/base/applications/mspaint/drawing.h index b9f23ad4196..2c39ee9538d 100644 --- a/reactos/base/applications/mspaint/drawing.h +++ b/reactos/base/applications/mspaint/drawing.h @@ -26,7 +26,7 @@ void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF void Airbrush(HDC hdc, LONG x, LONG y, COLORREF color, LONG r); -void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, int style); +void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, COLORREF style); void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); diff --git a/reactos/base/applications/mspaint/history.c b/reactos/base/applications/mspaint/history.c index e105dab0f0d..daf526c977d 100644 --- a/reactos/base/applications/mspaint/history.c +++ b/reactos/base/applications/mspaint/history.c @@ -8,10 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include "globalvar.h" -#include "dib.h" -#include "definitions.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/main.c b/reactos/base/applications/mspaint/main.c index a103af9932c..cf15d3235fd 100644 --- a/reactos/base/applications/mspaint/main.c +++ b/reactos/base/applications/mspaint/main.c @@ -8,25 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include -#include -#include -#include -#include "definitions.h" - -#include "drawing.h" -#include "dib.h" - -#include "globalvar.h" -#include "history.h" -#include "mouse.h" - -#include "winproc.h" -#include "palette.h" -#include "toolsettings.h" -#include "selection.h" -#include "sizebox.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/mouse.c b/reactos/base/applications/mspaint/mouse.c index 26d3ffb5a96..84909fb1f9b 100644 --- a/reactos/base/applications/mspaint/mouse.c +++ b/reactos/base/applications/mspaint/mouse.c @@ -8,10 +8,7 @@ /* INCLUDES *********************************************************/ -#include "globalvar.h" -#include "dib.h" -#include "drawing.h" -#include "history.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/palette.c b/reactos/base/applications/mspaint/palette.c index cc68516e2a3..2626971ec5a 100644 --- a/reactos/base/applications/mspaint/palette.c +++ b/reactos/base/applications/mspaint/palette.c @@ -8,8 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include "globalvar.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/precomp.h b/reactos/base/applications/mspaint/precomp.h new file mode 100644 index 00000000000..cce714ad707 --- /dev/null +++ b/reactos/base/applications/mspaint/precomp.h @@ -0,0 +1,20 @@ + +#include +#include +#include +#include +#include + +#include "definitions.h" +#include "drawing.h" +#include "dib.h" +#include "globalvar.h" +#include "history.h" +#include "mouse.h" +#include "winproc.h" +#include "palette.h" +#include "toolsettings.h" +#include "selection.h" +#include "sizebox.h" +#include "dialogs.h" +#include "registry.h" \ No newline at end of file diff --git a/reactos/base/applications/mspaint/registry.c b/reactos/base/applications/mspaint/registry.c index 6f4e8e53a64..9da17c9a3f7 100644 --- a/reactos/base/applications/mspaint/registry.c +++ b/reactos/base/applications/mspaint/registry.c @@ -8,8 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/selection.c b/reactos/base/applications/mspaint/selection.c index 03d7a18f75b..8a77b51c9f6 100644 --- a/reactos/base/applications/mspaint/selection.c +++ b/reactos/base/applications/mspaint/selection.c @@ -8,14 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include -#include -#include "globalvar.h" -#include "drawing.h" -#include "history.h" -#include "mouse.h" -#include "dib.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/sizebox.c b/reactos/base/applications/mspaint/sizebox.c index 9fa05ec8bed..728bd63a47f 100644 --- a/reactos/base/applications/mspaint/sizebox.c +++ b/reactos/base/applications/mspaint/sizebox.c @@ -8,11 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include -#include -#include "globalvar.h" -#include "history.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/toolsettings.c b/reactos/base/applications/mspaint/toolsettings.c index 2e5cd67661d..2ba81c7e68d 100644 --- a/reactos/base/applications/mspaint/toolsettings.c +++ b/reactos/base/applications/mspaint/toolsettings.c @@ -8,11 +8,7 @@ /* INCLUDES *********************************************************/ -#include -#include -#include "globalvar.h" -#include "drawing.h" -#include "winproc.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/ diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c index 8184302013f..391107499b7 100644 --- a/reactos/base/applications/mspaint/winproc.c +++ b/reactos/base/applications/mspaint/winproc.c @@ -9,19 +9,8 @@ /* INCLUDES *********************************************************/ -#include -#include //#include -#include -#include -#include "definitions.h" -#include "globalvar.h" -#include "dialogs.h" -#include "dib.h" -#include "drawing.h" -#include "history.h" -#include "mouse.h" -#include "registry.h" +#include "precomp.h" /* FUNCTIONS ********************************************************/