Mike McCormack : taskmgr: Use correct types for Win64.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jun 6 05:15:43 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 2a7dbd6740102f4eaedfb9f22f094b9a5993f3c0
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2a7dbd6740102f4eaedfb9f22f094b9a5993f3c0

Author: Mike McCormack <mike at codeweavers.com>
Date:   Tue Jun  6 14:21:44 2006 +0900

taskmgr: Use correct types for Win64.

---

 programs/taskmgr/affinity.c |    6 +++---
 programs/taskmgr/taskmgr.c  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c
index 586d383..8e94da3 100644
--- a/programs/taskmgr/affinity.c
+++ b/programs/taskmgr/affinity.c
@@ -38,9 +38,9 @@ HANDLE        hProcessAffinityHandle;
 static INT_PTR CALLBACK
 AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    DWORD    dwProcessAffinityMask = 0;
-    DWORD    dwSystemAffinityMask = 0;
-    TCHAR    strErrorText[260];
+    DWORD_PTR dwProcessAffinityMask = 0;
+    DWORD_PTR dwSystemAffinityMask = 0;
+    TCHAR     strErrorText[260];
 
     switch (message) {
     case WM_INITDIALOG:
diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c
index 53a88ee..af4d54b 100644
--- a/programs/taskmgr/taskmgr.c
+++ b/programs/taskmgr/taskmgr.c
@@ -649,7 +649,7 @@ static void TaskManager_OnTabWndSelChang
 
         if (GetMenuItemCount(hMenu) <= 4) {
             hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU));
-            InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT)hSubMenu, _T("&Windows"));
+            InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR)hSubMenu, _T("&Windows"));
             DrawMenuBar(hMainWnd);
         }
         if (TaskManagerSettings.View_LargeIcons)
@@ -696,7 +696,7 @@ static void TaskManager_OnTabWndSelChang
         hSubMenu = CreatePopupMenu();
         AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHALL, _T("&One Graph, All CPUs"));
         AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, _T("One Graph &Per CPU"));
-        AppendMenu(hViewMenu, MF_STRING|MF_POPUP, (UINT)hSubMenu, _T("&CPU History"));
+        AppendMenu(hViewMenu, MF_STRING|MF_POPUP, (UINT_PTR)hSubMenu, _T("&CPU History"));
         AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SHOWKERNELTIMES, _T("&Show Kernel Times"));
         if (TaskManagerSettings.ShowKernelTimes)
             CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_CHECKED);




More information about the wine-cvs mailing list