- PCHify notepad and add missing header from regedit. Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/license.c Modified: trunk/reactos/subsys/system/notepad/main.c Added: trunk/reactos/subsys/system/notepad/notepad.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/settings.c Modified: trunk/reactos/subsys/system/notepad/text.c Added: trunk/reactos/subsys/system/regedit/regedit.h _____
Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,21 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define UNICODE -#define _UNICODE +#include <notepad.h>
-#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" - static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 };
static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); _____
Modified: trunk/reactos/subsys/system/notepad/license.c --- trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -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 @@ { /* 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); }
_____
Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -22,19 +22,8 @@
* */
-#define UNICODE -#define _UNICODE +#include <notepad.h>
-#define _CRT_SECURE_NO_DEPRECATE - -#include <windows.h> -#include <stdio.h> -#include <tchar.h> - -#include "main.h" -#include "dialog.h" -#include "notepad_res.h" - NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING;
_____
Added: trunk/reactos/subsys/system/notepad/notepad.h --- trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,15 @@
+#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" + _____
Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:09:23 UTC (rev 20704) @@ -15,4 +15,5 @@
<file>text.c</file> <file>settings.c</file> <file>rsrc.rc</file> + <pch>notepad.h</pch> </module> _____
Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,17 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define UNICODE -#define _UNICODE +#include <notepad.h>
-#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" - static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', '\','M','i','c','r','o','s','o','f','t', '\','N','o','t','e','p','a','d',0 }; _____
Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,15 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#define UNICODE +#include <notepad.h>
-#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> - -#include "main.h" - static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { LPWSTR pszNewText; _____
Added: trunk/reactos/subsys/system/regedit/regedit.h --- trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,29 @@
+#ifndef _REGEDIT_H +#define _REGEDIT_H + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#include <windows.h> +#include <commctrl.h> +#include <shellapi.h> +#include <shlwapi.h> +#include <stdlib.h> +#include <tchar.h> +#include <process.h> +#include <stdio.h> +#include <limits.h> +#include <accctrl.h> +#include <objbase.h> +#include <basetyps.h> +#include <unknwn.h> +#include <aclui.h> +#include <commdlg.h> +#include <cderr.h> +#include <ole2.h> +#include <objbase.h> +#include <objsel.h> +#include <assert.h> +#include "main.h" +#include "regproc.h" +#include "hexedit.h" +#include "security.h" +#endif
-
ion＠svn.reactos.org