diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-02 23:19:27 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-02 23:19:27 +1000 |
| commit | 42ce770c6497f865ce34a93f63cc376c3152f3c4 (patch) | |
| tree | fe434ad7ed4e7f63bb12c9fb1f4e128aacbd29ba /win32/ScintillaWin.cxx | |
| parent | 5a1126b68cbcd6b49534e9daa0eebe3a354e3f73 (diff) | |
| download | scintilla-mirror-42ce770c6497f865ce34a93f63cc376c3152f3c4.tar.gz | |
Use exact SciFnDirect function signature for DirectFunction as earlier version
depended on undefined behaviour.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index e084354f1..3f8cfabe6 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -213,7 +213,7 @@ class ScintillaWin : HWND MainHWND(); static sptr_t DirectFunction( - ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam); + sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam); static sptr_t PASCAL SWndProc( HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam); static sptr_t PASCAL CTWndProc( @@ -2775,9 +2775,9 @@ sptr_t PASCAL ScintillaWin::CTWndProc( } sptr_t ScintillaWin::DirectFunction( - ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) { + sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam) { PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), NULL)); - return sci->WndProc(iMessage, wParam, lParam); + return reinterpret_cast<ScintillaWin *>(ptr)->WndProc(iMessage, wParam, lParam); } extern "C" |