commit 83f52d11c16b61706029f48c2f2a00424e6ee64a
author Alexandre Julliard <julliard@winehq.org> Tue Sep 26 22:20:14 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 26 22:20:14 2000 +0000
tree d7f6b3738e23630cff44bf72965c1d6f509c18be
parent 4ca7e6343f9435e7fdb2b74d746014fe00a1a81f

Moved all Win16 definitions out of the standard Windows headers.

dlls/comctl32/treeview.c

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);