From a50e4972e5bce99a48113eabc56468fa10b3c31e Mon Sep 17 00:00:00 2001 From: Qi Dong Date: Sun, 25 Jun 2006 18:54:47 +0000 Subject: [PATCH] DEVEL15-windows-64bit-type-safety-20060625 Type casting (cherry picked from commit ebef2766358b8cca53efd5c12bc951198eb246e0) --- src/WINNT/afsapplib/al_creds.cpp | 6 ++-- src/WINNT/afsapplib/al_error.cpp | 4 +-- src/WINNT/afsapplib/al_help.cpp | 2 +- src/WINNT/afsapplib/al_misc.cpp | 14 +++++----- src/WINNT/afsapplib/al_progress.cpp | 6 ++-- src/WINNT/afsapplib/al_pump.cpp | 8 +++--- src/WINNT/afsapplib/al_wizard.cpp | 18 ++++++------ src/WINNT/afsapplib/checklist.cpp | 24 ++++++++-------- src/WINNT/afsapplib/ctl_date.cpp | 20 ++++++------- src/WINNT/afsapplib/ctl_elapsed.cpp | 12 ++++---- src/WINNT/afsapplib/ctl_sockaddr.cpp | 12 ++++---- src/WINNT/afsapplib/ctl_spinner.cpp | 20 ++++++------- src/WINNT/afsapplib/ctl_time.cpp | 12 ++++---- src/WINNT/afsapplib/dialog.cpp | 42 ++++++++++++++-------------- 14 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/WINNT/afsapplib/al_creds.cpp b/src/WINNT/afsapplib/al_creds.cpp index 3d5a64d62..c2af96241 100644 --- a/src/WINNT/afsapplib/al_creds.cpp +++ b/src/WINNT/afsapplib/al_creds.cpp @@ -177,7 +177,7 @@ BOOL AfsAppLib_ShowOpenCellDialog (LPOPENCELLDLG_PARAMS lpp) lpp->hCreds = AfsAppLib_GetCredentials (NULL); } - int rc = ModalDialogParam (lpp->idd, lpp->hParent, (DLGPROC)OpenCell_DlgProc, (LPARAM)lpp); + INT_PTR rc = ModalDialogParam (lpp->idd, lpp->hParent, (DLGPROC)OpenCell_DlgProc, (LPARAM)lpp); return (rc == IDOK) ? TRUE : FALSE; } @@ -480,7 +480,7 @@ BOOL AfsAppLib_ShowCredentialsDialog (LPCREDENTIALSDLG_PARAMS lpp) lpp->hCreds = AfsAppLib_GetCredentials (NULL); } - int rc = ModalDialogParam (lpp->idd, lpp->hParent, (DLGPROC)NewCreds_DlgProc, (LPARAM)lpp); + INT_PTR rc = ModalDialogParam (lpp->idd, lpp->hParent, (DLGPROC)NewCreds_DlgProc, (LPARAM)lpp); return (rc == IDOK) ? TRUE : FALSE; } @@ -834,7 +834,7 @@ BOOL AfsAppLib_CheckCredentials (LPCHECKCREDS_PARAMS lpp) pp.bcdp.idd = IDD_APPLIB_BADCREDS; } - int rc = ModalDialogParam (pp.bcdp.idd, pp.bcdp.hParent, (DLGPROC)BadCreds_DlgProc, (LPARAM)&pp); + INT_PTR rc = ModalDialogParam (pp.bcdp.idd, pp.bcdp.hParent, (DLGPROC)BadCreds_DlgProc, (LPARAM)&pp); if (rc == IDCANCEL) { fCredsOK = TRUE; // user says ignore bad credentials this time. diff --git a/src/WINNT/afsapplib/al_error.cpp b/src/WINNT/afsapplib/al_error.cpp index cc7399410..57c7242f3 100644 --- a/src/WINNT/afsapplib/al_error.cpp +++ b/src/WINNT/afsapplib/al_error.cpp @@ -42,7 +42,7 @@ void cdecl ErrorDialog (DWORD dwStatus, LPTSTR pszError, LPTSTR pszFmt, ...) { va_list arg; va_start (arg, pszFmt); - vErrorDialog (FALSE, dwStatus, (LONG)pszError, pszFmt, arg); + vErrorDialog (FALSE, dwStatus, (LONG)(LONG_PTR)pszError, pszFmt, arg); } void cdecl ErrorDialog (DWORD dwStatus, int idsError, LPTSTR pszFmt, ...) @@ -56,7 +56,7 @@ void cdecl FatalErrorDialog (DWORD dwStatus, LPTSTR pszError, LPTSTR pszFmt, ... { va_list arg; va_start (arg, pszFmt); - vErrorDialog (TRUE, dwStatus, (LONG)pszError, pszFmt, arg); + vErrorDialog (TRUE, dwStatus, (LONG)(LONG_PTR)pszError, pszFmt, arg); } void cdecl FatalErrorDialog (DWORD dwStatus, int idsError, LPTSTR pszFmt, ...) diff --git a/src/WINNT/afsapplib/al_help.cpp b/src/WINNT/afsapplib/al_help.cpp index 4e0e708f4..42d5d5cdf 100644 --- a/src/WINNT/afsapplib/al_help.cpp +++ b/src/WINNT/afsapplib/al_help.cpp @@ -131,7 +131,7 @@ BOOL AfsAppLib_HandleHelp (int idd, HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) else { if (g_szHelpfile) - WinHelp ((HWND)(lphi->hItemHandle), g_szHelpfile, HELP_WM_HELP, (DWORD)g_adh[ ih ].adwContext); + WinHelp ((HWND)(lphi->hItemHandle), g_szHelpfile, HELP_WM_HELP, (DWORD)(DWORD_PTR)g_adh[ ih ].adwContext); } rc = TRUE; diff --git a/src/WINNT/afsapplib/al_misc.cpp b/src/WINNT/afsapplib/al_misc.cpp index c86151055..72f3eb8c5 100644 --- a/src/WINNT/afsapplib/al_misc.cpp +++ b/src/WINNT/afsapplib/al_misc.cpp @@ -61,7 +61,7 @@ EXPORTED void AfsAppLib_SetAppInstance (HINSTANCE hInst) } -EXPORTED extern "C" BOOLEAN _stdcall DllEntryPoint (HANDLE hInst, DWORD dwReason, PVOID pReserved) +EXPORTED BOOLEAN _stdcall DllEntryPoint (HANDLE hInst, DWORD dwReason, PVOID pReserved) { switch (dwReason) { @@ -167,7 +167,7 @@ BOOL CALLBACK AnimationHook (HWND hIcon, UINT msg, WPARAM wp, LPARAM lp) { case WM_TIMER: int iFrame; - iFrame = GetWindowData (hIcon, GWD_ANIMATIONFRAME); + iFrame = (int)GetWindowData (hIcon, GWD_ANIMATIONFRAME); AfsAppLib_AnimateIcon (hIcon, &iFrame); SetWindowData (hIcon, GWD_ANIMATIONFRAME, iFrame); break; @@ -178,9 +178,9 @@ BOOL CALLBACK AnimationHook (HWND hIcon, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hIcon, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hIcon, msg, wp, lp); else - return DefWindowProc (hIcon, msg, wp, lp); + return (BOOL)DefWindowProc (hIcon, msg, wp, lp); } @@ -208,7 +208,7 @@ void AfsAppLib_StopAnimation (HWND hIcon) BOOL CALLBACK AfsAppLib_TranslateErrorFunc (LPTSTR pszText, ULONG code, LANGID idLanguage) { DWORD idClient; - if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0) + if ((idClient = (DWORD)AfsAppLib_GetAdminServerClientID()) != 0) { ULONG status; return asc_ErrorCodeTranslate (idClient, code, idLanguage, pszText, &status); @@ -263,7 +263,7 @@ LPCELLLIST AfsAppLib_GetCellList (HKEY hkBase, LPTSTR pszRegPath) if (RegOpenKey (hkBase, pszRegPath, &hk) == 0) { TCHAR szCell[ cchNAME ]; - for (size_t ii = 0; RegEnumKey (hk, ii, szCell, cchNAME) == 0; ++ii) + for (size_t ii = 0; RegEnumKey (hk, (DWORD)ii, szCell, cchNAME) == 0; ++ii) { if (REALLOC (lpcl->aCells, lpcl->nCells, 1+ii, cREALLOC_CELLLIST)) { @@ -461,7 +461,7 @@ BOOL AfsAppLib_GetLocalCell (LPTSTR pszCell, ULONG *pStatus) if (szCell[0] == TEXT('\0')) { DWORD idClient; - if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0) + if ((idClient = (DWORD)AfsAppLib_GetAdminServerClientID()) != 0) { rc = asc_LocalCellGet (idClient, szCell, &status); } diff --git a/src/WINNT/afsapplib/al_progress.cpp b/src/WINNT/afsapplib/al_progress.cpp index 6daa74e76..14d9f21c5 100644 --- a/src/WINNT/afsapplib/al_progress.cpp +++ b/src/WINNT/afsapplib/al_progress.cpp @@ -63,7 +63,7 @@ PROGRESSDISPLAY::~PROGRESSDISPLAY (void) void PROGRESSDISPLAY::Init (HWND hWnd) { - SetWindowLongPtr (hWnd, DWLP_USER, (LONG)this); + SetWindowLongPtr (hWnd, DWLP_USER, (LONG_PTR)this); Subclass_AddHook (hWnd, PROGRESSDISPLAY::ProgressDisplay_HookProc); m_msgFinish = 0; @@ -204,9 +204,9 @@ BOOL CALLBACK PROGRESSDISPLAY::ProgressDisplay_HookProc (HWND hWnd, UINT msg, WP } if (oldproc) - return CallWindowProc ((WNDPROC)oldproc, hWnd, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldproc, hWnd, msg, wp, lp); else - return DefWindowProc (hWnd, msg, wp, lp); + return (BOOL)DefWindowProc (hWnd, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/al_pump.cpp b/src/WINNT/afsapplib/al_pump.cpp index 313f8dde8..a3d7525df 100644 --- a/src/WINNT/afsapplib/al_pump.cpp +++ b/src/WINNT/afsapplib/al_pump.cpp @@ -81,9 +81,9 @@ BOOL CALLBACK Modeless_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); else - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -211,9 +211,9 @@ BOOL CALLBACK WindowData_HookProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp); else - return DefWindowProc (hWnd, msg, wp, lp); + return (BOOL)DefWindowProc (hWnd, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/al_wizard.cpp b/src/WINNT/afsapplib/al_wizard.cpp index ec5b2bd98..a036ffeb3 100644 --- a/src/WINNT/afsapplib/al_wizard.cpp +++ b/src/WINNT/afsapplib/al_wizard.cpp @@ -639,7 +639,7 @@ BOOL WIZARD::SendStateCommand (int st, WIZARD_COMMAND wc) LPWIZARD_STATE pState; if ((pState = FindState (st)) != NULL) { - rc = CallWindowProc ((WNDPROC)(pState->dlgproc), NULL, WM_COMMAND, MAKEWPARAM(IDC_WIZARD,(WORD)wc), (LPARAM)this); + rc = (BOOL)CallWindowProc ((WNDPROC)(pState->dlgproc), NULL, WM_COMMAND, MAKEWPARAM(IDC_WIZARD,(WORD)wc), (LPARAM)this); } return rc; @@ -694,9 +694,9 @@ BOOL CALLBACK WIZARD::Template_LeftPaneHook (HWND hLHS, UINT msg, WPARAM wp, LPA } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hLHS, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hLHS, msg, wp, lp); else - return DefWindowProc (hLHS, msg, wp, lp); + return (BOOL)DefWindowProc (hLHS, msg, wp, lp); } @@ -704,11 +704,11 @@ BOOL WIZARD::Template_ForwardMessage (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { HWND hRHS; if ((hRHS = GetRightHandWindow()) != NULL) - return SendMessage (hRHS, msg, wp, lp); + return (BOOL)SendMessage (hRHS, msg, wp, lp); LPWIZARD_STATE pState; if ((pState = FindState (m_stCurrent)) != NULL) - return CallWindowProc ((WNDPROC)(pState->dlgproc), hWnd, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)(pState->dlgproc), hWnd, msg, wp, lp); return FALSE; } @@ -993,9 +993,9 @@ BOOL CALLBACK WIZARD::Background_PaintHook (HWND hBkg, UINT msg, WPARAM wp, LPAR } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hBkg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hBkg, msg, wp, lp); else - return DefWindowProc (hBkg, msg, wp, lp); + return (BOOL)DefWindowProc (hBkg, msg, wp, lp); } @@ -1044,8 +1044,8 @@ void WIZARD::Background_OnSize (void) for (COLORREF clr = clrWASH_BRIGHTEST; clr >= clrWASH_DARKEST; clr -= clrWASH_INCREMENT) { RECT rSection = rr; - rSection.top = yy; - rSection.bottom = yy +cy; + rSection.top = (LONG)yy; + rSection.bottom = (LONG)(yy +cy); HBRUSH hbr = CreateSolidBrush (ToPALETTERGB(clr)); FillRect (hdcTarget, &rSection, hbr); DeleteObject (hbr); diff --git a/src/WINNT/afsapplib/checklist.cpp b/src/WINNT/afsapplib/checklist.cpp index 7b2ef6e37..39801fd05 100644 --- a/src/WINNT/afsapplib/checklist.cpp +++ b/src/WINNT/afsapplib/checklist.cpp @@ -218,9 +218,9 @@ BOOL CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp) } if (procListbox) - hResult = CallWindowProc ((WNDPROC)LongToPtr(procListbox), hList, msg, wp, lp); + hResult = (BOOL)CallWindowProc ((WNDPROC)LongToPtr(procListbox), hList, msg, wp, lp); else - hResult = DefWindowProc (hList, msg, wp, lp); + hResult = (BOOL)DefWindowProc (hList, msg, wp, lp); return (hResult?TRUE:FALSE); } @@ -263,13 +263,13 @@ BOOL CALLBACK CheckList_DialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) if (clrNew != clrLast) hbrStatic = CreateSolidBrush (clrLast = clrNew); SetBkColor ((HDC)wp, clrLast); - return (BOOL)hbrStatic; + return (BOOL)(INT_PTR)hbrStatic; } break; } if (procOld) - return CallWindowProc ((WNDPROC)procOld, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)procOld, hDlg, msg, wp, lp); else return FALSE; } @@ -365,7 +365,7 @@ void CheckList_OnDrawCheckbox (HWND hList, int id, LPDRAWITEMSTRUCT lpds) // step 2e: draw the background field // BOOL fHit = CheckList_OnHitTest (hList, id); - BOOL fChecked = LB_GetCheck (hList, id); + BOOL fChecked = (BOOL)LB_GetCheck (hList, id); clrBack = GetSysColor (COLOR_WINDOW); if ( (lpds->itemState & ODS_DISABLED) || @@ -549,7 +549,7 @@ void CheckList_OnMouseMove (HWND hList) { if (GetCapture() == hList) { - int ii = LB_GetHit (hList); + int ii = (int)LB_GetHit (hList); if (ii != -1) { CheckList_RedrawCheck (hList, ii); @@ -566,7 +566,7 @@ void CheckList_OnButtonDown (HWND hList) POINT pt = { LOWORD(dw), HIWORD(dw) }; ScreenToClient (hList, &pt); - int ii = SendMessage (hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(pt.x,pt.y)); + int ii = (int)SendMessage (hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(pt.x,pt.y)); if (HIWORD(ii) == 0) { BOOL fHit = CheckList_OnHitTest (hList, ii); @@ -588,7 +588,7 @@ void CheckList_OnButtonUp (HWND hList) { ReleaseCapture(); - int ii = LB_GetHit (hList); + int ii = (int)LB_GetHit (hList); if (ii != -1) { LB_SetHit (hList, -1); @@ -599,7 +599,7 @@ void CheckList_OnButtonUp (HWND hList) CheckList_RedrawCheck (hList, ii); else { - BOOL fChecked = LB_GetCheck (hList, ii); + BOOL fChecked = (BOOL)LB_GetCheck (hList, ii); CheckList_OnSetCheck_Selected (hList, !fChecked); } } @@ -615,10 +615,10 @@ void CheckList_OnDoubleClick (HWND hList) POINT pt = { LOWORD(dw), HIWORD(dw) }; ScreenToClient (hList, &pt); - int ii = SendMessage (hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(pt.x,pt.y)); + int ii = (int)SendMessage (hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(pt.x,pt.y)); if (HIWORD(ii) == 0) { - BOOL fChecked = LB_GetCheck (hList, ii); + BOOL fChecked = (BOOL)LB_GetCheck (hList, ii); CheckList_OnSetCheck_Selected (hList, !fChecked); } @@ -648,7 +648,7 @@ void CheckList_OnSetCheck_Selected (HWND hList, BOOL fCheck) } else // single-sel listbox { - int ii = SendMessage (hList, LB_GETCURSEL, 0, 0); + int ii = (int)SendMessage (hList, LB_GETCURSEL, 0, 0); if (ii != LB_ERR) { LB_SetCheck (hList, ii, fCheck); diff --git a/src/WINNT/afsapplib/ctl_date.cpp b/src/WINNT/afsapplib/ctl_date.cpp index c46b1b014..570afb7ff 100644 --- a/src/WINNT/afsapplib/ctl_date.cpp +++ b/src/WINNT/afsapplib/ctl_date.cpp @@ -262,7 +262,7 @@ BOOL CALLBACK DateProc (HWND hDate, UINT msg, WPARAM wp, LPARAM lp) } } - return DefWindowProc (hDate, msg, wp, lp); + return (BOOL)DefWindowProc (hDate, msg, wp, lp); } @@ -333,7 +333,7 @@ void Date_OnCreate (DateInfo *pdi) WS_CHILD | WS_TABSTOP | ES_RIGHT | ES_NUMBER | ES_MULTILINE, xx, yy, cx, cy, GetParent(pdi->hDate), - (HMENU)id, + (HMENU)(INT_PTR)id, THIS_HINST, 0); xx += cx; @@ -374,7 +374,7 @@ void Date_OnCreate (DateInfo *pdi) WS_CHILD | WS_TABSTOP | ES_RIGHT | ES_NUMBER | ES_MULTILINE, xx, yy, cx, cy, GetParent(pdi->hDate), - (HMENU)id, + (HMENU)(INT_PTR)id, THIS_HINST, 0); xx += cx; @@ -414,9 +414,9 @@ void Date_OnCreate (DateInfo *pdi) WS_CHILD | WS_TABSTOP | ES_RIGHT | ES_NUMBER | ES_MULTILINE, xx, yy, cx, cy, GetParent(pdi->hDate), - (HMENU)id, + (HMENU)(INT_PTR)id, THIS_HINST, - 0); + 0); xx += cx; switch (pdi->dwFormat) @@ -557,7 +557,7 @@ BOOL CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) else clr = GetSysColor (COLOR_BTNFACE); SetBkColor ((HDC)wp, clr); - return (BOOL)CreateSolidBrush (clr); + return (BOOL)(INT_PTR)CreateSolidBrush (clr); } } break; @@ -582,9 +582,9 @@ BOOL CALLBACK DateDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); else - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -618,9 +618,9 @@ BOOL CALLBACK DateEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp) PVOID oldProc = Subclass_FindNextHook (hEdit, DateEditProc); if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); else - return DefWindowProc (hEdit, msg, wp, lp); + return (BOOL)DefWindowProc (hEdit, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/ctl_elapsed.cpp b/src/WINNT/afsapplib/ctl_elapsed.cpp index 77fa7945f..9d93667c6 100644 --- a/src/WINNT/afsapplib/ctl_elapsed.cpp +++ b/src/WINNT/afsapplib/ctl_elapsed.cpp @@ -274,7 +274,7 @@ BOOL CALLBACK ElapsedProc (HWND hElapsed, UINT msg, WPARAM wp, LPARAM lp) } } - return DefWindowProc (hElapsed, msg, wp, lp); + return (BOOL)DefWindowProc (hElapsed, msg, wp, lp); } @@ -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)CreateSolidBrush (clr); + return (BOOL)(INT_PTR)CreateSolidBrush (clr); } } break; @@ -540,9 +540,9 @@ BOOL CALLBACK ElapsedDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); else - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -576,9 +576,9 @@ BOOL CALLBACK ElapsedEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp) PVOID oldProc = Subclass_FindNextHook (hEdit, ElapsedEditProc); if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); else - return DefWindowProc (hEdit, msg, wp, lp); + return (BOOL)DefWindowProc (hEdit, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/ctl_sockaddr.cpp b/src/WINNT/afsapplib/ctl_sockaddr.cpp index 2a2ef6e6b..19ae13218 100644 --- a/src/WINNT/afsapplib/ctl_sockaddr.cpp +++ b/src/WINNT/afsapplib/ctl_sockaddr.cpp @@ -236,7 +236,7 @@ BOOL CALLBACK SockAddrProc (HWND hSockAddr, UINT msg, WPARAM wp, LPARAM lp) } } - return DefWindowProc (hSockAddr, msg, wp, lp); + return (BOOL)DefWindowProc (hSockAddr, msg, wp, lp); } @@ -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)CreateSolidBrush (clr); + return (BOOL)(INT_PTR)CreateSolidBrush (clr); } } break; @@ -510,9 +510,9 @@ BOOL CALLBACK SockAddrDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); else - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -556,9 +556,9 @@ BOOL CALLBACK SockAddrEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp) PVOID oldProc = Subclass_FindNextHook (hEdit, SockAddrEditProc); if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); else - return DefWindowProc (hEdit, msg, wp, lp); + return (BOOL)DefWindowProc (hEdit, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/ctl_spinner.cpp b/src/WINNT/afsapplib/ctl_spinner.cpp index 56a03dc87..983bc0f0d 100644 --- a/src/WINNT/afsapplib/ctl_spinner.cpp +++ b/src/WINNT/afsapplib/ctl_spinner.cpp @@ -136,7 +136,7 @@ BOOL RegisterSpinnerClass (void) if (GetClassInfo (THIS_HINST, TEXT("scrollbar"), &wc)) { - oldSpinnerProc = (LONG)wc.lpfnWndProc; + oldSpinnerProc = (LONG)(LONG_PTR)wc.lpfnWndProc; wc.lpfnWndProc = (WNDPROC)SpinnerProc; wc.style = CS_GLOBALCLASS; @@ -265,7 +265,7 @@ BOOL CALLBACK SpinnerProc (HWND hSpinner, UINT msg, WPARAM wp, LPARAM lp) if (msg == WM_CREATE) { - aSpinners[ (int)((LPCREATESTRUCT)lp)->lpCreateParams ].hSpinner = hSpinner; + aSpinners[ (int)(INT_PTR)((LPCREATESTRUCT)lp)->lpCreateParams ].hSpinner = hSpinner; } SpinnerInfo *psi = Spinner_FindSpinnerInfo (hSpinner, NULL); @@ -321,9 +321,9 @@ BOOL CALLBACK SpinnerProc (HWND hSpinner, UINT msg, WPARAM wp, LPARAM lp) } if (oldSpinnerProc == 0) - return DefWindowProc (hSpinner, msg, wp, lp); + return (BOOL)DefWindowProc (hSpinner, msg, wp, lp); else - return CallWindowProc ((WNDPROC)oldSpinnerProc, hSpinner, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)(LONG_PTR)oldSpinnerProc, hSpinner, msg, wp, lp); } @@ -416,9 +416,9 @@ BOOL CALLBACK SpinnerDialogProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc == 0) - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); else - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); } @@ -457,7 +457,7 @@ BOOL CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp) break; case WM_ENABLE: - EnableWindow (psi->hSpinner, wp); + EnableWindow (psi->hSpinner, (BOOL)wp); break; case WM_KILLFOCUS: @@ -501,9 +501,9 @@ BOOL CALLBACK SpinnerBuddyProc (HWND hBuddy, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hBuddy, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hBuddy, msg, wp, lp); else - return DefWindowProc (hBuddy, msg, wp, lp); + return (BOOL)DefWindowProc (hBuddy, msg, wp, lp); } @@ -663,7 +663,7 @@ BOOL Spinner_OnSetRect (SpinnerInfo *psi, WPARAM wp, LPARAM lp) BOOL Spinner_OnGetSpinner (SpinnerInfo *psi, WPARAM wp, LPARAM lp) { - return (BOOL)psi->hSpinner; + return (BOOL)(INT_PTR)psi->hSpinner; } diff --git a/src/WINNT/afsapplib/ctl_time.cpp b/src/WINNT/afsapplib/ctl_time.cpp index 65060cee6..fb65d3253 100644 --- a/src/WINNT/afsapplib/ctl_time.cpp +++ b/src/WINNT/afsapplib/ctl_time.cpp @@ -271,7 +271,7 @@ BOOL CALLBACK TimeProc (HWND hTime, UINT msg, WPARAM wp, LPARAM lp) } } - return DefWindowProc (hTime, msg, wp, lp); + return (BOOL)DefWindowProc (hTime, msg, wp, lp); } @@ -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)CreateSolidBrush (clr); + return (BOOL)(INT_PTR)CreateSolidBrush (clr); } } break; @@ -606,9 +606,9 @@ BOOL CALLBACK TimeDlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hDlg, msg, wp, lp); else - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -642,9 +642,9 @@ BOOL CALLBACK TimeEditProc (HWND hEdit, UINT msg, WPARAM wp, LPARAM lp) PVOID oldProc = Subclass_FindNextHook (hEdit, TimeEditProc); if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hEdit, msg, wp, lp); else - return DefWindowProc (hEdit, msg, wp, lp); + return (BOOL)DefWindowProc (hEdit, msg, wp, lp); } diff --git a/src/WINNT/afsapplib/dialog.cpp b/src/WINNT/afsapplib/dialog.cpp index 809da3d5a..3139c11d5 100644 --- a/src/WINNT/afsapplib/dialog.cpp +++ b/src/WINNT/afsapplib/dialog.cpp @@ -194,7 +194,7 @@ BOOL CALLBACK PropTab_HookProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) } } - return DefWindowProc (hDlg, msg, wp, lp); + return (BOOL)DefWindowProc (hDlg, msg, wp, lp); } @@ -207,7 +207,7 @@ LPPROPSHEET PropSheet_Create (LONG idsTitle, BOOL fContextHelp, HWND hParent, LP psh->sh.dwFlags = PSH_MODELESS | ((fContextHelp) ? PSH_HASHELP : 0); psh->sh.hwndParent = hParent; psh->sh.hInstance = THIS_HINST; - psh->sh.pszCaption = (HIWORD(idsTitle)) ? (LPTSTR)idsTitle : FormatString(TEXT("%1"),TEXT("%m"),idsTitle); + psh->sh.pszCaption = (HIWORD(idsTitle)) ? (LPTSTR)(LONG_PTR)idsTitle : FormatString(TEXT("%1"),TEXT("%m"),idsTitle); psh->fMadeCaption = (HIWORD(idsTitle)) ? FALSE : TRUE; psh->lpUser = lp; return psh; @@ -220,7 +220,7 @@ LPPROPSHEET PropSheet_Create (int idsTitle, BOOL fContextHelp, HWND hParent, LPA LPPROPSHEET PropSheet_Create (LPTSTR pszTitle, BOOL fContextHelp, HWND hParent, LPARAM lp) { - return PropSheet_Create ((LONG)pszTitle, fContextHelp, hParent, lp); + return PropSheet_Create ((LONG)(LONG_PTR)pszTitle, fContextHelp, hParent, lp); } @@ -244,7 +244,7 @@ BOOL PropSheet_AddTab (LPPROPSHEET psh, LONG idsTitle, int idd, DLGPROC dlgproc, if (HIWORD(idsTitle)) { - psp.pszTitle = (LPTSTR)idsTitle; + psp.pszTitle = (LPTSTR)(LONG_PTR)idsTitle; psp.dwFlags |= PSP_USETITLE; } else if (idsTitle != 0) @@ -284,7 +284,7 @@ BOOL PropSheet_AddTab (LPPROPSHEET psh, int idsTitle, int idd, DLGPROC dlgproc, BOOL PropSheet_AddTab (LPPROPSHEET psh, LPTSTR pszTitle, int idd, DLGPROC dlgproc, LPARAM lpUser, BOOL fHelpButton, BOOL fStartPage) { - return PropSheet_AddTab (psh, (LONG)pszTitle, idd, dlgproc, lpUser, fHelpButton, fStartPage); + return PropSheet_AddTab (psh, (LONG)(LONG_PTR)pszTitle, idd, dlgproc, lpUser, fHelpButton, fStartPage); } @@ -306,9 +306,9 @@ BOOL CALLBACK PropSheet_HookProc (HWND hSheet, UINT msg, WPARAM wp, LPARAM lp) BOOL rc; if (oldproc) - rc = CallWindowProc ((WNDPROC)oldproc, hSheet, msg, wp, lp); + rc = (BOOL)CallWindowProc ((WNDPROC)oldproc, hSheet, msg, wp, lp); else - rc = DefWindowProc (hSheet, msg, wp, lp); + rc = (BOOL)DefWindowProc (hSheet, msg, wp, lp); switch (msg) { @@ -824,7 +824,7 @@ HLISTITEM cdecl FL_AddItem (HWND hList, LPVIEWINFO lpvi, LPARAM lp, int iImage1, } else { - FastList_SetItemText (hList, hItem, ii, apszColumns[ iColumn ]); + FastList_SetItemText (hList, hItem, (int)ii, apszColumns[ (int)iColumn ]); } } @@ -1073,7 +1073,7 @@ void LV_RestoreView (HWND hList, LPVIEWINFO lpvi) lvc.fmt = (lpvi->cxColumns[ iColumn ] & COLUMN_RIGHTJUST) ? LVCFMT_RIGHT : (lpvi->cxColumns[ iColumn ] & COLUMN_CENTERJUST) ? LVCFMT_CENTER : LVCFMT_LEFT; lvc.pszText = szText; lvc.cx = (lpvi->cxColumns[ iColumn ] & (~COLUMN_JUSTMASK)); - lvc.iSubItem = ii; + lvc.iSubItem = (int)ii; ListView_InsertColumn (hList, ii, &lvc); } @@ -1137,10 +1137,10 @@ BOOL CALLBACK LV_SortView_Numeric (LPARAM lp1, LPARAM lp2, LPARAM lpSort) int ii1 = LV_GetIndex (lpvsi->hList, lp1); int ii2 = LV_GetIndex (lpvsi->hList, lp2); - LV_GetItemText (lpvsi->hList, ii1, lpvsi->iColSort, szText); + LV_GetItemText (lpvsi->hList, ii1, (short)lpvsi->iColSort, szText); d1 = atof (szText); - LV_GetItemText (lpvsi->hList, ii2, lpvsi->iColSort, szText); + LV_GetItemText (lpvsi->hList, ii2, (short)lpvsi->iColSort, szText); d2 = atof (szText); if (lpvsi->fAscending) @@ -1159,8 +1159,8 @@ BOOL CALLBACK LV_SortView_Alphabetic (LPARAM lp1, LPARAM lp2, LPARAM lpSort) int ii1 = LV_GetIndex (lpvsi->hList, lp1); int ii2 = LV_GetIndex (lpvsi->hList, lp2); - LV_GetItemText (lpvsi->hList, ii1, lpvsi->iColSort, szText1); - LV_GetItemText (lpvsi->hList, ii2, lpvsi->iColSort, szText2); + LV_GetItemText (lpvsi->hList, ii1, (short)lpvsi->iColSort, szText1); + LV_GetItemText (lpvsi->hList, ii2, (short)lpvsi->iColSort, szText2); if (lpvsi->fAscending) return lstrcmp (szText2, szText1); @@ -1234,7 +1234,7 @@ void cdecl LV_AddItem (HWND hList, LPVIEWINFO lpvi, int index, LPARAM lp, int iI } else { - ListView_SetItemText (hList, dw, ii, apszColumns[ iColumn ]); + ListView_SetItemText (hList, dw, (int)ii, apszColumns[ iColumn ]); } } } @@ -1449,7 +1449,7 @@ UINT LB_AddItem (HWND hList, LPCTSTR psz, LPARAM lp) void LB_EnsureVisible (HWND hList, UINT index) { int cyItem; - if ((cyItem = SendMessage (hList, LB_GETITEMHEIGHT, 0, 0)) != 0) + if ((cyItem = (int)SendMessage (hList, LB_GETITEMHEIGHT, 0, 0)) != 0) { RECT rClient; GetClientRect (hList, &rClient); @@ -1457,7 +1457,7 @@ void LB_EnsureVisible (HWND hList, UINT index) if ((cWindow = cyRECT(rClient) / cyItem) == 0) cWindow = 1; - int idxTop = SendMessage (hList, LB_GETTOPINDEX, 0, 0); + int idxTop = (int)SendMessage (hList, LB_GETTOPINDEX, 0, 0); if (index < (UINT)idxTop) { SendMessage (hList, LB_SETTOPINDEX, index, 0); @@ -1555,7 +1555,7 @@ BOOL CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp) case LB_DELETESTRING: { int iItemSkip = (int)wp; - int iItemMax = SendMessage (hList, LB_GETCOUNT, 0, 0); + int iItemMax = (int)SendMessage (hList, LB_GETCOUNT, 0, 0); int cchMax = 0; int iItem; @@ -1563,7 +1563,7 @@ BOOL CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp) { if (iItem == iItemSkip) continue; - int cch = SendMessage (hList, LB_GETTEXTLEN, (WPARAM)iItem, 0); + int cch = (int)SendMessage (hList, LB_GETTEXTLEN, (WPARAM)iItem, 0); cchMax = max (cch, cchMax); } @@ -1587,9 +1587,9 @@ BOOL CALLBACK ListBox_HScrollHook (HWND hList, UINT msg, WPARAM wp, LPARAM lp) } if (oldProc) - return CallWindowProc ((WNDPROC)oldProc, hList, msg, wp, lp); + return (BOOL)CallWindowProc ((WNDPROC)oldProc, hList, msg, wp, lp); else - return DefWindowProc (hList, msg, wp, lp); + return (BOOL)DefWindowProc (hList, msg, wp, lp); } @@ -1803,7 +1803,7 @@ void StopHourGlass (void) void DisplayContextMenu (HMENU hm, POINT ptScreen, HWND hParent) { HMENU hmDummy = CreateMenu(); - InsertMenu (hmDummy, 0, MF_POPUP, (UINT)hm, NULL); + InsertMenu (hmDummy, 0, MF_POPUP, (UINT)(UINT_PTR)hm, NULL); TrackPopupMenu (GetSubMenu (hmDummy, 0), TPM_LEFTALIGN | TPM_RIGHTBUTTON, -- 2.39.5