[TASKMGR]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61601

diff --git a/reactos/base/applications/taskmgr/dbgchnl.c b/reactos/base/applications/taskmgr/dbgchnl.c
index 2473abd..e6231bd 100644 (file)
--- a/reactos/base/applications/taskmgr/dbgchnl.c
+++ b/reactos/base/applications/taskmgr/dbgchnl.c
@@ -22,6 +22,8 @@
 
 #include "precomp.h"
 
+#include <stdio.h>
+
 /* TODO:
  *      - the dialog box could be non modal
  *      - in that case,

diff --git a/reactos/base/applications/taskmgr/graphctl.c b/reactos/base/applications/taskmgr/graphctl.c
index 0725d3b..177cd0e 100644 (file)
--- a/reactos/base/applications/taskmgr/graphctl.c
+++ b/reactos/base/applications/taskmgr/graphctl.c
@@ -22,6 +22,8 @@
 
 #include "precomp.h"
 
+#include <math.h>
+
 WNDPROC OldGraphCtrlWndProc;
 
 static void GraphCtrl_Init(TGraphCtrl* this)

diff --git a/reactos/base/applications/taskmgr/perfdata.c b/reactos/base/applications/taskmgr/perfdata.c
index f8ed0f1..ac23b16 100644 (file)
--- a/reactos/base/applications/taskmgr/perfdata.c
+++ b/reactos/base/applications/taskmgr/perfdata.c
@@ -22,6 +22,12 @@
 
 #include "precomp.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <aclapi.h>
+
+#define NTOS_MODE_USER
+#include <ndk/exfuncs.h>
+
 CRITICAL_SECTION                           PerfDataCriticalSection;
 PPERFDATA                                  pPerfDataOld = NULL;    /* Older perf data (saved to establish delta values) */
 PPERFDATA                                  pPerfData = NULL;    /* Most recent copy of perf data */

diff --git a/reactos/base/applications/taskmgr/precomp.h b/reactos/base/applications/taskmgr/precomp.h
index 2ed0c2a..d99e58f 100644 (file)
--- a/reactos/base/applications/taskmgr/precomp.h
+++ b/reactos/base/applications/taskmgr/precomp.h
@@ -5,37 +5,29 @@
 #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled!
 #endif
 
-#include <math.h>
 #include <stdlib.h>
-#include <stdio.h>
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
 
 #include <windef.h>
 #include <winbase.h>
-#define NTOS_MODE_USER
-#include <ndk/exfuncs.h>
-#include <aclapi.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winreg.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "column.h"
 #include "taskmgr.h"
 #include "perfdata.h"
-#include "perfpage.h"
-#include "about.h"
 #include "procpage.h"
-#include "proclist.h"
-#include "affinity.h"
 #include "applpage.h"
 #include "dbgchnl.h"
-#include "debug.h"
 #include "endproc.h"
 #include "graph.h"
 #include "graphctl.h"
 #include "optnmenu.h"
-#include "priority.h"
 #include "run.h"
 #include "trayicon.h"
 

diff --git a/reactos/base/applications/taskmgr/proclist.c b/reactos/base/applications/taskmgr/proclist.c
index bc8f1e5..b8754be 100644 (file)
--- a/reactos/base/applications/taskmgr/proclist.c
+++ b/reactos/base/applications/taskmgr/proclist.c
@@ -22,7 +22,6 @@
 
 #include "precomp.h"
 
-
 INT_PTR CALLBACK    ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 WNDPROC             OldProcessListWndProc;

diff --git a/reactos/base/applications/taskmgr/procpage.c b/reactos/base/applications/taskmgr/procpage.c
index 33ceb8c..fe85b6c 100644 (file)
--- a/reactos/base/applications/taskmgr/procpage.c
+++ b/reactos/base/applications/taskmgr/procpage.c
@@ -23,6 +23,8 @@
 
 #include "precomp.h"
 
+#include "proclist.h"
+
 #define CMP(x1, x2)\
     (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0))
 

diff --git a/reactos/base/applications/taskmgr/taskmgr.c b/reactos/base/applications/taskmgr/taskmgr.c
index c147878..23ccc39 100644 (file)
--- a/reactos/base/applications/taskmgr/taskmgr.c
+++ b/reactos/base/applications/taskmgr/taskmgr.c
@@ -23,6 +23,12 @@
 
 #include "precomp.h"
 
+#include "perfpage.h"
+#include "about.h"
+#include "affinity.h"
+#include "debug.h"
+#include "priority.h"
+
 #define STATUS_WINDOW   2001
 
 /* Global Variables: */