From b98334b9ecbc502e2cddea51124b6fc952cf43b6 Mon Sep 17 00:00:00 2001 From: Vladimir Pankratov Date: Wed, 20 Aug 2008 08:33:29 +0000 Subject: [PATCH] taskmgr: Converted some functions and variables to Unicode. --- programs/taskmgr/applpage.c | 150 +++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 73 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index 038657eb86a..f6fbf167e27 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -4,6 +4,7 @@ * applpage.c * * Copyright (C) 1999 - 2001 Brian Palmer + * Copyright (C) 2008 Vladimir Pankratov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,15 +27,15 @@ #include #include #include -#include #include +#include "wine/unicode.h" #include "taskmgr.h" typedef struct { HWND hWnd; - TCHAR szTitle[260]; + WCHAR wszTitle[256]; HICON hIcon; BOOL bHung; } APPLICATION_PAGE_LIST_ITEM, *LPAPPLICATION_PAGE_LIST_ITEM; @@ -49,6 +50,7 @@ static int nApplicationPageHeight; static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; +static const WCHAR wszUser32[] = {'U','S','E','R','3','2','.','D','L','L',0}; #if 0 void SwitchToThisWindow ( HWND hWnd, /* Handle to the window that should be activated */ @@ -113,17 +115,17 @@ static void ApplicationPageUpdate(void) } } -static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) +static void AddOrUpdateHwnd(HWND hWnd, WCHAR *wszTitle, HICON hIcon, BOOL bHung) { LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; HIMAGELIST hImageListLarge; HIMAGELIST hImageListSmall; - LV_ITEM item; + LV_ITEMW item; int i; BOOL bAlreadyInList = FALSE; BOOL bItemRemoved = FALSE; - memset(&item, 0, sizeof(LV_ITEM)); + memset(&item, 0, sizeof(LV_ITEMW)); /* Get the image lists */ hImageListLarge = ListView_GetImageList(hApplicationPageListCtrl, LVSIL_NORMAL); @@ -132,10 +134,10 @@ static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) /* Check to see if it's already in our list */ for (i=0; ihWnd == hWnd) @@ -150,20 +152,20 @@ static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) { /* Check to see if anything needs updating */ if ((pAPLI->hIcon != hIcon) || - (_tcsicmp(pAPLI->szTitle, szTitle) != 0) || + (strcmpW(pAPLI->wszTitle, wszTitle) != 0) || (pAPLI->bHung != bHung)) { /* Update the structure */ pAPLI->hIcon = hIcon; pAPLI->bHung = bHung; - _tcscpy(pAPLI->szTitle, szTitle); + strcpyW(pAPLI->wszTitle, wszTitle); /* Update the image list */ ImageList_ReplaceIcon(hImageListLarge, item.iItem, hIcon); ImageList_ReplaceIcon(hImageListSmall, item.iItem, hIcon); /* Update the list view */ - SendMessage(hApplicationPageListCtrl, LVM_REDRAWITEMS, 0, ListView_GetItemCount(hApplicationPageListCtrl)); + SendMessageW(hApplicationPageListCtrl, LVM_REDRAWITEMS, 0, ListView_GetItemCount(hApplicationPageListCtrl)); /* UpdateWindow(hApplicationPageListCtrl); */ InvalidateRect(hApplicationPageListCtrl, NULL, 0); } @@ -176,31 +178,31 @@ static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) pAPLI->hWnd = hWnd; pAPLI->hIcon = hIcon; pAPLI->bHung = bHung; - _tcscpy(pAPLI->szTitle, szTitle); + strcpyW(pAPLI->wszTitle, wszTitle); /* Add the item to the list */ - memset(&item, 0, sizeof(LV_ITEM)); + memset(&item, 0, sizeof(LV_ITEMW)); item.mask = LVIF_TEXT|LVIF_IMAGE|LVIF_PARAM; ImageList_AddIcon(hImageListLarge, hIcon); item.iImage = ImageList_AddIcon(hImageListSmall, hIcon); - item.pszText = LPSTR_TEXTCALLBACK; + item.pszText = LPSTR_TEXTCALLBACKW; item.iItem = ListView_GetItemCount(hApplicationPageListCtrl); item.lParam = (LPARAM)pAPLI; - SendMessage(hApplicationPageListCtrl, LVM_INSERTITEM, 0, (LPARAM) &item); + SendMessageW(hApplicationPageListCtrl, LVM_INSERTITEMW, 0, (LPARAM) &item); } /* Check to see if we need to remove any items from the list */ for (i=ListView_GetItemCount(hApplicationPageListCtrl)-1; i>=0; i--) { - memset(&item, 0, sizeof(LV_ITEM)); + memset(&item, 0, sizeof(LV_ITEMW)); item.mask = LVIF_IMAGE|LVIF_PARAM; item.iItem = i; - SendMessage(hApplicationPageListCtrl, LVM_GETITEM, 0, (LPARAM) &item); + SendMessageW(hApplicationPageListCtrl, LVM_GETITEMW, 0, (LPARAM) &item); pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (!IsWindow(pAPLI->hWnd)|| - (_tcslen(pAPLI->szTitle) <= 0) || + (strlenW(pAPLI->wszTitle) <= 0) || !IsWindowVisible(pAPLI->hWnd) || (GetParent(pAPLI->hWnd) != NULL) || (GetWindow(pAPLI->hWnd, GW_OWNER) != NULL) || @@ -224,11 +226,11 @@ static void AddOrUpdateHwnd(HWND hWnd, TCHAR *szTitle, HICON hIcon, BOOL bHung) { for (i=0; iszTitle, Param2->szTitle); + return strcmpW(Param1->wszTitle, Param2->wszTitle); } static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) @@ -415,14 +415,17 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) int idctrl; LPNMHDR pnmh; LPNM_LISTVIEW pnmv; - LV_DISPINFO* pnmdi; + LV_DISPINFOW* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI; + static const WCHAR wszNotResponding[] = {'N','o','t',' ','R','e','s','p','o','n','d','i','n','g',0}; + static const WCHAR wszRunning[] = {'R','u','n','n','i','n','g',0}; + idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; pnmv = (LPNM_LISTVIEW) lParam; - pnmdi = (LV_DISPINFO*) lParam; + pnmdi = (LV_DISPINFOW*) lParam; if (pnmh->hwndFrom == hApplicationPageListCtrl) { switch (pnmh->code) { @@ -430,22 +433,22 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) ApplicationPageUpdate(); break; - case LVN_GETDISPINFO: + case LVN_GETDISPINFOW: pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)pnmdi->item.lParam; /* Update the item text */ if (pnmdi->item.iSubItem == 0) { - _tcsncpy(pnmdi->item.pszText, pAPLI->szTitle, pnmdi->item.cchTextMax); + lstrcpynW(pnmdi->item.pszText, pAPLI->wszTitle, pnmdi->item.cchTextMax); } /* Update the item status */ else if (pnmdi->item.iSubItem == 1) { if (pAPLI->bHung) - _tcsncpy(pnmdi->item.pszText, _T("Not Responding"), pnmdi->item.cchTextMax); + lstrcpynW(pnmdi->item.pszText, wszNotResponding, pnmdi->item.cchTextMax); else - _tcsncpy(pnmdi->item.pszText, _T("Running"), pnmdi->item.cchTextMax); + lstrcpynW(pnmdi->item.pszText, wszRunning, pnmdi->item.cchTextMax); } break; @@ -489,7 +492,7 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) case HDN_ITEMCLICK: - SendMessage(hApplicationPageListCtrl, LVM_SORTITEMS, 0, (LPARAM) ApplicationPageCompareFunc); + SendMessageW(hApplicationPageListCtrl, LVM_SORTITEMS, 0, (LPARAM) ApplicationPageCompareFunc); bSortAscending = !bSortAscending; break; @@ -504,9 +507,12 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) RECT rc; int nXDifference; int nYDifference; - LV_COLUMN column; - TCHAR szTemp[256]; int cx, cy; + LVCOLUMNW column; + + static const WCHAR wszTasks[] = {'T','a','s','k','s',0}; + static WCHAR wszTask[] = {'T','a','s','k',0}; + static WCHAR wszStatus[] = {'S','t','a','t','u','s',0}; switch (message) { case WM_INITDIALOG: @@ -525,25 +531,23 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hApplicationPageSwitchToButton = GetDlgItem(hDlg, IDC_SWITCHTO); hApplicationPageNewTaskButton = GetDlgItem(hDlg, IDC_NEWTASK); - SetWindowText(hApplicationPageListCtrl, _T("Tasks")); + SetWindowTextW(hApplicationPageListCtrl, wszTasks); /* Initialize the application page's controls */ column.mask = LVCF_TEXT|LVCF_WIDTH; - _tcscpy(szTemp, _T("Task")); - column.pszText = szTemp; + column.pszText = wszTask; column.cx = 250; /* Add the "Task" column */ - SendMessage(hApplicationPageListCtrl, LVM_INSERTCOLUMN, 0, (LPARAM) &column); + SendMessageW(hApplicationPageListCtrl, LVM_INSERTCOLUMNW, 0, (LPARAM) &column); column.mask = LVCF_TEXT|LVCF_WIDTH; - _tcscpy(szTemp, _T("Status")); - column.pszText = szTemp; + column.pszText = wszStatus; column.cx = 95; /* Add the "Status" column */ - SendMessage(hApplicationPageListCtrl, LVM_INSERTCOLUMN, 1, (LPARAM) &column); + SendMessageW(hApplicationPageListCtrl, LVM_INSERTCOLUMNW, 1, (LPARAM) &column); - SendMessage(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_SMALL, + SendMessageW(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM) ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1)); - SendMessage(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_NORMAL, + SendMessageW(hApplicationPageListCtrl, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM) ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1)); UpdateApplicationListControlViewSetting(); @@ -571,7 +575,7 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) ApplicationPage_OnSwitchTo(); break; case IDC_NEWTASK: - SendMessage(hMainWnd, WM_COMMAND, MAKEWPARAM(ID_FILE_NEW, 0), 0); + SendMessageW(hMainWnd, WM_COMMAND, MAKEWPARAM(ID_FILE_NEW, 0), 0); break; } @@ -706,7 +710,7 @@ void ApplicationPage_OnViewDetails(void) void ApplicationPage_OnWindowsTileHorizontally(void) { LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; - LV_ITEM item; + LV_ITEMW item; int i; HWND* hWndArray; int nWndCount; @@ -715,11 +719,11 @@ void ApplicationPage_OnWindowsTileHorizontally(void) nWndCount = 0; for (i=0; ihWnd, TRUE); @@ -900,15 +904,15 @@ void ApplicationPage_OnSwitchTo(void) void ApplicationPage_OnEndTask(void) { LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; - LV_ITEM item; + LV_ITEMW item; int i; for (i=0; i