From 3c18dfae6fc50d0486e29d6d3518c984fbf99bc2 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 9 Jan 2004 01:45:06 +0000
Subject: [PATCH] Code cleanup for the Winelib port by Eric Pouech.

svn path=/trunk/; revision=7519
---
 rosapps/taskmgr/about.c    |   1 -
 rosapps/taskmgr/affinity.c |   2 +-
 rosapps/taskmgr/applpage.c |  11 +-
 rosapps/taskmgr/column.c   |   1 -
 rosapps/taskmgr/debug.c    |   2 +-
 rosapps/taskmgr/endproc.c  |   2 +-
 rosapps/taskmgr/font.c     |   1 -
 rosapps/taskmgr/graph.c    |   6 +-
 rosapps/taskmgr/optnmenu.c |   1 -
 rosapps/taskmgr/perfdata.c |   3 +-
 rosapps/taskmgr/priority.c |   2 +-
 rosapps/taskmgr/proclist.c |   2 +-
 rosapps/taskmgr/procpage.c |  13 +-
 rosapps/taskmgr/run.c      |   1 -
 rosapps/taskmgr/taskmgr.c  |   2 +-
 rosapps/taskmgr/taskmgr.rc | 250 +++++++++++++++++++++++++++++++++++--
 rosapps/taskmgr/trayicon.c |   2 +-
 17 files changed, 263 insertions(+), 39 deletions(-)

diff --git a/rosapps/taskmgr/about.c b/rosapps/taskmgr/about.c
index e93c1df94a2..5401e8fab58 100644
--- a/rosapps/taskmgr/about.c
+++ b/rosapps/taskmgr/about.c
@@ -27,7 +27,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/affinity.c b/rosapps/taskmgr/affinity.c
index f463baa83c9..e7cdfe26c69 100644
--- a/rosapps/taskmgr/affinity.c
+++ b/rosapps/taskmgr/affinity.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
+#include <winnt.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/applpage.c b/rosapps/taskmgr/applpage.c
index f1caa7bc669..f66dfb53993 100644
--- a/rosapps/taskmgr/applpage.c
+++ b/rosapps/taskmgr/applpage.c
@@ -27,7 +27,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 
 #include "taskmgr.h"
@@ -51,7 +50,7 @@ static int      nApplicationPageWidth;
 static int      nApplicationPageHeight;
 static HANDLE   hApplicationPageEvent = NULL;   /* When this event becomes signaled then we refresh the app list */
 static BOOL     bSortAscending = TRUE;
-void            ApplicationPageRefreshThread(void *lpParameter);
+DWORD WINAPI    ApplicationPageRefreshThread(void *lpParameter);
 BOOL CALLBACK   EnumWindowsProc(HWND hWnd, LPARAM lParam);
 void            AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung);
 void            ApplicationPageUpdate(void);
@@ -113,7 +112,7 @@ LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam,
         UpdateApplicationListControlViewSetting();
 
         /* Start our refresh thread */
-        _beginthread(ApplicationPageRefreshThread, 0, NULL);
+        CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL);
 
         return TRUE;
 
@@ -219,14 +218,14 @@ void UpdateApplicationListControlViewSetting(void)
     RefreshApplicationPage();
 }
 
-void ApplicationPageRefreshThread(void *lpParameter)
+DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter)
 {
     /* Create the event */
     hApplicationPageEvent = CreateEvent(NULL, TRUE, TRUE, _T("Application Page Event"));
 
     /* If we couldn't create the event then exit the thread */
     if (!hApplicationPageEvent)
-        return;
+        return 0;
 
     while (1)
     {
@@ -238,7 +237,7 @@ void ApplicationPageRefreshThread(void *lpParameter)
         /* If the wait failed then the event object must have been */
         /* closed and the task manager is exiting so exit this thread */
         if (dwWaitVal == WAIT_FAILED)
-            return;
+            return 0;
 
         if (dwWaitVal == WAIT_OBJECT_0)
         {
diff --git a/rosapps/taskmgr/column.c b/rosapps/taskmgr/column.c
index 0a5abeff6ac..3cad7ac160c 100644
--- a/rosapps/taskmgr/column.c
+++ b/rosapps/taskmgr/column.c
@@ -27,7 +27,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/debug.c b/rosapps/taskmgr/debug.c
index 69a963a4189..948fed4fe26 100644
--- a/rosapps/taskmgr/debug.c
+++ b/rosapps/taskmgr/debug.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "debug.h"
diff --git a/rosapps/taskmgr/endproc.c b/rosapps/taskmgr/endproc.c
index ac865304a29..da072c5eb5b 100644
--- a/rosapps/taskmgr/endproc.c
+++ b/rosapps/taskmgr/endproc.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "endproc.h"
diff --git a/rosapps/taskmgr/font.c b/rosapps/taskmgr/font.c
index 06cad5f7105..66263f1d377 100644
--- a/rosapps/taskmgr/font.c
+++ b/rosapps/taskmgr/font.c
@@ -27,7 +27,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/graph.c b/rosapps/taskmgr/graph.c
index c8768f0fb27..587cfc0a4bd 100644
--- a/rosapps/taskmgr/graph.c
+++ b/rosapps/taskmgr/graph.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "graph.h"
@@ -51,7 +51,6 @@ LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
 	switch (message)
 	{
 	case WM_ERASEBKGND:
-
 		return TRUE;
 
 	/*
@@ -330,7 +329,7 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
 	ULONGLONG		CommitChargeTotal;
 	ULONGLONG		CommitChargeLimit;
 	int				nBars;
-	int				nBarsUsed; 
+	int				nBarsUsed = 0; 
 /* Bottom bars that are "used", i.e. are bright green, representing used memory */
 	int				nBarsFree; 
 /* Top bars that are "unused", i.e. are dark green, representing free memory */
@@ -365,6 +364,7 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
 	 * So first find out how many bars we can fit
 	 */
 	nBars = ((rcClient.bottom - rcClient.top) - 25) / 3;
+        if (CommitChargeLimit)
 	nBarsUsed = (nBars * (int)((CommitChargeTotal * 100) / CommitChargeLimit)) / 100;
 	nBarsFree = nBars - nBarsUsed;
 
diff --git a/rosapps/taskmgr/optnmenu.c b/rosapps/taskmgr/optnmenu.c
index f7d605b34a6..19e208097a5 100644
--- a/rosapps/taskmgr/optnmenu.c
+++ b/rosapps/taskmgr/optnmenu.c
@@ -33,7 +33,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/perfdata.c b/rosapps/taskmgr/perfdata.c
index 58c3372b489..32a9e736f54 100644
--- a/rosapps/taskmgr/perfdata.c
+++ b/rosapps/taskmgr/perfdata.c
@@ -27,9 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
-
+#include <winnt.h>
 #include "taskmgr.h"
 #include "perfdata.h"
 
diff --git a/rosapps/taskmgr/priority.c b/rosapps/taskmgr/priority.c
index db0c869eef3..6840177b9f6 100644
--- a/rosapps/taskmgr/priority.c
+++ b/rosapps/taskmgr/priority.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "priority.h"
diff --git a/rosapps/taskmgr/proclist.c b/rosapps/taskmgr/proclist.c
index 2c5dbe2c475..d88ad1d7a5f 100644
--- a/rosapps/taskmgr/proclist.c
+++ b/rosapps/taskmgr/proclist.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "procpage.h"
diff --git a/rosapps/taskmgr/procpage.c b/rosapps/taskmgr/procpage.c
index 2489efe5417..93d82ee9c9f 100644
--- a/rosapps/taskmgr/procpage.c
+++ b/rosapps/taskmgr/procpage.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "procpage.h"
@@ -52,7 +52,7 @@ static HANDLE	hProcessPageEvent = NULL;	/* When this event becomes signaled then
 void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam);
 void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount);
 void ProcessPageShowContextMenu(DWORD dwProcessId);
-void ProcessPageRefreshThread(void *lpParameter);
+DWORD WINAPI ProcessPageRefreshThread(void *lpParameter);
 
 LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -96,7 +96,7 @@ LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
 		OldProcessListWndProc = SetWindowLong(hProcessPageListCtrl, GWL_WNDPROC, (LONG)ProcessListWndProc);
 
 		/* Start our refresh thread */
-		_beginthread(ProcessPageRefreshThread, 0, NULL);
+ 		CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL);
 
 		return TRUE;
 
@@ -491,7 +491,7 @@ void RefreshProcessPage(void)
 	SetEvent(hProcessPageEvent);
 }
 
-void ProcessPageRefreshThread(void *lpParameter)
+DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
 {
 	ULONG	OldProcessorUsage = 0;
 	ULONG	OldProcessCount = 0;
@@ -501,7 +501,7 @@ void ProcessPageRefreshThread(void *lpParameter)
 
 	/* If we couldn't create the event then exit the thread */
 	if (!hProcessPageEvent)
-		return;
+		return 0;
 
 	while (1) {
 		DWORD	dwWaitVal;
@@ -512,7 +512,7 @@ void ProcessPageRefreshThread(void *lpParameter)
 		/* If the wait failed then the event object must have been */
 		/* closed and the task manager is exiting so exit this thread */
 		if (dwWaitVal == WAIT_FAILED)
-			return;
+			return 0;
 
 		if (dwWaitVal == WAIT_OBJECT_0) {
 			TCHAR	text[260];
@@ -538,4 +538,5 @@ void ProcessPageRefreshThread(void *lpParameter)
 			}
 		}
 	}
+        return 0;
 }
diff --git a/rosapps/taskmgr/run.c b/rosapps/taskmgr/run.c
index 9135725515c..ebb146fe4f2 100644
--- a/rosapps/taskmgr/run.c
+++ b/rosapps/taskmgr/run.c
@@ -27,7 +27,6 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
 	
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/taskmgr.c b/rosapps/taskmgr/taskmgr.c
index 2301bf551b3..1ec5f1faa67 100644
--- a/rosapps/taskmgr/taskmgr.c
+++ b/rosapps/taskmgr/taskmgr.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 
 #include "resource.h"
 #include "taskmgr.h"
diff --git a/rosapps/taskmgr/taskmgr.rc b/rosapps/taskmgr/taskmgr.rc
index 563a7c3e8da..e66e0251327 100644
--- a/rosapps/taskmgr/taskmgr.rc
+++ b/rosapps/taskmgr/taskmgr.rc
@@ -198,7 +198,7 @@ IDD_TASKMGR_DIALOG DIALOG DISCARDABLE  0, 0, 264, 246
 STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
-CAPTION "ReactOS Task Manager"
+CAPTION "Task Manager"
 MENU IDR_TASKMANAGER
 FONT 8, "Tahoma"
 BEGIN
@@ -229,7 +229,7 @@ BEGIN
 END
 
 //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
-IDD_PERFORMANCE_PAGE DIALOG DISCARDABLE  0, 0, 247, 210
+IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE  0, 0, 247, 210
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "Tahoma"
 BEGIN
@@ -545,9 +545,156 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_TASKMANAGER         ICON    DISCARDABLE     "res/taskmgr.ico"
-IDI_WINDOW              ICON    DISCARDABLE     "res/window.ico"
-IDI_WINDOWSM            ICON    DISCARDABLE     "res/windowsm.ico"
+/* BINRES taskmgr.ico */
+IDI_TASKMANAGER         ICON    DISCARDABLE res/taskmgr.ico
+/* {
+ '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
+ '00 00 26 00 00 00 10 10 10 00 00 00 00 00 28 01'
+ '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00'
+ '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 FF F7 77 88 80 00 00 00 00 F7'
+ '77 77 77 80 00 00 07 77 88 88 00 00 00 00 00 F7'
+ '77 87 87 88 00 00 00 88 88 80 00 00 00 00 00 F7'
+ '77 87 87 88 80 00 00 00 00 00 00 00 00 00 00 F7'
+ '77 87 87 88 08 88 88 88 88 88 88 88 00 00 00 F7'
+ '97 87 87 80 87 77 77 77 77 77 77 77 70 00 00 F7'
+ '77 87 87 80 77 FF FF FF FF FF FF F7 70 00 00 F7'
+ '77 87 87 80 78 00 00 00 00 00 0A AF 70 00 00 F7'
+ '27 87 87 80 78 AA 00 00 00 00 A2 0F 70 00 00 F7'
+ 'A2 77 77 80 78 02 A0 0A 00 0A 20 0F 70 00 00 F7'
+ '77 77 77 80 78 00 2A A2 A0 0A 00 0F 70 00 00 F7'
+ '00 07 87 80 78 00 00 00 A0 0A 00 0F 70 00 00 F7'
+ '88 77 F7 80 78 00 08 00 2A 0A 00 0F 70 00 00 F7'
+ '77 77 77 80 78 00 8F 80 0A A2 00 0F 70 00 00 F7'
+ '77 77 77 80 78 00 08 00 02 A0 00 0F 70 00 00 F7'
+ '00 00 07 80 78 00 00 00 00 A0 00 0F 70 00 00 F7'
+ '88 88 77 80 7F 88 88 88 88 88 88 87 70 00 00 F7'
+ '77 77 77 80 FF 77 77 77 77 77 77 77 70 00 00 F7'
+ '00 00 07 88 07 FF FF FF FF FF FF FF 00 00 00 F7'
+ '88 88 77 88 80 00 00 00 00 00 00 00 00 00 00 F7'
+ '77 77 77 88 80 00 00 00 00 00 00 00 00 00 00 0F'
+ 'FF FF FF 88 80 00 00 00 00 00 00 00 00 00 00 07'
+ '77 77 77 78 80 00 00 00 00 00 00 00 00 00 00 00'
+ '77 77 77 77 80 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ '00 7F C0 3C 00 1F 80 0F 00 7F 80 07 80 FF 80 00'
+ '00 0F 80 00 00 07 80 00 00 03 80 00 00 03 80 00'
+ '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00'
+ '00 03 80 00 00 03 80 00 00 03 80 00 00 03 80 00'
+ '00 03 80 00 00 03 80 00 00 03 80 00 00 07 80 00'
+ '00 0F 80 03 FF FF 80 03 FF FF C0 03 FF FF E0 03'
+ 'FF FF F0 03 FF FF FF FF FF FF FF FF FF FF 28 00'
+ '00 00 10 00 00 00 20 00 00 00 01 00 04 00 00 00'
+ '00 00 C0 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 F8 78 80 00 0F 77'
+ '78 00 0F 78 00 00 0F 78 70 88 88 88 80 00 0F 78'
+ '70 F7 77 77 77 00 0F 78 70 F2 A0 00 A8 00 0F AF'
+ '70 F0 2A 0A 08 00 0F 77 70 F0 00 A2 08 00 0F 00'
+ '70 F0 F0 A0 08 00 0F 77 70 F8 88 88 88 00 0F 00'
+ '70 FF FF FF FF 00 0F FF F8 00 00 00 00 00 08 77'
+ '78 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 FF FF 00 00 FF 07 00 00 82 03'
+ '00 00 01 07 00 00 00 03 00 00 00 01 00 00 00 01'
+ '00 00 00 01 00 00 00 01 00 00 00 01 00 00 00 01'
+ '00 00 00 01 00 00 00 03 00 00 01 FF 00 00 81 FF'
+ '00 00 FF FF 00 00'
+} */
+
+/* BINRES window.ico */
+IDI_WINDOW              ICON    DISCARDABLE res/window.ico
+/* {
+ '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02'
+ '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
+ '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 88 88'
+ '88 88 88 88 88 88 88 88 88 88 88 88 88 80 87 77'
+ '77 77 77 77 77 77 77 77 77 77 77 77 77 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 8F'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF F7 80 87 88'
+ '88 88 88 88 88 88 88 88 88 88 88 88 87 80 87 77'
+ '77 77 77 77 77 77 77 77 77 77 77 77 77 80 87 44'
+ '44 44 44 44 44 44 44 44 40 00 00 00 00 80 87 44'
+ '44 44 44 44 44 44 44 44 47 70 77 07 70 80 87 44'
+ '44 44 44 44 44 44 44 44 47 70 77 07 70 80 87 44'
+ '44 44 44 44 44 44 44 44 44 44 44 44 44 80 87 77'
+ '77 77 77 77 77 77 77 77 77 77 77 77 77 80 88 88'
+ '88 88 88 88 88 88 88 88 88 88 88 88 88 80 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
+ 'FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF FF FF'
+} */
+
+/* BINRES windowsm.ico */
+IDI_WINDOWSM            ICON    DISCARDABLE res/windowsm.ico
+/* {
+ '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
+ '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
+ '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 88 88'
+ '88 88 88 88 88 80 87 FF FF FF FF FF FF 80 87 FF'
+ 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 FF'
+ 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 FF'
+ 'FF FF FF FF FF 80 87 FF FF FF FF FF FF 80 87 88'
+ '88 88 88 88 88 80 87 44 44 44 F0 F0 F0 80 87 44'
+ '44 44 44 44 44 80 87 77 77 77 77 77 77 80 88 88'
+ '88 88 88 88 88 88 00 00 00 00 00 00 00 00 FF FF'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 FF FF 00 00'
+} */
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
@@ -573,12 +720,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Brian Palmer\0"
-            VALUE "FileDescription", "ReactOS Task Manager by Brian Palmer\0"
+            VALUE "FileDescription", "Task Manager by Brian Palmer\0"
             VALUE "FileVersion", "1.0.0.1\0"
             VALUE "InternalName", "taskmgr\0"
             VALUE "LegalCopyright", "Copyright © Brian Palmer 2000\0"
             VALUE "OriginalFilename", "taskmgr.exe\0"
-            VALUE "ProductName", "ReactOS Task Manager by Brian Palmer\0"
+            VALUE "ProductName", "Task Manager by Brian Palmer\0"
             VALUE "ProductVersion", "1.0.0.1\0"
         END
     END
@@ -595,10 +742,93 @@ END
 //
 // Bitmap
 //
+/* BINRES traymask.bmp */
+IDB_TRAYMASK            BITMAP  DISCARDABLE res/traymask.bmp
+/* {
+ '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
+ '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 00'
+ '00 00 00 00 00 FF FF 00 00 00 00 00 00 FF FF FF'
+ 'FF FF FF FF FF FF'
+} */
+        
+/* BINRES trayicon.bmp */
+IDB_TRAYICON            BITMAP  DISCARDABLE res/trayicon.bmp
+/* {
+ '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
+ '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 8F FF FF FF FF FF 00 00 80'
+ '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80'
+ '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80'
+ '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80'
+ '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80'
+ '20 20 20 20 2F 00 00 82 22 22 22 22 2F 00 00 80'
+ '20 20 20 20 2F 00 00 88 88 88 88 88 8F 00 00 00'
+ '00 00 00 00 00 00'
+} */
 
-IDB_TRAYMASK            BITMAP  DISCARDABLE     "res/traymask.bmp"
-IDB_TRAYICON            BITMAP  DISCARDABLE     "res/trayicon.bmp"
-IDB_FONT                BITMAP  DISCARDABLE     "res/font.bmp"
+/* BINRES font.bmp */
+IDB_FONT                BITMAP  DISCARDABLE res/font.bmp
+/* {
+ '42 4D 86 02 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 60 00 00 00 0B 00 00 00 01 00 04 00 00 00'
+ '00 00 10 02 00 00 74 12 00 00 74 12 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 AA AA AA A0 00 00 0A 00 AA AA'
+ 'AA A0 AA AA AA A0 00 00 00 A0 AA AA AA A0 AA AA'
+ 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 A0 00'
+ '00 A0 00 00 00 00 A0 00 00 A0 00 00 0A 00 A0 00'
+ '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00'
+ '0A 00 00 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00'
+ '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00'
+ 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 A0 00'
+ '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 0A'
+ '00 00 0A 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00'
+ '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 A0'
+ '00 00 00 A0 00 00 A0 00 00 A0 00 00 0A 00 AA AA'
+ 'AA A0 0A AA AA A0 AA AA AA A0 AA AA AA A0 AA AA'
+ 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 AA 00'
+ '00 00 00 0A 00 00 A0 00 00 A0 00 00 0A 00 00 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00'
+ '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 A0'
+ '00 00 00 00 A0 00 A0 00 00 A0 00 00 0A 00 00 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00'
+ '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 0A'
+ '00 00 0A A0 0A 00 A0 00 00 A0 00 00 0A 00 00 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00'
+ '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00'
+ 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 00 00'
+ '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00'
+ '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00'
+ '0A 00 0A A0 00 00 AA AA AA A0 00 00 0A 00 AA AA'
+ 'AA A0 AA AA AA A0 A0 00 00 A0 AA AA AA A0 AA AA'
+ 'AA A0 AA AA AA A0 AA AA AA A0 AA AA AA A0 A0 00'
+ '00 A0 00 00 00 00'
+} */
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/rosapps/taskmgr/trayicon.c b/rosapps/taskmgr/trayicon.c
index 6330fa44713..2adc8f5dd49 100644
--- a/rosapps/taskmgr/trayicon.c
+++ b/rosapps/taskmgr/trayicon.c
@@ -27,8 +27,8 @@
 #include <malloc.h>
 #include <memory.h>
 #include <tchar.h>
-#include <process.h>
 #include <stdio.h>
+#include <winnt.h>
 	
 #include "taskmgr.h"
 #include "trayicon.h"