windows-drive-mappings-20070202

FIXES 45545

Correct the return types and values of the Window Procedures.
This fixes the drive mappings problems.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
FIXES 45545

Remove "Drive " from the drive mappings.  This way the drive letters
can be selected with a single key press.

diff --git a/src/WINNT/afsapplib/afsapplib.cpp b/src/WINNT/afsapplib/afsapplib.cpp
index 959b770..f6e9eab 100644 (file)
--- a/src/WINNT/afsapplib/afsapplib.cpp
+++ b/src/WINNT/afsapplib/afsapplib.cpp
@@ -33,7 +33,7 @@ extern void OnCoverWindow (WPARAM wp, LPARAM lp);
 extern void OnExpiredCredentials (WPARAM wp, LPARAM lp);
 extern void OnCreateErrorDialog (WPARAM wp, LPARAM lp);
 
-BOOL CALLBACK AfsAppLib_MainHook (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK AfsAppLib_MainHook (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 
 /*
@@ -69,7 +69,7 @@ HWND AfsAppLib_GetMainWindow (void)
 }
 
 
-BOOL CALLBACK AfsAppLib_MainHook (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK AfsAppLib_MainHook (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hWnd, AfsAppLib_MainHook);
 
@@ -93,8 +93,8 @@ BOOL CALLBACK AfsAppLib_MainHook (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp)==NULL?FALSE:TRUE);
+      return (CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp));
    else
-      return (DefWindowProc (hWnd, msg, wp, lp)==NULL?FALSE:TRUE);
+      return (DefWindowProc (hWnd, msg, wp, lp));
 }
 

diff --git a/src/WINNT/afsapplib/al_browse.cpp b/src/WINNT/afsapplib/al_browse.cpp
index a9052be..5e6df91 100644 (file)
--- a/src/WINNT/afsapplib/al_browse.cpp
+++ b/src/WINNT/afsapplib/al_browse.cpp
@@ -61,7 +61,7 @@ typedef struct BROWSEDIALOGPARAMS {
 } BROWSEDIALOGPARAMS, *LPBROWSEDIALOGPARAMS;
 
 
-BOOL CALLBACK DlgProc_Browse (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK DlgProc_Browse (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 void DlgProc_Browse_OnInitDialog (HWND hDlg, BROWSEDIALOGPARAMS *pbdp);
 void DlgProc_Browse_OnNone (HWND hDlg, BROWSEDIALOGPARAMS *pbdp);
 void DlgProc_Browse_SelectedEntry (HWND hDlg, BROWSEDIALOGPARAMS *pbdp);
@@ -138,7 +138,7 @@ BOOL AfsAppLib_ShowBrowseDialog (LPBROWSEDLG_PARAMS lpp)
 #define WM_THREADSTART (WM_USER +101)
 #define WM_THREADDONE  (WM_USER +102)
 
-BOOL CALLBACK DlgProc_Browse (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK DlgProc_Browse (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    BROWSEDIALOGPARAMS *pbdp;
 

diff --git a/src/WINNT/afsapplib/al_browseset.cpp b/src/WINNT/afsapplib/al_browseset.cpp
index 590f5af..be29f5c 100644 (file)
--- a/src/WINNT/afsapplib/al_browseset.cpp
+++ b/src/WINNT/afsapplib/al_browseset.cpp
@@ -30,7 +30,7 @@ extern "C" {
  *
  */
 
-BOOL CALLBACK BrowseSet_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK BrowseSet_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 void BrowseSet_OnInitDialog (HWND hDlg, LPBROWSESETDLG_PARAMS pszFilename);
 void BrowseSet_OnDestroy (HWND hDlg);
 void BrowseSet_OnAddString (HWND hDlg, LPTSTR pszString);
@@ -54,7 +54,7 @@ BOOL AfsAppLib_ShowBrowseFilesetDialog (LPBROWSESETDLG_PARAMS lpp)
 }
 
 
-BOOL CALLBACK BrowseSet_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK BrowseSet_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    if (AfsAppLib_HandleHelp (IDD_APPLIB_BROWSE_FILESET, hDlg, msg, wp, lp))
       return TRUE;

diff --git a/src/WINNT/afsapplib/al_cover.cpp b/src/WINNT/afsapplib/al_cover.cpp
index 29966f7..4816573 100644 (file)
--- a/src/WINNT/afsapplib/al_cover.cpp
+++ b/src/WINNT/afsapplib/al_cover.cpp
@@ -53,7 +53,7 @@ typedef struct // COVERPARAMS
 
 void OnCoverWindow (WPARAM wp, LPARAM lp);
 
-BOOL CALLBACK Cover_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK Cover_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 
 /*
@@ -156,7 +156,7 @@ void OnCoverWindow (WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK Cover_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK Cover_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    switch (msg)
       {

diff --git a/src/WINNT/afsapplib/al_creds.cpp b/src/WINNT/afsapplib/al_creds.cpp
index 1ae291b..94a6cc7 100644 (file)
--- a/src/WINNT/afsapplib/al_creds.cpp
+++ b/src/WINNT/afsapplib/al_creds.cpp
@@ -39,21 +39,21 @@ extern "C" {
 
 void OnExpiredCredentials (WPARAM wp, LPARAM lp);
 
-BOOL CALLBACK OpenCell_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK OpenCell_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 void OpenCell_OnInitDialog (HWND hDlg, LPOPENCELLDLG_PARAMS lpp);
 BOOL OpenCell_OnOK (HWND hDlg, LPOPENCELLDLG_PARAMS lpp);
 void OpenCell_OnCell (HWND hDlg);
 void OpenCell_Enable (HWND hDlg, BOOL fEnable);
 void OpenCell_OnGotCreds (HWND hDlg, LPARAM lp);
 
-BOOL CALLBACK NewCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK NewCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 void NewCreds_OnInitDialog (HWND hDlg, LPCREDENTIALSDLG_PARAMS lpp);
 BOOL NewCreds_OnOK (HWND hDlg, LPCREDENTIALSDLG_PARAMS lpp);
 void NewCreds_OnLogin (HWND hDlg);
 void NewCreds_Enable (HWND hDlg, BOOL fEnable);
 void NewCreds_GetOutParams (HWND hDlg, LPCREDENTIALSDLG_PARAMS lpp);
 
-BOOL CALLBACK BadCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK BadCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 
 /*
@@ -186,7 +186,7 @@ BOOL AfsAppLib_ShowOpenCellDialog (LPOPENCELLDLG_PARAMS lpp)
 }
 
 
-BOOL CALLBACK OpenCell_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK OpenCell_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    LPOPENCELLDLG_PARAMS lpp;
    if (msg == WM_INITDIALOG)
@@ -489,7 +489,7 @@ BOOL AfsAppLib_ShowCredentialsDialog (LPCREDENTIALSDLG_PARAMS lpp)
 }
 
 
-BOOL CALLBACK NewCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK NewCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    LPCREDENTIALSDLG_PARAMS lpp;
    if (msg == WM_INITDIALOG)
@@ -851,7 +851,7 @@ BOOL AfsAppLib_CheckCredentials (LPCHECKCREDS_PARAMS lpp)
 }
 
 
-BOOL CALLBACK BadCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK BadCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    LPREALBADCREDSDLG_PARAMS lpp;
    if (msg == WM_INITDIALOG)

diff --git a/src/WINNT/afsapplib/al_error.cpp b/src/WINNT/afsapplib/al_error.cpp
index 57c7242..08303f0 100644 (file)
--- a/src/WINNT/afsapplib/al_error.cpp
+++ b/src/WINNT/afsapplib/al_error.cpp
@@ -21,7 +21,7 @@ extern "C" {
 
 void cdecl vErrorDialog (BOOL fFatal, DWORD dwStatus, LONG idError, LPTSTR pszFmt, va_list arg);
 
-BOOL CALLBACK Error_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK Error_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void OnCreateErrorDialog (WPARAM wp, LPARAM lp);
 
@@ -134,7 +134,7 @@ void OnCreateErrorDialog (WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK Error_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK Error_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    switch (msg)
       {

diff --git a/src/WINNT/afsapplib/al_misc.cpp b/src/WINNT/afsapplib/al_misc.cpp
index d563832..a648564 100644 (file)
--- a/src/WINNT/afsapplib/al_misc.cpp
+++ b/src/WINNT/afsapplib/al_misc.cpp
@@ -33,7 +33,7 @@ extern "C" {
  *
  */
 
-BOOL CALLBACK AfsAppLib_TranslateErrorFunc (LPTSTR pszText, ULONG code, LANGID idLanguage);
+HRESULT CALLBACK AfsAppLib_TranslateErrorFunc (LPTSTR pszText, ULONG code, LANGID idLanguage);
 
 
 /*
@@ -162,7 +162,7 @@ void AfsAppLib_AnimateIcon (HWND hIcon, int *piFrameLast)
 }
 
 
-BOOL CALLBACK AnimationHook (HWND hIcon, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK AnimationHook (HWND hIcon, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hIcon, AnimationHook);
 
@@ -181,9 +181,9 @@ BOOL CALLBACK AnimationHook (HWND hIcon, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hIcon, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hIcon, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hIcon, msg, wp, lp);
+      return DefWindowProc (hIcon, msg, wp, lp);
 }
 
 
@@ -208,7 +208,7 @@ void AfsAppLib_StopAnimation (HWND hIcon)
  *
  */
 
-BOOL CALLBACK AfsAppLib_TranslateErrorFunc (LPTSTR pszText, ULONG code, LANGID idLanguage)
+HRESULT CALLBACK AfsAppLib_TranslateErrorFunc (LPTSTR pszText, ULONG code, LANGID idLanguage)
 {
    DWORD idClient;
    if ((idClient = (DWORD)AfsAppLib_GetAdminServerClientID()) != 0)

diff --git a/src/WINNT/afsapplib/al_progress.cpp b/src/WINNT/afsapplib/al_progress.cpp
index 3461cdd..0e88178 100644 (file)
--- a/src/WINNT/afsapplib/al_progress.cpp
+++ b/src/WINNT/afsapplib/al_progress.cpp
@@ -179,13 +179,13 @@ LPPROGRESSDISPLAY PROGRESSDISPLAY::GetProgressDisplay (HWND hWnd)
 }
 
 
-BOOL CALLBACK PROGRESSDISPLAY::ProgressDisplay_StubProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK PROGRESSDISPLAY::ProgressDisplay_StubProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    return FALSE;
 }
 
 
-BOOL CALLBACK PROGRESSDISPLAY::ProgressDisplay_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK PROGRESSDISPLAY::ProgressDisplay_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldproc = Subclass_FindNextHook (hWnd, PROGRESSDISPLAY::ProgressDisplay_HookProc);
 
@@ -207,9 +207,9 @@ BOOL CALLBACK PROGRESSDISPLAY::ProgressDisplay_HookProc (HWND hWnd, UINT msg, WP
       }
 
    if (oldproc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldproc, hWnd, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldproc, hWnd, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hWnd, msg, wp, lp);
+      return DefWindowProc (hWnd, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/al_progress.h b/src/WINNT/afsapplib/al_progress.h
index 9fa0c69..af58c22 100644 (file)
--- a/src/WINNT/afsapplib/al_progress.h
+++ b/src/WINNT/afsapplib/al_progress.h
@@ -115,8 +115,8 @@ class PROGRESSDISPLAY
       void Finish (DWORD dwStatus = 0);
       void PROGRESSDISPLAY::OnUpdate (void);
 
-      static BOOL CALLBACK ProgressDisplay_StubProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
-      static BOOL CALLBACK ProgressDisplay_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK ProgressDisplay_StubProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK ProgressDisplay_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
       static DWORD WINAPI PROGRESSDISPLAY::ThreadProc (PVOID lp);
 
       BOOL m_fFinished;

diff --git a/src/WINNT/afsapplib/al_pump.cpp b/src/WINNT/afsapplib/al_pump.cpp
index e4c6d2e..0489641 100644 (file)
--- a/src/WINNT/afsapplib/al_pump.cpp
+++ b/src/WINNT/afsapplib/al_pump.cpp
@@ -67,7 +67,7 @@ static LPCRITICAL_SECTION pcsData = NULL;
  *
  */
 
-BOOL CALLBACK Modeless_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK Modeless_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, Modeless_HookProc);
 
@@ -84,9 +84,9 @@ BOOL CALLBACK Modeless_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
 }
 
 
@@ -193,7 +193,7 @@ void AfsAppLib_MainPump (void)
  *
  */
 
-BOOL CALLBACK WindowData_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK WindowData_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hWnd, WindowData_HookProc);
 
@@ -214,9 +214,9 @@ BOOL CALLBACK WindowData_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hWnd, msg, wp, lp);
+      return DefWindowProc (hWnd, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/al_wizard.cpp b/src/WINNT/afsapplib/al_wizard.cpp
index 6898c7e..2e6b905 100644 (file)
--- a/src/WINNT/afsapplib/al_wizard.cpp
+++ b/src/WINNT/afsapplib/al_wizard.cpp
@@ -649,7 +649,7 @@ BOOL WIZARD::SendStateCommand (int st, WIZARD_COMMAND wc)
 }
 
 
-BOOL CALLBACK WIZARD::Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK WIZARD::Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    if (msg == WM_INITDIALOG)
       SetWindowLongPtr (hWnd, DWLP_USER, lp);
@@ -676,7 +676,7 @@ BOOL CALLBACK WIZARD::Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM l
 }
 
 
-BOOL CALLBACK WIZARD::Template_LeftPaneHook (HWND hLHS, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK WIZARD::Template_LeftPaneHook (HWND hLHS, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hLHS, WIZARD::Template_LeftPaneHook);
 
@@ -928,7 +928,7 @@ void GetRectInParent (HWND hWnd, RECT *pr)
 }
 
 
-BOOL CALLBACK WIZARD::Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK WIZARD::Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp)
 {
    if (msg == WM_INITDIALOG)
       SetWindowLongPtr (hBkg, DWLP_USER, lp);
@@ -975,7 +975,7 @@ BOOL CALLBACK WIZARD::Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM
 }
 
 
-BOOL CALLBACK WIZARD::Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK WIZARD::Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hBkg, WIZARD::Background_PaintHook);
 
@@ -996,9 +996,9 @@ BOOL CALLBACK WIZARD::Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPAR
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hBkg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hBkg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hBkg, msg, wp, lp);
+      return DefWindowProc (hBkg, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/al_wizard.h b/src/WINNT/afsapplib/al_wizard.h
index 615b027..a9a50eb 100644 (file)
--- a/src/WINNT/afsapplib/al_wizard.h
+++ b/src/WINNT/afsapplib/al_wizard.h
@@ -96,16 +96,16 @@ class EXPORTED WIZARD
       void GeneratePalette (RGBQUAD *pargb = NULL);
       LPWIZARD_STATE FindState (int stFind);
 
-      static BOOL CALLBACK Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp);
-      static BOOL CALLBACK Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp);
       void Background_OnInitDialog (HWND hBkg);
       void Background_OnSize (void);
       void Background_OnDestroy (void);
       void Background_OnClose (void);
       BOOL Background_OnPaint (void);
 
-      static BOOL CALLBACK Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
-      static BOOL CALLBACK Template_LeftPaneHook (HWND hLHS, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+      static HRESULT CALLBACK Template_LeftPaneHook (HWND hLHS, UINT msg, WPARAM wp, LPARAM lp);
       BOOL Template_ForwardMessage (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
       void Template_OnInitDialog (HWND hWnd);
       BOOL Template_OnPaintLHS (HWND hLHS);

diff --git a/src/WINNT/afsapplib/checklist.cpp b/src/WINNT/afsapplib/checklist.cpp
index fbd8baa..da5d9a4 100644 (file)
--- a/src/WINNT/afsapplib/checklist.cpp
+++ b/src/WINNT/afsapplib/checklist.cpp
@@ -57,9 +57,9 @@ LONG procListbox = 0;
  *
  */
 
-BOOL CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp);
 
-BOOL CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void CheckList_OnDrawItem (HWND hList, int id, LPDRAWITEMSTRUCT lpds);
 void CheckList_OnDrawCheckbox (HWND hList, int id, LPDRAWITEMSTRUCT lpds);
@@ -158,7 +158,7 @@ BOOL IsCheckList (HWND hList)
 }
 
 
-BOOL CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
 {
     HRESULT hResult;
 
@@ -225,11 +225,11 @@ BOOL CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
    else
       hResult = (BOOL)DefWindowProc (hList, msg, wp, lp);
 
-    return (hResult?TRUE:FALSE);
+    return (hResult);
 }
 
 
-BOOL CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID procOld = Subclass_FindNextHook (hDlg, CheckList_DialogProc);
 
@@ -272,7 +272,7 @@ BOOL CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (procOld)
-      return (BOOL)CallWindowProc ((WNDPROC)procOld, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)procOld, hDlg, msg, wp, lp);
    else
       return FALSE;
 }

diff --git a/src/WINNT/afsapplib/ctl_date.cpp b/src/WINNT/afsapplib/ctl_date.cpp
index 570afb7..5b0d8c3 100644 (file)
--- a/src/WINNT/afsapplib/ctl_date.cpp
+++ b/src/WINNT/afsapplib/ctl_date.cpp
@@ -96,9 +96,9 @@ static size_t           cDate = 0;
 
 #define cszDATECLASS TEXT("Date")
 
-BOOL CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void Date_SendCallback (DateInfo *pdi, WORD eln, LPARAM lp);
 
@@ -154,7 +154,7 @@ void Date_SendCallback (DateInfo *pdi, WORD eln, LPARAM lp)
 }
 
 
-BOOL CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp)
 {
    DateInfo *pdi = NULL;
 
@@ -262,7 +262,7 @@ BOOL CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp)
          }
       }
 
-   return (BOOL)DefWindowProc (hDate, msg, wp, lp);
+   return DefWindowProc (hDate, msg, wp, lp);
 }
 
 
@@ -532,7 +532,7 @@ BOOL Date_OnSetDate (DateInfo *pdi, WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, DateDlgProc);
    size_t iDate;
@@ -582,13 +582,13 @@ BOOL CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
 }
 
 
-BOOL CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 {
    DateInfo *pdi = NULL;
 
@@ -618,9 +618,9 @@ BOOL CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 
    PVOID oldProc = Subclass_FindNextHook (hEdit, DateEditProc);
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hEdit, msg, wp, lp);
+      return DefWindowProc (hEdit, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/ctl_elapsed.cpp b/src/WINNT/afsapplib/ctl_elapsed.cpp
index 9d93667..c459543 100644 (file)
--- a/src/WINNT/afsapplib/ctl_elapsed.cpp
+++ b/src/WINNT/afsapplib/ctl_elapsed.cpp
@@ -97,9 +97,9 @@ static size_t           cElapsed = 0;
 
 #define cszELAPSEDCLASS TEXT("Elapsed")
 
-BOOL CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void Elapsed_SendCallback (ElapsedInfo *pei, WORD eln, LPARAM lp);
 
@@ -159,7 +159,7 @@ void Elapsed_SendCallback (ElapsedInfo *pei, WORD eln, LPARAM lp)
 }
 
 
-BOOL CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp)
 {
    ElapsedInfo *pei = NULL;
 
@@ -274,7 +274,7 @@ BOOL CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp)
          }
       }
 
-   return (BOOL)DefWindowProc (hElapsed, msg, wp, lp);
+   return DefWindowProc (hElapsed, msg, wp, lp);
 }
 
 
@@ -490,7 +490,7 @@ BOOL Elapsed_OnSetTime (ElapsedInfo *pei, WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, ElapsedDlgProc);
    size_t iElapsed;
@@ -515,7 +515,7 @@ BOOL CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
                else
                   clr = GetSysColor (COLOR_BTNFACE);
                SetBkColor ((HDC)wp, clr);
-               return (BOOL)(INT_PTR)CreateSolidBrush (clr);
+               return (HRESULT)(INT_PTR)CreateSolidBrush (clr);
                }
             }
          break;
@@ -540,13 +540,13 @@ BOOL CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
 }
 
 
-BOOL CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 {
    ElapsedInfo *pei = NULL;
 
@@ -576,9 +576,9 @@ BOOL CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 
    PVOID oldProc = Subclass_FindNextHook (hEdit, ElapsedEditProc);
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hEdit, msg, wp, lp);
+      return DefWindowProc (hEdit, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/ctl_sockaddr.cpp b/src/WINNT/afsapplib/ctl_sockaddr.cpp
index 19ae132..5cf3291 100644 (file)
--- a/src/WINNT/afsapplib/ctl_sockaddr.cpp
+++ b/src/WINNT/afsapplib/ctl_sockaddr.cpp
@@ -97,9 +97,9 @@ static size_t            cSockAddr = 0;
 
 #define cszSOCKADDRCLASS TEXT("SockAddr")
 
-BOOL CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void SockAddr_SendCallback (SockAddrInfo *psai, WORD eln, LPARAM lp);
 
@@ -156,7 +156,7 @@ void SockAddr_SendCallback (SockAddrInfo *psai, WORD san, LPARAM lp)
 }
 
 
-BOOL CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp)
 {
    SockAddrInfo *psai = NULL;
 
@@ -236,7 +236,7 @@ BOOL CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp)
          }
       }
 
-   return (BOOL)DefWindowProc (hSockAddr, msg, wp, lp);
+   return DefWindowProc (hSockAddr, msg, wp, lp);
 }
 
 
@@ -445,7 +445,7 @@ BOOL SockAddr_OnSetAddr (SockAddrInfo *psai, WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, SockAddrDlgProc);
    size_t iSockAddr;
@@ -472,7 +472,7 @@ BOOL CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
                else
                   clr = GetSysColor (COLOR_BTNFACE);
                SetBkColor ((HDC)wp, clr);
-               return (BOOL)(INT_PTR)CreateSolidBrush (clr);
+               return (HRESULT)(INT_PTR)CreateSolidBrush (clr);
                }
             }
          break;
@@ -510,13 +510,13 @@ BOOL CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
 }
 
 
-BOOL CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 {
    SockAddrInfo *psai = NULL;
 
@@ -556,9 +556,9 @@ BOOL CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 
    PVOID oldProc = Subclass_FindNextHook (hEdit, SockAddrEditProc);
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hEdit, msg, wp, lp);
+      return DefWindowProc (hEdit, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/ctl_spinner.cpp b/src/WINNT/afsapplib/ctl_spinner.cpp
index 983bc0f..a9cb7bb 100644 (file)
--- a/src/WINNT/afsapplib/ctl_spinner.cpp
+++ b/src/WINNT/afsapplib/ctl_spinner.cpp
@@ -101,9 +101,9 @@ static LONG             oldSpinnerProc = 0;
 
 #define cszSPINNERCLASS TEXT("Spinner")
 
-BOOL CALLBACK SpinnerProc (HWND hSpin, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK SpinnerDialogProc (HWND hSpin, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SpinnerProc (HWND hSpin, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SpinnerDialogProc (HWND hSpin, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp);
 
 void SpinnerSendCallback (SpinnerInfo *psi, WORD spm, LPARAM lp);
 
@@ -259,7 +259,7 @@ void Spinner_OnDestroy (SpinnerInfo *psi)
 }
 
 
-BOOL CALLBACK SpinnerProc (HWND hSpinner, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SpinnerProc (HWND hSpinner, UINT msg, WPARAM wp, LPARAM lp)
 {
    EnterCriticalSection (&csSpinners);
 
@@ -321,13 +321,13 @@ BOOL CALLBACK SpinnerProc (HWND hSpinner, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldSpinnerProc == 0)
-      return (BOOL)DefWindowProc (hSpinner, msg, wp, lp);
+      return DefWindowProc (hSpinner, msg, wp, lp);
    else
-      return (BOOL)CallWindowProc ((WNDPROC)(LONG_PTR)oldSpinnerProc, hSpinner, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)(LONG_PTR)oldSpinnerProc, hSpinner, msg, wp, lp);
 }
 
 
-BOOL CALLBACK SpinnerDialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SpinnerDialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, SpinnerDialogProc);
    SpinnerInfo *psi;
@@ -416,14 +416,14 @@ BOOL CALLBACK SpinnerDialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc == 0)
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
    else
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
 }
 
 
 
-BOOL CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hBuddy, SpinnerBuddyProc);
 
@@ -501,9 +501,9 @@ BOOL CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hBuddy, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hBuddy, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hBuddy, msg, wp, lp);
+      return DefWindowProc (hBuddy, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/ctl_time.cpp b/src/WINNT/afsapplib/ctl_time.cpp
index fb65d32..d7b69e5 100644 (file)
--- a/src/WINNT/afsapplib/ctl_time.cpp
+++ b/src/WINNT/afsapplib/ctl_time.cpp
@@ -98,9 +98,9 @@ static size_t           cTime = 0;
 
 #define cszTIMECLASS TEXT("Time")
 
-BOOL CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void Time_SendCallback (TimeInfo *pti, WORD eln, LPARAM lp);
 
@@ -158,7 +158,7 @@ void Time_SendCallback (TimeInfo *pti, WORD eln, LPARAM lp)
 }
 
 
-BOOL CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp)
 {
    TimeInfo *pti = NULL;
 
@@ -271,7 +271,7 @@ BOOL CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp)
          }
       }
 
-   return (BOOL)DefWindowProc (hTime, msg, wp, lp);
+   return DefWindowProc (hTime, msg, wp, lp);
 }
 
 
@@ -513,7 +513,7 @@ BOOL Time_OnSetTime (TimeInfo *pti, WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, TimeDlgProc);
    size_t iTime;
@@ -539,7 +539,7 @@ BOOL CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
                else
                   clr = GetSysColor (COLOR_BTNFACE);
                SetBkColor ((HDC)wp, clr);
-               return (BOOL)(INT_PTR)CreateSolidBrush (clr);
+               return (HRESULT)(INT_PTR)CreateSolidBrush (clr);
                }
             }
          break;
@@ -606,13 +606,13 @@ BOOL CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+      return DefWindowProc (hDlg, msg, wp, lp);
 }
 
 
-BOOL CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 {
    TimeInfo *pti = NULL;
 
@@ -642,9 +642,9 @@ BOOL CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp)
 
    PVOID oldProc = Subclass_FindNextHook (hEdit, TimeEditProc);
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hEdit, msg, wp, lp);
+      return DefWindowProc (hEdit, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/dialog.cpp b/src/WINNT/afsapplib/dialog.cpp
index 3139c11..1d43684 100644 (file)
--- a/src/WINNT/afsapplib/dialog.cpp
+++ b/src/WINNT/afsapplib/dialog.cpp
@@ -130,7 +130,7 @@ static struct
 static size_t cPropSheets = 0;
 
 
-BOOL CALLBACK PropTab_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK PropTab_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    if (PropSheet_HandleNotify (hDlg, msg, wp, lp))
       return TRUE;
@@ -194,7 +194,7 @@ BOOL CALLBACK PropTab_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
          }
       }
 
-   return (BOOL)DefWindowProc (hDlg, msg, wp, lp);
+   return DefWindowProc (hDlg, msg, wp, lp);
 
 }
 
@@ -300,15 +300,15 @@ void PropSheet_NotifyAllTabs (LPPROPSHEET psh, HWND hDlg, UINT msg)
 }
 
 
-BOOL CALLBACK PropSheet_HookProc (HWND hSheet, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK PropSheet_HookProc (HWND hSheet, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldproc = Subclass_FindNextHook (hSheet, PropSheet_HookProc);
+   HRESULT rc;
 
-   BOOL rc;
    if (oldproc)
-      rc = (BOOL)CallWindowProc ((WNDPROC)oldproc, hSheet, msg, wp, lp);
+      rc = CallWindowProc ((WNDPROC)oldproc, hSheet, msg, wp, lp);
    else
-      rc = (BOOL)DefWindowProc (hSheet, msg, wp, lp);
+      rc = DefWindowProc (hSheet, msg, wp, lp);
 
    switch (msg)
       {
@@ -1127,7 +1127,7 @@ typedef struct // VIEWSORTINFO
    BOOL fAscending;
    } VIEWSORTINFO, *LPVIEWSORTINFO;
 
-BOOL CALLBACK LV_SortView_Numeric (LPARAM lp1, LPARAM lp2, LPARAM lpSort)
+HRESULT CALLBACK LV_SortView_Numeric (LPARAM lp1, LPARAM lp2, LPARAM lpSort)
 {
    LPVIEWSORTINFO lpvsi = (LPVIEWSORTINFO)lpSort;
    TCHAR szText[ cchRESOURCE ];
@@ -1144,13 +1144,13 @@ BOOL CALLBACK LV_SortView_Numeric (LPARAM lp1, LPARAM lp2, LPARAM lpSort)
    d2 = atof (szText);
 
    if (lpvsi->fAscending)
-      return (d2 <  d1) ? ((BOOL)-1) : (d2 == d1) ? ((BOOL)0) : (BOOL)1;
+      return (HRESULT)((d2 <  d1) ? -1 : (d2 == d1) ? 0 : 1);
    else
-      return (d1 <  d2) ? ((BOOL)-1) : (d1 == d2) ? ((BOOL)0) : (BOOL)1;
+      return (HRESULT)((d1 <  d2) ? -1 : (d1 == d2) ? 0 : 1);
 }
 
 
-BOOL CALLBACK LV_SortView_Alphabetic (LPARAM lp1, LPARAM lp2, LPARAM lpSort)
+HRESULT CALLBACK LV_SortView_Alphabetic (LPARAM lp1, LPARAM lp2, LPARAM lpSort)
 {
    LPVIEWSORTINFO lpvsi = (LPVIEWSORTINFO)lpSort;
    TCHAR szText1[ cchRESOURCE ];
@@ -1532,7 +1532,7 @@ WORD LB_GetStringExtent (HWND hList, LPTSTR pszString)
 }
 
 
-BOOL CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hList, ListBox_HScrollHook);
 
@@ -1587,9 +1587,9 @@ BOOL CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
       }
 
    if (oldProc)
-      return (BOOL)CallWindowProc ((WNDPROC)oldProc, hList, msg, wp, lp);
+      return CallWindowProc ((WNDPROC)oldProc, hList, msg, wp, lp);
    else
-      return (BOOL)DefWindowProc (hList, msg, wp, lp);
+      return DefWindowProc (hList, msg, wp, lp);
 }
 
 

diff --git a/src/WINNT/afsapplib/fastlist.cpp b/src/WINNT/afsapplib/fastlist.cpp
index 3603a76..2eb31a5 100644 (file)
--- a/src/WINNT/afsapplib/fastlist.cpp
+++ b/src/WINNT/afsapplib/fastlist.cpp
@@ -220,8 +220,8 @@ void CloseGlobalBitmap (void);
 BOOL OpenGlobalArray (size_t cObjects);
 void CloseGlobalArray (void);
 
-BOOL CALLBACK FastList_ControlProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp);
-BOOL CALLBACK FastList_ParentProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK FastList_ControlProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK FastList_ParentProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp);
 
 void FastList_OnCreate (HWND hList);
 void FastList_OnDestroy (HWND hList);
@@ -447,7 +447,7 @@ void CloseGlobalArray (void)
 }
 
 
-BOOL CALLBACK FastList_ControlProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK FastList_ControlProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
 {
    switch (msg)
       {
@@ -681,7 +681,7 @@ BOOL CALLBACK FastList_ControlProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
 }
 
 
-BOOL CALLBACK FastList_ParentProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK FastList_ParentProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID oldProc = Subclass_FindNextHook (hDlg, FastList_ParentProc);
 

diff --git a/src/WINNT/afsapplib/resize.cpp b/src/WINNT/afsapplib/resize.cpp
index 8ab9f0f..1baad3a 100644 (file)
--- a/src/WINNT/afsapplib/resize.cpp
+++ b/src/WINNT/afsapplib/resize.cpp
@@ -96,7 +96,7 @@ void           FindSplitterMinMax         (HWND, SplitterData *, LONG,
 
 void FindResizeLimits (HWND hWnd, LONG *pcxMin, LONG *pcxMax, LONG *pcyMin, LONG *pcyMax, rwWindowData * = 0);
 
-BOOL CALLBACK Resize_DialogProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK Resize_DialogProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 
 
 /*
@@ -894,7 +894,7 @@ void FindResizeLimits (HWND hWnd, LONG *pcxMin, LONG *pcxMax, LONG *pcyMin, LONG
 }
 
 
-BOOL CALLBACK Resize_DialogProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK Resize_DialogProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
    PVOID fnNext = Subclass_FindNextHook (hWnd, Resize_DialogProc);
 

diff --git a/src/WINNT/afsapplib/subclass.cpp b/src/WINNT/afsapplib/subclass.cpp
index 26e2ab4..8ac0d7c 100644 (file)
--- a/src/WINNT/afsapplib/subclass.cpp
+++ b/src/WINNT/afsapplib/subclass.cpp
@@ -21,7 +21,7 @@ extern "C" {
  *
  */
 
-LONG CALLBACK Subclass_WndProc (HWND hTarget, UINT msg, WPARAM wp, LPARAM lp);
+HRESULT CALLBACK Subclass_WndProc (HWND hTarget, UINT msg, WPARAM wp, LPARAM lp);
 
 
 /*
@@ -214,7 +214,7 @@ PVOID Subclass_FindNextHook (HWND hTarget, PVOID wndProc)
 }
 
 
-LONG CALLBACK Subclass_WndProc (HWND hTarget, UINT msg, WPARAM wp, LPARAM lp)
+HRESULT CALLBACK Subclass_WndProc (HWND hTarget, UINT msg, WPARAM wp, LPARAM lp)
 {
    size_t iTarget;
    for (iTarget = 0; iTarget < nTargets; ++iTarget)

diff --git a/src/WINNT/client_config/lang/en_US/afs_config.rc b/src/WINNT/client_config/lang/en_US/afs_config.rc
index 07d429d..d276771 100644 (file)
--- a/src/WINNT/client_config/lang/en_US/afs_config.rc
+++ b/src/WINNT/client_config/lang/en_US/afs_config.rc
@@ -735,12 +735,12 @@ BEGIN
     IDS_SVRCOL_SERVER       "Address"
     IDS_SVRCOL_COMMENT      "Server Name"
     IDS_TIP_DRIVES          "Tip: You can connect a network drive mapping by checking the box next to the mapping's drive letter."
-    IDS_MAP_LETTER          "Drive *:"
+    IDS_MAP_LETTER          "*:"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_DRIVE_MAP           "Drive %1: \t%2"
+    IDS_DRIVE_MAP           "%1: \t%2"
     IDS_ERROR_MAP           "Error Mapping Network Drive"
     IDS_ERROR_MAP_DESC      "AFS was unable to map the network drive to the specified path in AFS. Check to make sure the drive letter is not currently in use.\n\nError: 0x%1."
     IDS_ERROR_UNMAP         "Error Mapping Network Drive"