Michael Müller : taskmgr: Use system font instead of special bitmap font.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5cd7f63f727516468913ef5a1337d5d771943a38
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5cd7f63f727516468913ef5a1...

Author: Michael Müller 
Date:   Mon Apr  1 13:38:28 2019 +0200

taskmgr: Use system font instead of special bitmap font.

Signed-off-by: Vijay Kiran Kamuju 
Signed-off-by: Alexandre Julliard

---

programs/taskmgr/font.bmp   | Bin 646 -> 0 bytes
 programs/taskmgr/graph.c    |  14 ++++++++++++--
 programs/taskmgr/resource.h |   1 -
 programs/taskmgr/taskmgr.c  |  29 -----------------------------
 programs/taskmgr/taskmgr.rc |   3 ---
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/programs/taskmgr/font.bmp b/programs/taskmgr/font.bmp
deleted file mode 100644
index c1f8410..0000000
Binary files a/programs/taskmgr/font.bmp and /dev/null differ
diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c
index e6819cf..7e978e1 100644
--- a/programs/taskmgr/graph.c
+++ b/programs/taskmgr/graph.c
@@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
     RECT            rcClient;
     RECT            rcBarLeft;
     RECT            rcBarRight;
+    RECT            rcText;
     WCHAR            Text[256];
     ULONG            CpuUsage;
     ULONG            CpuKernelUsage;
@@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
      * Draw the font text onto the graph
      * The bottom 20 pixels are reserved for the text
      */
-    Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5);
+    CopyRect(&rcText, &rcClient);
+    rcText.top = rcText.bottom - 19;
+
+    SetTextColor(hDC, BRIGHT_GREEN);
+    DrawTextW(hDC, Text, -1, &rcText, DT_CENTER);

/*
      * Now we have to draw the graph
@@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
     RECT            rcClient;
     RECT            rcBarLeft;
     RECT            rcBarRight;
+    RECT            rcText;
     WCHAR            Text[256];
     ULONGLONG        CommitChargeTotal;
     ULONGLONG        CommitChargeLimit;
@@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
      * Draw the font text onto the graph
      * The bottom 20 pixels are reserved for the text
      */
-    Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5);
+    CopyRect(&rcText, &rcClient);
+    rcText.top = rcText.bottom - 19;
+
+    SetTextColor(hDC, BRIGHT_GREEN);
+    DrawTextW(hDC, Text, -1, &rcText, DT_CENTER);

/*
      * Now we have to draw the graph
diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h
index cd43f15..4153f66 100644
--- a/programs/taskmgr/resource.h
+++ b/programs/taskmgr/resource.h
@@ -35,7 +35,6 @@
 #define IDR_PROCESS_PAGE_CONTEXT        144
 #define IDB_TRAYMASK                    150
 #define IDB_TRAYICON                    153
-#define IDB_FONT                        154
 #define IDD_DEBUG_CHANNELS_DIALOG       155
 #define IDC_DEBUG_CHANNELS_LIST         156

diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c
index b99d238..d3337d2 100644
--- a/programs/taskmgr/taskmgr.c
+++ b/programs/taskmgr/taskmgr.c
@@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef
     FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight);
 }

-void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y)
-{
-    HDC        hFontDC;
-    HBITMAP    hFontBitmap;
-    HBITMAP    hOldBitmap;
-    int        i;
-
-    hFontDC = CreateCompatibleDC(hDC);
-    hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT));
-    hOldBitmap = SelectObject(hFontDC, hFontBitmap);
-
-    for (i = 0; lpwszText[i]; i++) {
-        if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) {
-            BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY);
-        }
-        else if (lpwszText[i] == 'K')
-        {
-            BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY);
-        }
-        else if (lpwszText[i] == '%')
-        {
-            BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY);
-        }
-    }
-    SelectObject(hFontDC, hOldBitmap);
-    DeleteObject(hFontBitmap);
-    DeleteDC(hFontDC);
-}
-
 static BOOL OnCreate(HWND hWnd)
 {
     HMENU   hMenu;
diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc
index e6742a7..ffd0699 100644
--- a/programs/taskmgr/taskmgr.rc
+++ b/programs/taskmgr/taskmgr.rc
@@ -609,6 +609,3 @@ IDB_TRAYMASK            BITMAP traymask.bmp

/* @makedep: trayicon.bmp */
 IDB_TRAYICON            BITMAP trayicon.bmp
-
-/* @makedep: font.bmp */
-IDB_FONT                BITMAP font.bmp