Andrew Nguyen : taskmgr: Remove all TCHAR macro usage in miscellaneous menu code.
Alexandre Julliard
julliard at winehq.org
Tue May 17 12:53:01 CDT 2011
Module: wine
Branch: master
Commit: 088d0630d9df688a163cb0fbfc5ee687f4cab3a5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=088d0630d9df688a163cb0fbfc5ee687f4cab3a5
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Tue May 17 05:15:22 2011 -0500
taskmgr: Remove all TCHAR macro usage in miscellaneous menu code.
---
programs/taskmgr/optnmenu.c | 2 +-
programs/taskmgr/run.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/taskmgr/optnmenu.c b/programs/taskmgr/optnmenu.c
index 726531f..42f34e8 100644
--- a/programs/taskmgr/optnmenu.c
+++ b/programs/taskmgr/optnmenu.c
@@ -48,7 +48,7 @@ void TaskManager_OnOptionsAlwaysOnTop(void)
* Check or uncheck the always on top menu item
* 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);
TaskManagerSettings.AlwaysOnTop = FALSE;
diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c
index dc8cf7b..ccd09ec 100644
--- a/programs/taskmgr/run.c
+++ b/programs/taskmgr/run.c
@@ -52,7 +52,7 @@ void TaskManager_OnFileNew(void)
{
HMODULE hShell32;
RUNFILEDLG RunFileDlg;
- OSVERSIONINFO versionInfo;
+ OSVERSIONINFOW versionInfo;
static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0};
hShell32 = LoadLibraryW(wszShell32);
@@ -62,8 +62,8 @@ void TaskManager_OnFileNew(void)
if (RunFileDlg)
{
HICON hIcon = LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_TASKMANAGER));
- versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- GetVersionEx(&versionInfo);
+ versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
+ GetVersionExW(&versionInfo);
if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
{
More information about the wine-cvs
mailing list