Fix 64-bit Windows issues
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4061 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/rfb_win32/Dialog.cxx b/win/rfb_win32/Dialog.cxx
index 90e7075..70a5fb5 100644
--- a/win/rfb_win32/Dialog.cxx
+++ b/win/rfb_win32/Dialog.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
@@ -106,13 +107,13 @@
-BOOL CALLBACK Dialog::staticDialogProc(HWND hwnd, UINT msg,
+INT_PTR CALLBACK Dialog::staticDialogProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
if (msg == WM_INITDIALOG)
- SetWindowLong(hwnd, GWL_USERDATA, (LONG)lParam);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
- LONG self = GetWindowLong(hwnd, GWL_USERDATA);
+ LONG_PTR self = GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!self) return FALSE;
return ((Dialog*)self)->dialogProc(hwnd, msg, wParam, lParam);
@@ -165,13 +166,13 @@
}
-BOOL CALLBACK PropSheetPage::staticPageProc(HWND hwnd, UINT msg,
+INT_PTR CALLBACK PropSheetPage::staticPageProc(HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
if (msg == WM_INITDIALOG)
- SetWindowLong(hwnd, GWL_USERDATA, ((PROPSHEETPAGE*)lParam)->lParam);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, ((PROPSHEETPAGE*)lParam)->lParam);
- LONG self = GetWindowLong(hwnd, GWL_USERDATA);
+ LONG_PTR self = GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!self) return FALSE;
return ((PropSheetPage*)self)->dialogProc(hwnd, msg, wParam, lParam);