Michael Stefaniuc : msvfw32: Remove some Win64 compiler warnings.
Module: wine Branch: master Commit: caa604b563d3b4c2629188999ebfb08f1987bebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa604b563d3b4c2629188999e... Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 9 23:34:30 2009 +0100 msvfw32: Remove some Win64 compiler warnings. - Use HandleToLong to get to the user handle. - Use GetWindowLongPtr to retrieve a pointer. --- dlls/msvfw32/mciwnd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 61b13aa..ff8a036 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -449,7 +449,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam); - mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0); + mwi = (MCIWndInfo*)GetWindowLongPtrW(hWnd, 0); if (!mwi && wMsg != WM_CREATE) return DefWindowProcW(hWnd, wMsg, wParam, lParam); @@ -568,7 +568,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa hCursor = SetCursor(hCursor); mci_open.lpstrElementName = (LPWSTR)lParam; - wsprintfW(aliasW, formatW, (int)hWnd + 1); + wsprintfW(aliasW, formatW, HandleToLong(hWnd) + 1); mci_open.lpstrAlias = aliasW; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_OPEN, MCI_OPEN_ELEMENT | MCI_OPEN_ALIAS | MCI_WAIT, @@ -588,7 +588,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa } mwi->mci = mci_open.wDeviceID; - mwi->alias = (int)hWnd + 1; + mwi->alias = HandleToLong(hWnd) + 1; mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); strcpyW(mwi->lpName, (LPWSTR)lParam);
participants (1)
-
Alexandre Julliard