From 3036649a34d46a68a3655684d7069c9755bc439d Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 1 Apr 2019 11:50:11 +0200 Subject: [PATCH] taskmgr: Use C runtime wchar functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard --- programs/taskmgr/affinity.c | 1 - programs/taskmgr/applpage.c | 11 ++-- programs/taskmgr/column.c | 101 ++++++++++++++++++------------------ programs/taskmgr/debug.c | 1 - programs/taskmgr/endproc.c | 1 - programs/taskmgr/graph.c | 11 ++-- programs/taskmgr/perfpage.c | 1 - programs/taskmgr/priority.c | 1 - programs/taskmgr/taskmgr.c | 5 +- programs/taskmgr/trayicon.c | 1 - 10 files changed, 62 insertions(+), 72 deletions(-) diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index af5481c3a24..546d0c8b76b 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -29,7 +29,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index ae881b530c8..5a005290be4 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -27,7 +27,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" typedef struct @@ -147,13 +146,13 @@ static void AddOrUpdateHwnd(HWND hWnd, WCHAR *wszTitle, HICON hIcon, BOOL bHung) { /* Check to see if anything needs updating */ if ((pAPLI->hIcon != hIcon) || - (strcmpW(pAPLI->wszTitle, wszTitle) != 0) || + (lstrcmpW(pAPLI->wszTitle, wszTitle) != 0) || (pAPLI->bHung != bHung)) { /* Update the structure */ pAPLI->hIcon = hIcon; pAPLI->bHung = bHung; - strcpyW(pAPLI->wszTitle, wszTitle); + lstrcpyW(pAPLI->wszTitle, wszTitle); /* Update the image list */ ImageList_ReplaceIcon(hImageListLarge, item.iItem, hIcon); @@ -174,7 +173,7 @@ static void AddOrUpdateHwnd(HWND hWnd, WCHAR *wszTitle, HICON hIcon, BOOL bHung) pAPLI->hWnd = hWnd; pAPLI->hIcon = hIcon; pAPLI->bHung = bHung; - strcpyW(pAPLI->wszTitle, wszTitle); + lstrcpyW(pAPLI->wszTitle, wszTitle); /* Add the item to the list */ memset(&item, 0, sizeof(LV_ITEMW)); @@ -198,7 +197,7 @@ static void AddOrUpdateHwnd(HWND hWnd, WCHAR *wszTitle, HICON hIcon, BOOL bHung) pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (!IsWindow(pAPLI->hWnd)|| - (strlenW(pAPLI->wszTitle) <= 0) || + (lstrlenW(pAPLI->wszTitle) <= 0) || !IsWindowVisible(pAPLI->hWnd) || (GetParent(pAPLI->hWnd) != NULL) || (GetWindow(pAPLI->hWnd, GW_OWNER) != NULL) || @@ -402,7 +401,7 @@ static int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, L Param1 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam2; Param2 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam1; } - return strcmpW(Param1->wszTitle, Param2->wszTitle); + return lstrcmpW(Param1->wszTitle, Param2->wszTitle); } static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 27c5926b5b8..3dc0e6845b8 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -27,7 +27,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "column.h" @@ -358,127 +357,127 @@ void SaveColumnSettings(void) SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMW, i, (LPARAM) &hditem); - if (strcmpW(text, wszImageName) == 0) + if (lstrcmpW(text, wszImageName) == 0) { TaskManagerSettings.Column_ImageName = TRUE; TaskManagerSettings.ColumnSizeArray[0] = hditem.cxy; } - if (strcmpW(text, wszPID) == 0) + if (lstrcmpW(text, wszPID) == 0) { TaskManagerSettings.Column_PID = TRUE; TaskManagerSettings.ColumnSizeArray[1] = hditem.cxy; } - if (strcmpW(text, wszUserName) == 0) + if (lstrcmpW(text, wszUserName) == 0) { TaskManagerSettings.Column_UserName = TRUE; TaskManagerSettings.ColumnSizeArray[2] = hditem.cxy; } - if (strcmpW(text, wszSessionID) == 0) + if (lstrcmpW(text, wszSessionID) == 0) { TaskManagerSettings.Column_SessionID = TRUE; TaskManagerSettings.ColumnSizeArray[3] = hditem.cxy; } - if (strcmpW(text, wszCPU) == 0) + if (lstrcmpW(text, wszCPU) == 0) { TaskManagerSettings.Column_CPUUsage = TRUE; TaskManagerSettings.ColumnSizeArray[4] = hditem.cxy; } - if (strcmpW(text, wszCPUTime) == 0) + if (lstrcmpW(text, wszCPUTime) == 0) { TaskManagerSettings.Column_CPUTime = TRUE; TaskManagerSettings.ColumnSizeArray[5] = hditem.cxy; } - if (strcmpW(text, wszMemUsage) == 0) + if (lstrcmpW(text, wszMemUsage) == 0) { TaskManagerSettings.Column_MemoryUsage = TRUE; TaskManagerSettings.ColumnSizeArray[6] = hditem.cxy; } - if (strcmpW(text, wszPeakMemUsage) == 0) + if (lstrcmpW(text, wszPeakMemUsage) == 0) { TaskManagerSettings.Column_PeakMemoryUsage = TRUE; TaskManagerSettings.ColumnSizeArray[7] = hditem.cxy; } - if (strcmpW(text, wszMemDelta) == 0) + if (lstrcmpW(text, wszMemDelta) == 0) { TaskManagerSettings.Column_MemoryUsageDelta = TRUE; TaskManagerSettings.ColumnSizeArray[8] = hditem.cxy; } - if (strcmpW(text, wszPageFaults) == 0) + if (lstrcmpW(text, wszPageFaults) == 0) { TaskManagerSettings.Column_PageFaults = TRUE; TaskManagerSettings.ColumnSizeArray[9] = hditem.cxy; } - if (strcmpW(text, wszPFDelta) == 0) + if (lstrcmpW(text, wszPFDelta) == 0) { TaskManagerSettings.Column_PageFaultsDelta = TRUE; TaskManagerSettings.ColumnSizeArray[10] = hditem.cxy; } - if (strcmpW(text, wszVMSize) == 0) + if (lstrcmpW(text, wszVMSize) == 0) { TaskManagerSettings.Column_VirtualMemorySize = TRUE; TaskManagerSettings.ColumnSizeArray[11] = hditem.cxy; } - if (strcmpW(text, wszPagedPool) == 0) + if (lstrcmpW(text, wszPagedPool) == 0) { TaskManagerSettings.Column_PagedPool = TRUE; TaskManagerSettings.ColumnSizeArray[12] = hditem.cxy; } - if (strcmpW(text, wszNPPool) == 0) + if (lstrcmpW(text, wszNPPool) == 0) { TaskManagerSettings.Column_NonPagedPool = TRUE; TaskManagerSettings.ColumnSizeArray[13] = hditem.cxy; } - if (strcmpW(text, wszBasePri) == 0) + if (lstrcmpW(text, wszBasePri) == 0) { TaskManagerSettings.Column_BasePriority = TRUE; TaskManagerSettings.ColumnSizeArray[14] = hditem.cxy; } - if (strcmpW(text, wszHandles) == 0) + if (lstrcmpW(text, wszHandles) == 0) { TaskManagerSettings.Column_HandleCount = TRUE; TaskManagerSettings.ColumnSizeArray[15] = hditem.cxy; } - if (strcmpW(text, wszThreads) == 0) + if (lstrcmpW(text, wszThreads) == 0) { TaskManagerSettings.Column_ThreadCount = TRUE; TaskManagerSettings.ColumnSizeArray[16] = hditem.cxy; } - if (strcmpW(text, wszUSERObjects) == 0) + if (lstrcmpW(text, wszUSERObjects) == 0) { TaskManagerSettings.Column_USERObjects = TRUE; TaskManagerSettings.ColumnSizeArray[17] = hditem.cxy; } - if (strcmpW(text, wszGDIObjects) == 0) + if (lstrcmpW(text, wszGDIObjects) == 0) { TaskManagerSettings.Column_GDIObjects = TRUE; TaskManagerSettings.ColumnSizeArray[18] = hditem.cxy; } - if (strcmpW(text, wszIOReads) == 0) + if (lstrcmpW(text, wszIOReads) == 0) { TaskManagerSettings.Column_IOReads = TRUE; TaskManagerSettings.ColumnSizeArray[19] = hditem.cxy; } - if (strcmpW(text, wszIOWrites) == 0) + if (lstrcmpW(text, wszIOWrites) == 0) { TaskManagerSettings.Column_IOWrites = TRUE; TaskManagerSettings.ColumnSizeArray[20] = hditem.cxy; } - if (strcmpW(text, wszIOOther) == 0) + if (lstrcmpW(text, wszIOOther) == 0) { TaskManagerSettings.Column_IOOther = TRUE; TaskManagerSettings.ColumnSizeArray[21] = hditem.cxy; } - if (strcmpW(text, wszIOReadBytes) == 0) + if (lstrcmpW(text, wszIOReadBytes) == 0) { TaskManagerSettings.Column_IOReadBytes = TRUE; TaskManagerSettings.ColumnSizeArray[22] = hditem.cxy; } - if (strcmpW(text, wszIOWriteBytes) == 0) + if (lstrcmpW(text, wszIOWriteBytes) == 0) { TaskManagerSettings.Column_IOWriteBytes = TRUE; TaskManagerSettings.ColumnSizeArray[23] = hditem.cxy; } - if (strcmpW(text, wszIOOtherBytes) == 0) + if (lstrcmpW(text, wszIOOtherBytes) == 0) { TaskManagerSettings.Column_IOOtherBytes = TRUE; TaskManagerSettings.ColumnSizeArray[24] = hditem.cxy; @@ -546,55 +545,55 @@ void UpdateColumnDataHints(void) SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMW, Index, (LPARAM) &hditem); - if (strcmpW(text, wszImageName) == 0) + if (lstrcmpW(text, wszImageName) == 0) ColumnDataHints[Index] = COLUMN_IMAGENAME; - if (strcmpW(text, wszPID) == 0) + if (lstrcmpW(text, wszPID) == 0) ColumnDataHints[Index] = COLUMN_PID; - if (strcmpW(text, wszUserName) == 0) + if (lstrcmpW(text, wszUserName) == 0) ColumnDataHints[Index] = COLUMN_USERNAME; - if (strcmpW(text, wszSessionID) == 0) + if (lstrcmpW(text, wszSessionID) == 0) ColumnDataHints[Index] = COLUMN_SESSIONID; - if (strcmpW(text, wszCPU) == 0) + if (lstrcmpW(text, wszCPU) == 0) ColumnDataHints[Index] = COLUMN_CPUUSAGE; - if (strcmpW(text, wszCPUTime) == 0) + if (lstrcmpW(text, wszCPUTime) == 0) ColumnDataHints[Index] = COLUMN_CPUTIME; - if (strcmpW(text, wszMemUsage) == 0) + if (lstrcmpW(text, wszMemUsage) == 0) ColumnDataHints[Index] = COLUMN_MEMORYUSAGE; - if (strcmpW(text, wszPeakMemUsage) == 0) + if (lstrcmpW(text, wszPeakMemUsage) == 0) ColumnDataHints[Index] = COLUMN_PEAKMEMORYUSAGE; - if (strcmpW(text, wszMemDelta) == 0) + if (lstrcmpW(text, wszMemDelta) == 0) ColumnDataHints[Index] = COLUMN_MEMORYUSAGEDELTA; - if (strcmpW(text, wszPageFaults) == 0) + if (lstrcmpW(text, wszPageFaults) == 0) ColumnDataHints[Index] = COLUMN_PAGEFAULTS; - if (strcmpW(text, wszPFDelta) == 0) + if (lstrcmpW(text, wszPFDelta) == 0) ColumnDataHints[Index] = COLUMN_PAGEFAULTSDELTA; - if (strcmpW(text, wszVMSize) == 0) + if (lstrcmpW(text, wszVMSize) == 0) ColumnDataHints[Index] = COLUMN_VIRTUALMEMORYSIZE; - if (strcmpW(text, wszPagedPool) == 0) + if (lstrcmpW(text, wszPagedPool) == 0) ColumnDataHints[Index] = COLUMN_PAGEDPOOL; - if (strcmpW(text, wszNPPool) == 0) + if (lstrcmpW(text, wszNPPool) == 0) ColumnDataHints[Index] = COLUMN_NONPAGEDPOOL; - if (strcmpW(text, wszBasePri) == 0) + if (lstrcmpW(text, wszBasePri) == 0) ColumnDataHints[Index] = COLUMN_BASEPRIORITY; - if (strcmpW(text, wszHandles) == 0) + if (lstrcmpW(text, wszHandles) == 0) ColumnDataHints[Index] = COLUMN_HANDLECOUNT; - if (strcmpW(text, wszThreads) == 0) + if (lstrcmpW(text, wszThreads) == 0) ColumnDataHints[Index] = COLUMN_THREADCOUNT; - if (strcmpW(text, wszUSERObjects) == 0) + if (lstrcmpW(text, wszUSERObjects) == 0) ColumnDataHints[Index] = COLUMN_USEROBJECTS; - if (strcmpW(text, wszGDIObjects) == 0) + if (lstrcmpW(text, wszGDIObjects) == 0) ColumnDataHints[Index] = COLUMN_GDIOBJECTS; - if (strcmpW(text, wszIOReads) == 0) + if (lstrcmpW(text, wszIOReads) == 0) ColumnDataHints[Index] = COLUMN_IOREADS; - if (strcmpW(text, wszIOWrites) == 0) + if (lstrcmpW(text, wszIOWrites) == 0) ColumnDataHints[Index] = COLUMN_IOWRITES; - if (strcmpW(text, wszIOOther) == 0) + if (lstrcmpW(text, wszIOOther) == 0) ColumnDataHints[Index] = COLUMN_IOOTHER; - if (strcmpW(text, wszIOReadBytes) == 0) + if (lstrcmpW(text, wszIOReadBytes) == 0) ColumnDataHints[Index] = COLUMN_IOREADBYTES; - if (strcmpW(text, wszIOWriteBytes) == 0) + if (lstrcmpW(text, wszIOWriteBytes) == 0) ColumnDataHints[Index] = COLUMN_IOWRITEBYTES; - if (strcmpW(text, wszIOOtherBytes) == 0) + if (lstrcmpW(text, wszIOOtherBytes) == 0) ColumnDataHints[Index] = COLUMN_IOOTHERBYTES; } } diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index ceb27d11f9f..bb11ba54579 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 7ed5ff08c60..498186212b7 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 40986755421..e6819cfbb41 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" @@ -82,15 +81,15 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) */ if (CpuUsage == 100) { - sprintfW(Text, wszFormatI, (int)CpuUsage); + swprintf(Text, wszFormatI, (int)CpuUsage); } else if (CpuUsage < 10) { - sprintfW(Text, wszFormatII, (int)CpuUsage); + swprintf(Text, wszFormatII, (int)CpuUsage); } else { - sprintfW(Text, wszFormatIII, (int)CpuUsage); + swprintf(Text, wszFormatIII, (int)CpuUsage); } /* @@ -252,13 +251,13 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - sprintfW(Text, wszFormat, (int)CommitChargeTotal); + swprintf(Text, wszFormat, (int)CommitChargeTotal); /* * Draw the font text onto the graph * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (strlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); /* * Now we have to draw the graph diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 63fb009eda6..4689d4e3312 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" #include "graphctl.h" diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index 90323db0c43..31701d6532c 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h" diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 1983d4d443b..b99d238814b 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "resource.h" #include "taskmgr.h" #include "perfdata.h" @@ -727,8 +726,8 @@ LPWSTR GetLastErrorText(LPWSTR lpwszBuf, DWORD dwSize) if (!dwRet || ( dwSize < dwRet+14)) { lpwszBuf[0] = '\0'; } else { - lpwszTemp[strlenW(lpwszTemp)-2] = '\0'; /* remove cr and newline character */ - sprintfW(lpwszBuf, wszFormat, lpwszTemp, GetLastError()); + lpwszTemp[lstrlenW(lpwszTemp)-2] = '\0'; /* remove cr and newline character */ + swprintf(lpwszBuf, wszFormat, lpwszTemp, GetLastError()); } if (lpwszTemp) { LocalFree(lpwszTemp); diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index b814e8c7c0c..6b6956acadf 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -28,7 +28,6 @@ #include #include -#include "wine/unicode.h" #include "taskmgr.h" #include "perfdata.h"