windows-64-bit-type-safety-20051105

[openafs.git] / src / WINNT / afsusrmgr / helpfunc.cpp

diff --git a/src/WINNT/afsusrmgr/helpfunc.cpp b/src/WINNT/afsusrmgr/helpfunc.cpp
index e267f88..1d43f60 100644 (file)
--- a/src/WINNT/afsusrmgr/helpfunc.cpp
+++ b/src/WINNT/afsusrmgr/helpfunc.cpp
@@ -216,7 +216,7 @@ DWORD NextSearch (int &ii)
 BOOL Help_FindCommand_OnOK (HWND hDlg)
 {
    HWND hCombo = GetDlgItem (hDlg, IDC_FIND_COMMAND);
-   int iiDisplay = -1;
+   size_t iiDisplay = -1;
 
    UNIXUTIL uu = uuUNSPECIFIED;
    TCHAR szText[ cchRESOURCE ];
@@ -410,7 +410,7 @@ void Help_FindError_Shrink (HWND hDlg, BOOL fShrink)
 BOOL CALLBACK Help_About_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 void Help_About_OnInitDialog (HWND hDlg);
 void Help_About_OnSysCommand (HWND hDlg, int &cmd);
-LONG procAbout;
+UINT_PTR procAbout;
 
 void Help_About (void)
 {
@@ -465,15 +465,15 @@ BOOL CALLBACK Help_About_Proc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
          SetTimer (GetParent(hDlg), 1000, 1000/8, NULL);
          }
       }
-   return CallWindowProc ((WNDPROC)procAbout, hDlg, msg, wp, lp);
+   return CallWindowProc ((WNDPROC)procAbout, hDlg, msg, wp, lp)?TRUE:FALSE;
 }
 
 
 void Help_About_OnInitDialog (HWND hDlg)
 {
    HWND hAbout = GetDlgItem (hDlg, IDOK);
-   procAbout = (LONG)GetWindowLong (hAbout, GWL_WNDPROC);
-   SetWindowLong (hAbout, GWL_WNDPROC, (LONG)Help_About_Proc);
+   procAbout = (UINT_PTR)GetWindowLongPtr (hAbout, GWLP_WNDPROC);
+   SetWindowLongPtr (hAbout, GWLP_WNDPROC, (LONG_PTR)Help_About_Proc);
 
    LPTSTR pszText = FormatString (IDS_HELPABOUT_DESC1);
    SetDlgItemText (hDlg, IDC_HELPABOUT_DESC, pszText);