diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-05-20 07:44:49 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-05-20 07:44:49 +0000 |
| commit | c75dc44cea1877d8ec3783fb5201a2ba0f4a8d83 (patch) | |
| tree | 8d5469ef4e7e7693b28c4b44cb4b57a211d0b152 /win/vncviewer | |
| parent | c2d87605543e09cad3269ffbafed17759f137ed4 (diff) | |
| download | tigervnc-c75dc44cea1877d8ec3783fb5201a2ba0f4a8d83.tar.gz tigervnc-c75dc44cea1877d8ec3783fb5201a2ba0f4a8d83.zip | |
Fix 64-bit Windows issues
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4061 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win/vncviewer')
| -rw-r--r-- | win/vncviewer/ConnectingDialog.cxx | 9 | ||||
| -rw-r--r-- | win/vncviewer/DesktopWindow.cxx | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/win/vncviewer/ConnectingDialog.cxx b/win/vncviewer/ConnectingDialog.cxx index d2aec7c3..7f52e991 100644 --- a/win/vncviewer/ConnectingDialog.cxx +++ b/win/vncviewer/ConnectingDialog.cxx @@ -1,4 +1,5 @@ /* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. + * Copyright (C) 2010 D. R. Commander. All Rights Reserved. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,11 +32,11 @@ using namespace rfb::win32; // ConnectingDialog callback -static BOOL CALLBACK ConnectingDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { - bool* activePtr = (bool*)GetWindowLong(hwnd, GWL_USERDATA); +static INT_PTR CALLBACK ConnectingDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { + bool* activePtr = (bool*)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: - SetWindowLong(hwnd, GWL_USERDATA, lParam); + SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -118,7 +119,7 @@ network::Socket* ConnectingDialog::connect(const char* hostAndPort) { dialogId = ++nextDialogId; dialogs[dialogId] = this; dialog = CreateDialogParam(GetModuleHandle(0), - MAKEINTRESOURCE(IDD_CONNECTING_DLG), 0, &ConnectingDlgProc, (long)&active); + MAKEINTRESOURCE(IDD_CONNECTING_DLG), 0, &ConnectingDlgProc, (LONG_PTR)&active); ShowWindow(dialog, SW_SHOW); ResetEvent(readyEvent); } diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx index 49b6c3fa..d60ff8fe 100644 --- a/win/vncviewer/DesktopWindow.cxx +++ b/win/vncviewer/DesktopWindow.cxx @@ -1,4 +1,5 @@ /* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. + * Copyright (C) 2010 D. R. Commander. All Rights Reserved. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -63,10 +64,10 @@ public: LRESULT CALLBACK DesktopWindowProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) { LRESULT result = 0; if (msg == WM_CREATE) - SetWindowLong(wnd, GWL_USERDATA, (long)((CREATESTRUCT*)lParam)->lpCreateParams); + SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)((CREATESTRUCT*)lParam)->lpCreateParams); else if (msg == WM_DESTROY) - SetWindowLong(wnd, GWL_USERDATA, 0); - DesktopWindow* _this = (DesktopWindow*) GetWindowLong(wnd, GWL_USERDATA); + SetWindowLongPtr(wnd, GWLP_USERDATA, 0); + DesktopWindow* _this = (DesktopWindow*) GetWindowLongPtr(wnd, GWLP_USERDATA); if (!_this) { vlog.info("null _this in %x, message %u", wnd, msg); return rfb::win32::SafeDefWindowProc(wnd, msg, wParam, lParam); @@ -133,10 +134,10 @@ public: LRESULT CALLBACK FrameProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) { LRESULT result = 0; if (msg == WM_CREATE) - SetWindowLong(wnd, GWL_USERDATA, (long)((CREATESTRUCT*)lParam)->lpCreateParams); + SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)((CREATESTRUCT*)lParam)->lpCreateParams); else if (msg == WM_DESTROY) - SetWindowLong(wnd, GWL_USERDATA, 0); - DesktopWindow* _this = (DesktopWindow*) GetWindowLong(wnd, GWL_USERDATA); + SetWindowLongPtr(wnd, GWLP_USERDATA, 0); + DesktopWindow* _this = (DesktopWindow*) GetWindowLongPtr(wnd, GWLP_USERDATA); if (!_this) { vlog.info("null _this in %x, message %u", wnd, msg); return rfb::win32::SafeDefWindowProc(wnd, msg, wParam, lParam); |