Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
3036649a
Commit
3036649a
authored
Apr 01, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
taskmgr: Use C runtime wchar functions instead of wine/unicode.h.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0b18409c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
62 additions
and
72 deletions
+62
-72
affinity.c
programs/taskmgr/affinity.c
+0
-1
applpage.c
programs/taskmgr/applpage.c
+5
-6
column.c
programs/taskmgr/column.c
+50
-51
debug.c
programs/taskmgr/debug.c
+0
-1
endproc.c
programs/taskmgr/endproc.c
+0
-1
graph.c
programs/taskmgr/graph.c
+5
-6
perfpage.c
programs/taskmgr/perfpage.c
+0
-1
priority.c
programs/taskmgr/priority.c
+0
-1
taskmgr.c
programs/taskmgr/taskmgr.c
+2
-3
trayicon.c
programs/taskmgr/trayicon.c
+0
-1
No files found.
programs/taskmgr/affinity.c
View file @
3036649a
...
...
@@ -29,7 +29,6 @@
#include <commctrl.h>
#include <winnt.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
...
...
programs/taskmgr/applpage.c
View file @
3036649a
...
...
@@ -27,7 +27,6 @@
#include <windows.h>
#include <commctrl.h>
#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
)
||
(
l
strcmpW
(
pAPLI
->
wszTitle
,
wszTitle
)
!=
0
)
||
(
pAPLI
->
bHung
!=
bHung
))
{
/* Update the structure */
pAPLI
->
hIcon
=
hIcon
;
pAPLI
->
bHung
=
bHung
;
strcpyW
(
pAPLI
->
wszTitle
,
wszTitle
);
l
strcpyW
(
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
);
l
strcpyW
(
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
)
||
(
l
strlenW
(
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
l
strcmpW
(
Param1
->
wszTitle
,
Param2
->
wszTitle
);
}
static
void
ApplicationPageOnNotify
(
WPARAM
wParam
,
LPARAM
lParam
)
...
...
programs/taskmgr/column.c
View file @
3036649a
This diff is collapsed.
Click to expand it.
programs/taskmgr/debug.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
...
...
programs/taskmgr/endproc.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
...
...
programs/taskmgr/graph.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#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
)
{
s
printfW
(
Text
,
wszFormatI
,
(
int
)
CpuUsage
);
s
wprintf
(
Text
,
wszFormatI
,
(
int
)
CpuUsage
);
}
else
if
(
CpuUsage
<
10
)
{
s
printfW
(
Text
,
wszFormatII
,
(
int
)
CpuUsage
);
s
wprintf
(
Text
,
wszFormatII
,
(
int
)
CpuUsage
);
}
else
{
s
printfW
(
Text
,
wszFormatIII
,
(
int
)
CpuUsage
);
s
wprintf
(
Text
,
wszFormatIII
,
(
int
)
CpuUsage
);
}
/*
...
...
@@ -252,13 +251,13 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
CommitChargeTotal
=
(
ULONGLONG
)
PerfDataGetCommitChargeTotalK
();
CommitChargeLimit
=
(
ULONGLONG
)
PerfDataGetCommitChargeLimitK
();
s
printfW
(
Text
,
wszFormat
,
(
int
)
CommitChargeTotal
);
s
wprintf
(
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
)
-
(
l
strlenW
(
Text
)
*
8
))
/
2
,
rcClient
.
bottom
-
11
-
5
);
/*
* Now we have to draw the graph
...
...
programs/taskmgr/perfpage.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
#include "graphctl.h"
...
...
programs/taskmgr/priority.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
...
...
programs/taskmgr/taskmgr.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <commctrl.h>
#include <winnt.h>
#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 */
s
printfW
(
lpwszBuf
,
wszFormat
,
lpwszTemp
,
GetLastError
());
lpwszTemp
[
l
strlenW
(
lpwszTemp
)
-
2
]
=
'\0'
;
/* remove cr and newline character */
s
wprintf
(
lpwszBuf
,
wszFormat
,
lpwszTemp
,
GetLastError
());
}
if
(
lpwszTemp
)
{
LocalFree
(
lpwszTemp
);
...
...
programs/taskmgr/trayicon.c
View file @
3036649a
...
...
@@ -28,7 +28,6 @@
#include <winnt.h>
#include <shellapi.h>
#include "wine/unicode.h"
#include "taskmgr.h"
#include "perfdata.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment