From ac87d3e3b29fead6e30514535b8cf87dcc66304e Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 19 Apr 2025 09:53:31 +1000 Subject: Decrease warnings for reinterpret_cast since it is a common Win32 idiom to pass pointers as integers to window procedures. --- win32/ScintillaWin.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index f31d1291f..bfa5dbb1f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -2111,10 +2111,10 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP case EM_GETSEL: if (wParam) { - *reinterpret_cast(wParam) = static_cast(SelectionStart().Position()); + *static_cast(PtrFromUPtr(wParam)) = static_cast(SelectionStart().Position()); } if (lParam) { - *reinterpret_cast(lParam) = static_cast(SelectionEnd().Position()); + *static_cast(PtrFromSPtr(lParam)) = static_cast(SelectionEnd().Position()); } return MAKELRESULT(SelectionStart().Position(), SelectionEnd().Position()); @@ -2122,7 +2122,7 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP if (lParam == 0) { return 0; } - CHARRANGE *pCR = reinterpret_cast(lParam); + CHARRANGE *pCR = static_cast(PtrFromSPtr(lParam)); pCR->cpMin = static_cast(SelectionStart().Position()); pCR->cpMax = static_cast(SelectionEnd().Position()); } @@ -2146,7 +2146,7 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP if (lParam == 0) { return 0; } - const CHARRANGE *pCR = reinterpret_cast(lParam); + const CHARRANGE *pCR = static_cast(PtrFromSPtr(lParam)); sel.selType = Selection::SelTypes::stream; if (pCR->cpMin == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); @@ -4039,14 +4039,14 @@ LRESULT PASCAL ScintillaWin::CTWndProc( sptr_t ScintillaWin::DirectFunction( sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam) { - ScintillaWin *sci = reinterpret_cast(ptr); + ScintillaWin *sci = static_cast(PtrFromSPtr(ptr)); PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), nullptr)); return sci->WndProc(static_cast(iMessage), wParam, lParam); } sptr_t ScintillaWin::DirectStatusFunction( sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam, int *pStatus) { - ScintillaWin *sci = reinterpret_cast(ptr); + ScintillaWin *sci = static_cast(PtrFromSPtr(ptr)); PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), nullptr)); const sptr_t returnValue = sci->WndProc(static_cast(iMessage), wParam, lParam); *pStatus = static_cast(sci->errorStatus); -- cgit v1.2.3