Commit a2daceb7 authored by Vitaliy Margolen's avatar Vitaliy Margolen Committed by Alexandre Julliard

atl: Use CallWindowProc instead of calling old window proc directly.

parent b4b88b05
...@@ -848,7 +848,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam, ...@@ -848,7 +848,7 @@ static LRESULT IOCS_OnWndProc( IOCS *This, HWND hWnd, UINT uMsg, WPARAM wParam,
break; break;
} }
return OrigWndProc( hWnd, uMsg, wParam, lParam ); return CallWindowProcW( OrigWndProc, hWnd, uMsg, wParam, lParam );
} }
static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) static LRESULT CALLBACK AtlHost_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam )
...@@ -862,9 +862,8 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su ...@@ -862,9 +862,8 @@ static HRESULT IOCS_Attach( IOCS *This, HWND hWnd, IUnknown *pUnkControl ) /* su
This->hWnd = hWnd; This->hWnd = hWnd;
IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control ); IUnknown_QueryInterface( pUnkControl, &IID_IOleObject, (void**)&This->control );
IOleObject_SetClientSite( This->control, THIS2IOLECLIENTSITE( This ) ); IOleObject_SetClientSite( This->control, THIS2IOLECLIENTSITE( This ) );
This->OrigWndProc = (WNDPROC) GetWindowLongPtrW( This->hWnd, GWLP_WNDPROC );
SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This ); SetWindowLongPtrW( hWnd, GWLP_USERDATA, (ULONG_PTR) This );
SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc ); This->OrigWndProc = (WNDPROC)SetWindowLongPtrW( hWnd, GWLP_WNDPROC, (ULONG_PTR) AtlHost_wndproc );
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment