From 5d4d6485f2a35b1302692472e2ed1117653b19b0 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sun, 8 Jan 2006 10:09:23 +0000 Subject: [PATCH] - PCHify notepad and add missing header from regedit. svn path=/trunk/; revision=20704 --- reactos/subsys/system/notepad/dialog.c | 15 +----------- reactos/subsys/system/notepad/license.c | 7 +++--- reactos/subsys/system/notepad/main.c | 13 +--------- reactos/subsys/system/notepad/notepad.h | 15 ++++++++++++ reactos/subsys/system/notepad/notepad.xml | 1 + reactos/subsys/system/notepad/settings.c | 11 +-------- reactos/subsys/system/notepad/text.c | 9 +------ reactos/subsys/system/regedit/regedit.h | 29 +++++++++++++++++++++++ 8 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 reactos/subsys/system/notepad/notepad.h create mode 100644 reactos/subsys/system/regedit/regedit.h diff --git a/reactos/subsys/system/notepad/dialog.c b/reactos/subsys/system/notepad/dialog.c index 590ea33c611..1a2076cef30 100644 --- a/reactos/subsys/system/notepad/dialog.c +++ b/reactos/subsys/system/notepad/dialog.c @@ -20,20 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE - -#define _CRT_SECURE_NO_DEPRECATE - -#include -#include -#include -#include -#include - -#include "main.h" -#include "license.h" -#include "dialog.h" +#include static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; diff --git a/reactos/subsys/system/notepad/license.c b/reactos/subsys/system/notepad/license.c index 1fcef2336e6..bb1a8936fff 100644 --- a/reactos/subsys/system/notepad/license.c +++ b/reactos/subsys/system/notepad/license.c @@ -18,14 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include "license.h" +#include VOID WineLicense(HWND Wnd) { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->License, License->LicenseCaption, + MessageBoxA(Wnd, License->License, License->LicenseCaption, MB_ICONINFORMATION | MB_OK); } @@ -34,7 +33,7 @@ VOID WineWarranty(HWND Wnd) { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, + MessageBoxA(Wnd, License->Warranty, License->WarrantyCaption, MB_ICONEXCLAMATION | MB_OK); } diff --git a/reactos/subsys/system/notepad/main.c b/reactos/subsys/system/notepad/main.c index 27a16d4a5c1..bbe811561ea 100644 --- a/reactos/subsys/system/notepad/main.c +++ b/reactos/subsys/system/notepad/main.c @@ -22,18 +22,7 @@ * */ -#define UNICODE -#define _UNICODE - -#define _CRT_SECURE_NO_DEPRECATE - -#include -#include -#include - -#include "main.h" -#include "dialog.h" -#include "notepad_res.h" +#include NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; diff --git a/reactos/subsys/system/notepad/notepad.h b/reactos/subsys/system/notepad/notepad.h new file mode 100644 index 00000000000..b7dc0d4a167 --- /dev/null +++ b/reactos/subsys/system/notepad/notepad.h @@ -0,0 +1,15 @@ +#define UNICODE +#define _UNICODE + +#define _CRT_SECURE_NO_DEPRECATE + +#include +#include +#include +#include +#include + +#include "main.h" +#include "license.h" +#include "dialog.h" + diff --git a/reactos/subsys/system/notepad/notepad.xml b/reactos/subsys/system/notepad/notepad.xml index 8356462cddc..bde90de0727 100644 --- a/reactos/subsys/system/notepad/notepad.xml +++ b/reactos/subsys/system/notepad/notepad.xml @@ -15,4 +15,5 @@ text.c settings.c rsrc.rc + notepad.h diff --git a/reactos/subsys/system/notepad/settings.c b/reactos/subsys/system/notepad/settings.c index d05e2bfaf24..4ff3d6e1c9e 100644 --- a/reactos/subsys/system/notepad/settings.c +++ b/reactos/subsys/system/notepad/settings.c @@ -20,16 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE - -#include -#include -#include -#include -#include - -#include "main.h" +#include static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', '\\','M','i','c','r','o','s','o','f','t', diff --git a/reactos/subsys/system/notepad/text.c b/reactos/subsys/system/notepad/text.c index 43d1c6ad2f1..e230db30a50 100644 --- a/reactos/subsys/system/notepad/text.c +++ b/reactos/subsys/system/notepad/text.c @@ -20,14 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE - -#include -#include -#include -#include - -#include "main.h" +#include static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { diff --git a/reactos/subsys/system/regedit/regedit.h b/reactos/subsys/system/regedit/regedit.h new file mode 100644 index 00000000000..f035dd7e718 --- /dev/null +++ b/reactos/subsys/system/regedit/regedit.h @@ -0,0 +1,29 @@ +#ifndef _REGEDIT_H +#define _REGEDIT_H + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "main.h" +#include "regproc.h" +#include "hexedit.h" +#include "security.h" +#endif -- 2.17.1