From 58a80473462dd279d3e27aa90354d02c4492b300 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Jan 2012 12:04:05 +0100
Subject: [PATCH] taskmgr: Fix includes order and avoid tchar.h and memory.h.

---
 programs/taskmgr/about.c    | 12 +++++-------
 programs/taskmgr/affinity.c | 11 +++++------
 programs/taskmgr/applpage.c |  7 +++----
 programs/taskmgr/column.c   |  9 ++++-----
 programs/taskmgr/dbgchnl.c  | 13 ++++++-------
 programs/taskmgr/debug.c    |  7 +++----
 programs/taskmgr/endproc.c  |  9 ++++-----
 programs/taskmgr/graph.c    | 11 +++++------
 programs/taskmgr/graphctl.c | 11 ++++-------
 programs/taskmgr/optnmenu.c | 16 ++++------------
 programs/taskmgr/perfdata.c | 11 +++++------
 programs/taskmgr/perfpage.c |  9 ++++-----
 programs/taskmgr/priority.c | 11 +++++------
 programs/taskmgr/proclist.c | 12 +++++-------
 programs/taskmgr/procpage.c | 14 ++++++--------
 programs/taskmgr/run.c      | 12 +++++-------
 programs/taskmgr/taskmgr.c  |  7 +++----
 programs/taskmgr/trayicon.c |  9 ++++-----
 18 files changed, 80 insertions(+), 111 deletions(-)

diff --git a/programs/taskmgr/about.c b/programs/taskmgr/about.c
index c165f25d44b..c625139645b 100644
--- a/programs/taskmgr/about.c
+++ b/programs/taskmgr/about.c
@@ -19,16 +19,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
 #include <shellapi.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
-    
+
 #include "taskmgr.h"
 
 
diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c
index 88575d8f6cb..a3f78643309 100644
--- a/programs/taskmgr/affinity.c
+++ b/programs/taskmgr/affinity.c
@@ -20,15 +20,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
 #include <winnt.h>
-#include <stdio.h>
-    
+
 #include "wine/unicode.h"
 #include "taskmgr.h"
 #include "perfdata.h"
diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c
index 52d08f12852..d0a812a6b18 100644
--- a/programs/taskmgr/applpage.c
+++ b/programs/taskmgr/applpage.c
@@ -21,12 +21,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 
 #include "wine/unicode.h"
 #include "taskmgr.h"
diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c
index aaa604620c9..4fd02dd1ad0 100644
--- a/programs/taskmgr/column.c
+++ b/programs/taskmgr/column.c
@@ -21,13 +21,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
-    
+
 #include "wine/unicode.h"
 #include "taskmgr.h"
 #include "column.h"
diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c
index 6b7b3256d47..8ea172f1503 100644
--- a/programs/taskmgr/dbgchnl.c
+++ b/programs/taskmgr/dbgchnl.c
@@ -20,17 +20,16 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
-#include <windows.h>
+
 #include <ctype.h>
-#include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include <windows.h>
+#include <commctrl.h>
 #include <winnt.h>
 #include <dbghelp.h>
-    
+
 #include "taskmgr.h"
 #include "perfdata.h"
 #include "column.h"
diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c
index f6afd45484f..10fa912feba 100644
--- a/programs/taskmgr/debug.c
+++ b/programs/taskmgr/debug.c
@@ -21,12 +21,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
 
 #include "wine/unicode.h"
diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c
index 0095f459a98..89c2d7bf80d 100644
--- a/programs/taskmgr/endproc.c
+++ b/programs/taskmgr/endproc.c
@@ -20,13 +20,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
 
 #include "wine/unicode.h"
diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c
index bc37498e05c..859624e44e9 100644
--- a/programs/taskmgr/graph.c
+++ b/programs/taskmgr/graph.c
@@ -20,15 +20,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
-    
+
 #include "wine/unicode.h"
 #include "taskmgr.h"
 #include "perfdata.h"
diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c
index 8984784e3be..25632f88176 100644
--- a/programs/taskmgr/graphctl.c
+++ b/programs/taskmgr/graphctl.c
@@ -20,15 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN        /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
-
-#include <math.h>
 #include "graphctl.h"
 #include "taskmgr.h"
 
diff --git a/programs/taskmgr/optnmenu.c b/programs/taskmgr/optnmenu.c
index 42f34e85437..01c4deda9ad 100644
--- a/programs/taskmgr/optnmenu.c
+++ b/programs/taskmgr/optnmenu.c
@@ -19,21 +19,13 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-/*
- * options.c
- *
- * Menu item handlers for the options menu.
- */
 
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
-    
+
 #include "taskmgr.h"
 
 void TaskManager_OnOptionsAlwaysOnTop(void)
diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index 0f3bf145144..95516def297 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -19,15 +19,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
 #include <winnt.h>
+
 #include "taskmgr.h"
 #include "perfdata.h"
 
diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c
index 8d520912eb9..2d3b48594b8 100644
--- a/programs/taskmgr/perfpage.c
+++ b/programs/taskmgr/perfpage.c
@@ -20,13 +20,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-	
-#define WIN32_LEAN_AND_MEAN		/*  Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
 
 #include "wine/unicode.h"
diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c
index 49f23a2b1a2..577a1aee14d 100644
--- a/programs/taskmgr/priority.c
+++ b/programs/taskmgr/priority.c
@@ -20,15 +20,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
-    
+
 #include "wine/unicode.h"
 #include "taskmgr.h"
 #include "perfdata.h"
diff --git a/programs/taskmgr/proclist.c b/programs/taskmgr/proclist.c
index 9bb26a77446..90697a18902 100644
--- a/programs/taskmgr/proclist.c
+++ b/programs/taskmgr/proclist.c
@@ -19,16 +19,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
 #include <winnt.h>
-    
+
 #include "taskmgr.h"
 #include "perfdata.h"
 
diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c
index dce76f3d814..3161399a892 100644
--- a/programs/taskmgr/procpage.c
+++ b/programs/taskmgr/procpage.c
@@ -19,20 +19,18 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
 #include <winnt.h>
-    
+
 #include "taskmgr.h"
 #include "perfdata.h"
 #include "column.h"
-#include <ctype.h>
 
 HWND hProcessPage;                        /* Process List Property Page */
 
diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c
index ccd09ecc41e..6d24f1c745c 100644
--- a/programs/taskmgr/run.c
+++ b/programs/taskmgr/run.c
@@ -19,15 +19,13 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <tchar.h>
-#include <stdio.h>
-    
+
 #include "taskmgr.h"
 
 typedef	void (WINAPI *RUNFILEDLG)(
diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c
index b7ffd3defd9..e72e12be6ba 100644
--- a/programs/taskmgr/taskmgr.c
+++ b/programs/taskmgr/taskmgr.c
@@ -21,12 +21,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
 
 #include "wine/unicode.h"
diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c
index 8ef9ed45d30..636d3bda924 100644
--- a/programs/taskmgr/trayicon.c
+++ b/programs/taskmgr/trayicon.c
@@ -19,13 +19,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-    
-#define WIN32_LEAN_AND_MEAN    /* Exclude rarely-used stuff from Windows headers */
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <windows.h>
 #include <commctrl.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <stdio.h>
 #include <winnt.h>
 #include <shellapi.h>