- PCHify notepad and add missing header from regedit.

svn path=/trunk/; revision=20704

diff --git a/reactos/subsys/system/notepad/dialog.c b/reactos/subsys/system/notepad/dialog.c
index 590ea33..1a2076c 100644 (file)
--- 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 <assert.h>
-#include <stdio.h>
-#include <windows.h>
-#include <commdlg.h>
-#include <tchar.h>
-
-#include "main.h"
-#include "license.h"
-#include "dialog.h"
+#include <notepad.h>
 
 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 1fcef23..bb1a893 100644 (file)
--- 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 <windows.h>
-#include "license.h"
+#include <notepad.h>
 
 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 27a16d4..bbe8115 100644 (file)
--- 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 <windows.h>
-#include <stdio.h>
-#include <tchar.h>
-
-#include "main.h"
-#include "dialog.h"
-#include "notepad_res.h"
+#include <notepad.h>
 
 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 (file)
index 0000000..b7dc0d4
--- /dev/null
+++ b/reactos/subsys/system/notepad/notepad.h
@@ -0,0 +1,15 @@
+#define UNICODE\r
+#define _UNICODE\r
+\r
+#define _CRT_SECURE_NO_DEPRECATE\r
+\r
+#include <assert.h>\r
+#include <stdio.h>\r
+#include <windows.h>\r
+#include <commdlg.h>\r
+#include <tchar.h>\r
+\r
+#include "main.h"\r
+#include "license.h"\r
+#include "dialog.h"\r
+\r

diff --git a/reactos/subsys/system/notepad/notepad.xml b/reactos/subsys/system/notepad/notepad.xml
index 8356462..bde90de 100644 (file)
--- a/reactos/subsys/system/notepad/notepad.xml
+++ b/reactos/subsys/system/notepad/notepad.xml
@@ -15,4 +15,5 @@
        <file>text.c</file>
        <file>settings.c</file>
        <file>rsrc.rc</file>
+       <pch>notepad.h</pch>
 </module>

diff --git a/reactos/subsys/system/notepad/settings.c b/reactos/subsys/system/notepad/settings.c
index d05e2bf..4ff3d6e 100644 (file)
--- 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 <assert.h>
-#include <stdio.h>
-#include <windows.h>
-#include <commdlg.h>
-#include <tchar.h>
-
-#include "main.h"
+#include <notepad.h>
 
 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 43d1c6a..e230db3 100644 (file)
--- 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 <assert.h>
-#include <stdio.h>
-#include <windows.h>
-#include <commdlg.h>
-
-#include "main.h"
+#include <notepad.h>
 
 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 (file)
index 0000000..f035dd7
--- /dev/null
+++ b/reactos/subsys/system/regedit/regedit.h
@@ -0,0 +1,29 @@
+#ifndef _REGEDIT_H\r
+#define _REGEDIT_H\r
+\r
+#define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */\r
+#include <windows.h>\r
+#include <commctrl.h>\r
+#include <shellapi.h>\r
+#include <shlwapi.h>\r
+#include <stdlib.h>\r
+#include <tchar.h>\r
+#include <process.h>\r
+#include <stdio.h>\r
+#include <limits.h>\r
+#include <accctrl.h>\r
+#include <objbase.h>\r
+#include <basetyps.h>\r
+#include <unknwn.h>\r
+#include <aclui.h>\r
+#include <commdlg.h>\r
+#include <cderr.h>\r
+#include <ole2.h>\r
+#include <objbase.h>\r
+#include <objsel.h>\r
+#include <assert.h>\r
+#include "main.h"\r
+#include "regproc.h"\r
+#include "hexedit.h"\r
+#include "security.h"\r
+#endif\r