Moved all Win16 definitions out of the standard Windows headers.
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index e312bd7..84915f8 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -262,7 +262,7 @@
UNKNOWN_PARAM(PBM_DELTAPOS, wParam, lParam);
temp = infoPtr->CurVal;
if(wParam != 0){
- infoPtr->CurVal += (UINT16)wParam;
+ infoPtr->CurVal += (WORD)wParam;
PROGRESS_CoercePos (hwnd);
PROGRESS_Refresh (hwnd);
}
@@ -273,7 +273,7 @@
UNKNOWN_PARAM(PBM_SETPOS, wParam, lParam);
temp = infoPtr->CurVal;
if(temp != wParam){
- infoPtr->CurVal = (UINT16)wParam;
+ infoPtr->CurVal = (WORD)wParam;
PROGRESS_CoercePos(hwnd);
PROGRESS_Refresh (hwnd);
}
@@ -297,7 +297,7 @@
if (lParam)
UNKNOWN_PARAM(PBM_SETSTEP, wParam, lParam);
temp = infoPtr->Step;
- infoPtr->Step = (UINT16)wParam;
+ infoPtr->Step = (WORD)wParam;
return temp;
case PBM_STEPIT:
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 4102825..ae11be3 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -29,8 +29,8 @@
typedef struct
{
- UINT16 numParts;
- UINT16 textHeight;
+ WORD numParts;
+ WORD textHeight;
UINT height;
BOOL simple;
HWND hwndToolTip;
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 19e6a61..c8554ae 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3526,8 +3526,8 @@
{
if (msg.message == WM_MOUSEMOVE)
{
- pt.x = (LONG)(INT16)LOWORD(msg.lParam);
- pt.y = (LONG)(INT16)HIWORD(msg.lParam);
+ pt.x = SLOWORD(msg.lParam);
+ pt.y = SHIWORD(msg.lParam);
if (PtInRect(&r, pt))
continue;
else
@@ -3571,8 +3571,8 @@
KillTimer(infoPtr->hwnd, TV_EDIT_TIMER);
}
- hit.pt.x = (LONG)(INT16)LOWORD(lParam);
- hit.pt.y = (LONG)(INT16)HIWORD(lParam);
+ hit.pt.x = SLOWORD(lParam);
+ hit.pt.y = SHIWORD(lParam);
wineItem = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit);
if (!wineItem)
@@ -3642,8 +3642,8 @@
return 0;
}
- ht.pt.x = (LONG)(INT16)LOWORD(lParam);
- ht.pt.y = (LONG)(INT16)HIWORD(lParam);
+ ht.pt.x = SLOWORD(lParam);
+ ht.pt.y = SHIWORD(lParam);
TREEVIEW_HitTest(infoPtr, &ht);
TRACE("item %d \n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem));
@@ -3791,8 +3791,8 @@
return 0;
}
- ht.pt.x = (LONG)(INT16)LOWORD(lParam);
- ht.pt.y = (LONG)(INT16)HIWORD(lParam);
+ ht.pt.x = SLOWORD(lParam);
+ ht.pt.y = SHIWORD(lParam);
TREEVIEW_HitTest(infoPtr, &ht);
@@ -4205,7 +4205,7 @@
case SB_THUMBPOSITION:
newFirstVisible = TREEVIEW_GetListItem(infoPtr,
infoPtr->root->firstChild,
- (LONG)(INT16)HIWORD(wParam));
+ (LONG)(SHORT)HIWORD(wParam));
break;
case SB_ENDSCROLL:
@@ -4265,7 +4265,7 @@
case SB_THUMBTRACK:
case SB_THUMBPOSITION:
- scrollX = (int)(INT16)HIWORD(wParam);
+ scrollX = (int)(SHORT)HIWORD(wParam);
break;
case SB_ENDSCROLL:
@@ -4655,8 +4655,8 @@
{
if (wParam == SIZE_RESTORED)
{
- infoPtr->clientWidth = (LONG)(INT16)LOWORD(lParam);
- infoPtr->clientHeight = (LONG)(INT16)HIWORD(lParam);
+ infoPtr->clientWidth = SLOWORD(lParam);
+ infoPtr->clientHeight = SHIWORD(lParam);
TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL);
TREEVIEW_SetFirstVisible(infoPtr, infoPtr->firstVisible, TRUE);
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 96a8b6f..24c716a 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -810,7 +810,8 @@
case WM_MOUSEMOVE:
if(UPDOWN_IsEnabled(hwnd)){
POINT pt;
- CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
+ pt.x = SLOWORD(lParam);
+ pt.y = SHIWORD(lParam);
UPDOWN_HandleMouseEvent (hwnd, message, pt );
}
break;
