Skip to content

W
wine-winehq
Commit 088d0630 authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard
Browse files
Options

taskmgr: Remove all TCHAR macro usage in miscellaneous menu code.

parent da5623cb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
programs/taskmgr/optnmenu.c
View file @ 088d0630
...@@ -48,7 +48,7 @@ void TaskManager_OnOptionsAlwaysOnTop(void) ...@@ -48,7 +48,7 @@ void TaskManager_OnOptionsAlwaysOnTop(void)
* Check or uncheck the always on top menu item * Check or uncheck the always on top menu item
* and update main window. * and update main window.
*/ */
if ((GetWindowLong(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0) if ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0)
{ {
CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED);
TaskManagerSettings.AlwaysOnTop = FALSE; TaskManagerSettings.AlwaysOnTop = FALSE;
......
programs/taskmgr/run.c
View file @ 088d0630
...@@ -52,7 +52,7 @@ void TaskManager_OnFileNew(void) ...@@ -52,7 +52,7 @@ void TaskManager_OnFileNew(void)
{ {
HMODULE hShell32; HMODULE hShell32;
RUNFILEDLG RunFileDlg; RUNFILEDLG RunFileDlg;
OSVERSIONINFO versionInfo; OSVERSIONINFOW versionInfo;
static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0};
hShell32 = LoadLibraryW(wszShell32); hShell32 = LoadLibraryW(wszShell32);
...@@ -62,8 +62,8 @@ void TaskManager_OnFileNew(void) ...@@ -62,8 +62,8 @@ void TaskManager_OnFileNew(void)
if (RunFileDlg) if (RunFileDlg)
{ {
HICON hIcon = LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_TASKMANAGER)); HICON hIcon = LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_TASKMANAGER));
versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
GetVersionEx(&versionInfo); GetVersionExW(&versionInfo);
if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment