ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: Fix some Win64 compiler warnings. 

- A HWND can be safely marshaled over a LONG as its payload is not
  a pointer but a user handle.
- Use GetWindowLongPtr instead of GetWindowLong to retrieve a pointer.
This commit is contained in:
Michael Stefaniuc 2009-02-06 23:46:59 +01:00 committed by Alexandre Julliard
parent df271e0e8f
commit fb9b95b7a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/riched20/txthost.c
View File

@ -258,14 +258,14 @@ HRESULT WINAPI ITextHostImpl_TxActivate(ITextHost *iface,
LONG *plOldState) LONG *plOldState)
{ {
ITextHostImpl *This = (ITextHostImpl *)iface; ITextHostImpl *This = (ITextHostImpl *)iface;
*plOldState = (LONG)SetActiveWindow(This->hWnd); *plOldState = HandleToLong(SetActiveWindow(This->hWnd));
return (*plOldState ? S_OK : E_FAIL); return (*plOldState ? S_OK : E_FAIL);
} }
HRESULT WINAPI ITextHostImpl_TxDeactivate(ITextHost *iface, HRESULT WINAPI ITextHostImpl_TxDeactivate(ITextHost *iface,
LONG lNewState) LONG lNewState)
{ {
HWND ret = SetActiveWindow((HWND)lNewState); HWND ret = SetActiveWindow(LongToHandle(lNewState));
return (ret ? S_OK : E_FAIL); return (ret ? S_OK : E_FAIL);
} }
@ -323,7 +323,7 @@ HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface,
DWORD *pdwScrollBar) DWORD *pdwScrollBar)
{ {
ITextHostImpl *This = (ITextHostImpl *)iface; ITextHostImpl *This = (ITextHostImpl *)iface;
ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongW(This->hWnd, 0); ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW(This->hWnd, 0);
const DWORD mask = WS_VSCROLL| const DWORD mask = WS_VSCROLL|
WS_HSCROLL| WS_HSCROLL|
ES_AUTOVSCROLL| ES_AUTOVSCROLL|