Mike McCormack : comctl32: Fix some gcc 4.1 warnings caused by
windowsx. h macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 3 08:47:19 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 2dfe50aa3f91888fd1ac14731229e475a3545248
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dfe50aa3f91888fd1ac14731229e475a3545248
Author: Mike McCormack <mike at codeweavers.com>
Date: Fri Mar 3 12:25:36 2006 +0900
comctl32: Fix some gcc 4.1 warnings caused by windowsx.h macros.
---
dlls/comctl32/listview.c | 12 ++++++------
dlls/comctl32/pager.c | 11 +++++------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index f51b34d..9210e8d 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5819,7 +5819,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_UP;
- ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
+ SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask)
@@ -5854,7 +5854,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_DOWN;
- ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
+ SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask)
@@ -5890,7 +5890,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_LEFT;
- ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
+ SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask)
@@ -5926,7 +5926,7 @@ static INT LISTVIEW_GetNextItem(LISTVIEW
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_RIGHT;
- ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
+ SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask)
@@ -8907,7 +8907,7 @@ static void LISTVIEW_UpdateSize(LISTVIEW
hl.prc = &infoPtr->rcList;
hl.pwpos = ℘
- Header_Layout(infoPtr->hwndHeader, &hl);
+ SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl );
SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags);
@@ -8985,7 +8985,7 @@ static INT LISTVIEW_StyleChanged(LISTVIE
hl.prc = &infoPtr->rcList;
hl.pwpos = ℘
- Header_Layout(infoPtr->hwndHeader, &hl);
+ SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl );
SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags);
}
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index cd25159..15e0e09 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -59,7 +59,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "windowsx.h"
#include "commctrl.h"
#include "comctl32.h"
#include "wine/debug.h"
@@ -1315,7 +1314,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg,
return PAGER_Destroy (infoPtr);
case WM_SIZE:
- return PAGER_Size (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+ return PAGER_Size (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
case WM_NCPAINT:
return PAGER_NCPaint (infoPtr, (HRGN)wParam);
@@ -1330,18 +1329,18 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg,
return PAGER_NCCalcSize (infoPtr, wParam, (LPRECT)lParam);
case WM_NCHITTEST:
- return PAGER_NCHitTest (infoPtr, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+ return PAGER_NCHitTest (infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
case WM_MOUSEMOVE:
if (infoPtr->bForward && infoPtr->hwndChild)
PostMessageW(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam);
- return PAGER_MouseMove (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+ return PAGER_MouseMove (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
case WM_LBUTTONDOWN:
- return PAGER_LButtonDown (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+ return PAGER_LButtonDown (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
case WM_LBUTTONUP:
- return PAGER_LButtonUp (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+ return PAGER_LButtonUp (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
case WM_ERASEBKGND:
return PAGER_EraseBackground (infoPtr, (HDC)wParam);
More information about the wine-cvs
mailing list