SLOWORD and SHIWORD do not exist on Win32 (reported by Filip Navara).
This commit is contained in:
parent
c05bbb9357
commit
9d61596624
|
@ -444,7 +444,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EM_SETSEL16:
|
case EM_SETSEL16:
|
||||||
if (SLOWORD(lParam) == -1)
|
if ((short)LOWORD(lParam) == -1)
|
||||||
EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE);
|
EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE);
|
||||||
else
|
else
|
||||||
EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE);
|
EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE);
|
||||||
|
@ -500,8 +500,8 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EM_LINESCROLL16:
|
case EM_LINESCROLL16:
|
||||||
wParam = (WPARAM)(INT)SHIWORD(lParam);
|
wParam = (WPARAM)(INT)(SHORT)HIWORD(lParam);
|
||||||
lParam = (LPARAM)(INT)SLOWORD(lParam);
|
lParam = (LPARAM)(INT)(SHORT)LOWORD(lParam);
|
||||||
/* fall through */
|
/* fall through */
|
||||||
case EM_LINESCROLL:
|
case EM_LINESCROLL:
|
||||||
result = (LRESULT)EDIT_EM_LineScroll(es, (INT)wParam, (INT)lParam);
|
result = (LRESULT)EDIT_EM_LineScroll(es, (INT)wParam, (INT)lParam);
|
||||||
|
@ -722,7 +722,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
/* The following EM_xxx are new to win95 and don't exist for 16 bit */
|
/* The following EM_xxx are new to win95 and don't exist for 16 bit */
|
||||||
|
|
||||||
case EM_SETMARGINS:
|
case EM_SETMARGINS:
|
||||||
EDIT_EM_SetMargins(es, (INT)wParam, SLOWORD(lParam), SHIWORD(lParam));
|
EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EM_GETMARGINS:
|
case EM_GETMARGINS:
|
||||||
|
@ -738,7 +738,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EM_CHARFROMPOS:
|
case EM_CHARFROMPOS:
|
||||||
result = EDIT_EM_CharFromPos(es, SLOWORD(lParam), SHIWORD(lParam));
|
result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* End of the EM_ messages which were in numerical order; what order
|
/* End of the EM_ messages which were in numerical order; what order
|
||||||
|
@ -808,7 +808,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_CONTEXTMENU:
|
case WM_CONTEXTMENU:
|
||||||
EDIT_WM_ContextMenu(es, SLOWORD(lParam), SHIWORD(lParam));
|
EDIT_WM_ContextMenu(es, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_COPY:
|
case WM_COPY:
|
||||||
|
@ -862,7 +862,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_HSCROLL:
|
case WM_HSCROLL:
|
||||||
result = EDIT_WM_HScroll(es, LOWORD(wParam), SHIWORD(wParam));
|
result = EDIT_WM_HScroll(es, LOWORD(wParam), (short)HIWORD(wParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_KEYDOWN:
|
case WM_KEYDOWN:
|
||||||
|
@ -878,7 +878,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_LBUTTONDOWN:
|
case WM_LBUTTONDOWN:
|
||||||
result = EDIT_WM_LButtonDown(es, (DWORD)wParam, SLOWORD(lParam), SHIWORD(lParam));
|
result = EDIT_WM_LButtonDown(es, wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_LBUTTONUP:
|
case WM_LBUTTONUP:
|
||||||
|
@ -901,7 +901,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_MOUSEMOVE:
|
case WM_MOUSEMOVE:
|
||||||
result = EDIT_WM_MouseMove(es, SLOWORD(lParam), SHIWORD(lParam));
|
result = EDIT_WM_MouseMove(es, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_PAINT:
|
case WM_PAINT:
|
||||||
|
@ -950,7 +950,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_VSCROLL:
|
case WM_VSCROLL:
|
||||||
result = EDIT_WM_VScroll(es, LOWORD(wParam), SHIWORD(wParam));
|
result = EDIT_WM_VScroll(es, LOWORD(wParam), (short)HIWORD(wParam));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_MOUSEWHEEL:
|
case WM_MOUSEWHEEL:
|
||||||
|
@ -963,7 +963,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
result = DefWindowProcW(hwnd, msg, wParam, lParam);
|
result = DefWindowProcW(hwnd, msg, wParam, lParam);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
gcWheelDelta -= SHIWORD(wParam);
|
gcWheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam);
|
||||||
if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
|
if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
|
||||||
{
|
{
|
||||||
int cLineScroll= (int) min((UINT) es->line_count, pulScrollLines);
|
int cLineScroll= (int) min((UINT) es->line_count, pulScrollLines);
|
||||||
|
@ -1271,7 +1271,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
|
||||||
*/
|
*/
|
||||||
static void EDIT_CalcLineWidth_SL(EDITSTATE *es)
|
static void EDIT_CalcLineWidth_SL(EDITSTATE *es)
|
||||||
{
|
{
|
||||||
es->text_width = SLOWORD(EDIT_EM_PosFromChar(es, strlenW(es->text), FALSE));
|
es->text_width = (short)LOWORD(EDIT_EM_PosFromChar(es, strlenW(es->text), FALSE));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
|
@ -1484,8 +1484,8 @@ static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT
|
||||||
else
|
else
|
||||||
rc->top = es->format_rect.top;
|
rc->top = es->format_rect.top;
|
||||||
rc->bottom = rc->top + es->line_height;
|
rc->bottom = rc->top + es->line_height;
|
||||||
rc->left = (scol == 0) ? es->format_rect.left : SLOWORD(EDIT_EM_PosFromChar(es, line_index + scol, TRUE));
|
rc->left = (scol == 0) ? es->format_rect.left : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + scol, TRUE));
|
||||||
rc->right = (ecol == -1) ? es->format_rect.right : SLOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE));
|
rc->right = (ecol == -1) ? es->format_rect.right : (short)LOWORD(EDIT_EM_PosFromChar(es, line_index + ecol, TRUE));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1817,8 +1817,8 @@ static void EDIT_MoveDown_ML(EDITSTATE *es, BOOL extend)
|
||||||
INT e = es->selection_end;
|
INT e = es->selection_end;
|
||||||
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
||||||
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
||||||
INT x = SLOWORD(pos);
|
INT x = (short)LOWORD(pos);
|
||||||
INT y = SHIWORD(pos);
|
INT y = (short)HIWORD(pos);
|
||||||
|
|
||||||
e = EDIT_CharFromPos(es, x, y + es->line_height, &after_wrap);
|
e = EDIT_CharFromPos(es, x, y + es->line_height, &after_wrap);
|
||||||
if (!extend)
|
if (!extend)
|
||||||
|
@ -1909,8 +1909,8 @@ static void EDIT_MovePageDown_ML(EDITSTATE *es, BOOL extend)
|
||||||
INT e = es->selection_end;
|
INT e = es->selection_end;
|
||||||
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
||||||
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
||||||
INT x = SLOWORD(pos);
|
INT x = (short)LOWORD(pos);
|
||||||
INT y = SHIWORD(pos);
|
INT y = (short)HIWORD(pos);
|
||||||
|
|
||||||
e = EDIT_CharFromPos(es, x,
|
e = EDIT_CharFromPos(es, x,
|
||||||
y + (es->format_rect.bottom - es->format_rect.top),
|
y + (es->format_rect.bottom - es->format_rect.top),
|
||||||
|
@ -1937,8 +1937,8 @@ static void EDIT_MovePageUp_ML(EDITSTATE *es, BOOL extend)
|
||||||
INT e = es->selection_end;
|
INT e = es->selection_end;
|
||||||
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
||||||
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
||||||
INT x = SLOWORD(pos);
|
INT x = (short)LOWORD(pos);
|
||||||
INT y = SHIWORD(pos);
|
INT y = (short)HIWORD(pos);
|
||||||
|
|
||||||
e = EDIT_CharFromPos(es, x,
|
e = EDIT_CharFromPos(es, x,
|
||||||
y - (es->format_rect.bottom - es->format_rect.top),
|
y - (es->format_rect.bottom - es->format_rect.top),
|
||||||
|
@ -1965,8 +1965,8 @@ static void EDIT_MoveUp_ML(EDITSTATE *es, BOOL extend)
|
||||||
INT e = es->selection_end;
|
INT e = es->selection_end;
|
||||||
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
BOOL after_wrap = (es->flags & EF_AFTER_WRAP);
|
||||||
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
LRESULT pos = EDIT_EM_PosFromChar(es, e, after_wrap);
|
||||||
INT x = SLOWORD(pos);
|
INT x = (short)LOWORD(pos);
|
||||||
INT y = SHIWORD(pos);
|
INT y = (short)HIWORD(pos);
|
||||||
|
|
||||||
e = EDIT_CharFromPos(es, x, y - es->line_height, &after_wrap);
|
e = EDIT_CharFromPos(es, x, y - es->line_height, &after_wrap);
|
||||||
if (!extend)
|
if (!extend)
|
||||||
|
@ -2063,8 +2063,8 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev)
|
||||||
TRACE("line=%d\n", line);
|
TRACE("line=%d\n", line);
|
||||||
|
|
||||||
pos = EDIT_EM_PosFromChar(es, EDIT_EM_LineIndex(es, line), FALSE);
|
pos = EDIT_EM_PosFromChar(es, EDIT_EM_LineIndex(es, line), FALSE);
|
||||||
x = SLOWORD(pos);
|
x = (short)LOWORD(pos);
|
||||||
y = SHIWORD(pos);
|
y = (short)HIWORD(pos);
|
||||||
li = EDIT_EM_LineIndex(es, line);
|
li = EDIT_EM_LineIndex(es, line);
|
||||||
ll = EDIT_EM_LineLength(es, li);
|
ll = EDIT_EM_LineLength(es, li);
|
||||||
s = min(es->selection_start, es->selection_end);
|
s = min(es->selection_start, es->selection_end);
|
||||||
|
@ -2135,7 +2135,7 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos,
|
||||||
BOOL after_wrap)
|
BOOL after_wrap)
|
||||||
{
|
{
|
||||||
LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap);
|
LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap);
|
||||||
SetCaretPos(SLOWORD(res), SHIWORD(res));
|
SetCaretPos((short)LOWORD(res), (short)HIWORD(res));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2776,7 +2776,7 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dy = 0;
|
dy = 0;
|
||||||
x_offset_in_pixels = SLOWORD(EDIT_EM_PosFromChar(es, es->x_offset, FALSE));
|
x_offset_in_pixels = (short)LOWORD(EDIT_EM_PosFromChar(es, es->x_offset, FALSE));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (-dx > x_offset_in_pixels)
|
if (-dx > x_offset_in_pixels)
|
||||||
|
@ -3076,7 +3076,7 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
|
||||||
|
|
||||||
l = EDIT_EM_LineFromChar(es, es->selection_end);
|
l = EDIT_EM_LineFromChar(es, es->selection_end);
|
||||||
li = EDIT_EM_LineIndex(es, l);
|
li = EDIT_EM_LineIndex(es, l);
|
||||||
x = SLOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP));
|
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP));
|
||||||
vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
|
vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height;
|
||||||
if (l >= es->y_offset + vlc)
|
if (l >= es->y_offset + vlc)
|
||||||
dy = l - vlc + 1 - es->y_offset;
|
dy = l - vlc + 1 - es->y_offset;
|
||||||
|
@ -3103,13 +3103,13 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
|
||||||
if (!(es->style & ES_AUTOHSCROLL))
|
if (!(es->style & ES_AUTOHSCROLL))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
x = SLOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
||||||
format_width = es->format_rect.right - es->format_rect.left;
|
format_width = es->format_rect.right - es->format_rect.left;
|
||||||
if (x < es->format_rect.left) {
|
if (x < es->format_rect.left) {
|
||||||
goal = es->format_rect.left + format_width / HSCROLL_FRACTION;
|
goal = es->format_rect.left + format_width / HSCROLL_FRACTION;
|
||||||
do {
|
do {
|
||||||
es->x_offset--;
|
es->x_offset--;
|
||||||
x = SLOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
||||||
} while ((x < goal) && es->x_offset);
|
} while ((x < goal) && es->x_offset);
|
||||||
/* FIXME: use ScrollWindow() somehow to improve performance */
|
/* FIXME: use ScrollWindow() somehow to improve performance */
|
||||||
EDIT_UpdateText(es, NULL, TRUE);
|
EDIT_UpdateText(es, NULL, TRUE);
|
||||||
|
@ -3119,8 +3119,8 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
|
||||||
goal = es->format_rect.right - format_width / HSCROLL_FRACTION;
|
goal = es->format_rect.right - format_width / HSCROLL_FRACTION;
|
||||||
do {
|
do {
|
||||||
es->x_offset++;
|
es->x_offset++;
|
||||||
x = SLOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
x = (short)LOWORD(EDIT_EM_PosFromChar(es, es->selection_end, FALSE));
|
||||||
x_last = SLOWORD(EDIT_EM_PosFromChar(es, len, FALSE));
|
x_last = (short)LOWORD(EDIT_EM_PosFromChar(es, len, FALSE));
|
||||||
} while ((x > goal) && (x_last > es->format_rect.right));
|
} while ((x > goal) && (x_last > es->format_rect.right));
|
||||||
/* FIXME: use ScrollWindow() somehow to improve performance */
|
/* FIXME: use ScrollWindow() somehow to improve performance */
|
||||||
EDIT_UpdateText(es, NULL, TRUE);
|
EDIT_UpdateText(es, NULL, TRUE);
|
||||||
|
|
|
@ -2729,8 +2729,8 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
|
||||||
* struct to properly handle synthetic messages. They are already
|
* struct to properly handle synthetic messages. They are already
|
||||||
* in screen coordinates.
|
* in screen coordinates.
|
||||||
*/
|
*/
|
||||||
mt.pt.x = SLOWORD(msg.lParam);
|
mt.pt.x = (short)LOWORD(msg.lParam);
|
||||||
mt.pt.y = SHIWORD(msg.lParam);
|
mt.pt.y = (short)HIWORD(msg.lParam);
|
||||||
|
|
||||||
/* Find a menu for this mouse event */
|
/* Find a menu for this mouse event */
|
||||||
hmenu = MENU_PtMenu( mt.hTopMenu, mt.pt );
|
hmenu = MENU_PtMenu( mt.hTopMenu, mt.pt );
|
||||||
|
|
|
@ -1357,8 +1357,8 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
|
||||||
case WM_LBUTTONDOWN:
|
case WM_LBUTTONDOWN:
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
SCROLL_TrackScrollBar( hwnd, SB_CTL, pt );
|
SCROLL_TrackScrollBar( hwnd, SB_CTL, pt );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1367,8 +1367,8 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
|
||||||
case WM_SYSTIMER:
|
case WM_SYSTIMER:
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
SCROLL_HandleScrollEvent( hwnd, SB_CTL, message, pt );
|
SCROLL_HandleScrollEvent( hwnd, SB_CTL, message, pt );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1394,8 +1394,8 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
INT nItem, nWidth;
|
INT nItem, nWidth;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
|
||||||
pt.x = (INT)SLOWORD(lParam);
|
pt.x = (INT)(SHORT)LOWORD(lParam);
|
||||||
pt.y = (INT)SHIWORD(lParam);
|
pt.y = (INT)(SHORT)HIWORD(lParam);
|
||||||
HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
|
HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
|
||||||
|
|
||||||
if (infoPtr->bPressed) {
|
if (infoPtr->bPressed) {
|
||||||
|
@ -1505,8 +1505,8 @@ HEADER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
INT nItem, nWidth;
|
INT nItem, nWidth;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
|
||||||
pt.x = (INT)SLOWORD(lParam);
|
pt.x = (INT)(SHORT)LOWORD(lParam);
|
||||||
pt.y = (INT)SHIWORD(lParam);
|
pt.y = (INT)(SHORT)HIWORD(lParam);
|
||||||
HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
|
HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem);
|
||||||
|
|
||||||
if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) {
|
if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) {
|
||||||
|
|
|
@ -8708,7 +8708,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
return LISTVIEW_SetColumnOrderArray(infoPtr, (INT)wParam, (LPINT)lParam);
|
return LISTVIEW_SetColumnOrderArray(infoPtr, (INT)wParam, (LPINT)lParam);
|
||||||
|
|
||||||
case LVM_SETCOLUMNWIDTH:
|
case LVM_SETCOLUMNWIDTH:
|
||||||
return LISTVIEW_SetColumnWidth(infoPtr, (INT)wParam, SLOWORD(lParam));
|
return LISTVIEW_SetColumnWidth(infoPtr, (INT)wParam, (short)LOWORD(lParam));
|
||||||
|
|
||||||
case LVM_SETEXTENDEDLISTVIEWSTYLE:
|
case LVM_SETEXTENDEDLISTVIEWSTYLE:
|
||||||
return LISTVIEW_SetExtendedListViewStyle(infoPtr, (DWORD)wParam, (DWORD)lParam);
|
return LISTVIEW_SetExtendedListViewStyle(infoPtr, (DWORD)wParam, (DWORD)lParam);
|
||||||
|
@ -8727,7 +8727,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam);
|
return LISTVIEW_SetHoverTime(infoPtr, (DWORD)wParam);
|
||||||
|
|
||||||
case LVM_SETICONSPACING:
|
case LVM_SETICONSPACING:
|
||||||
return LISTVIEW_SetIconSpacing(infoPtr, SLOWORD(lParam), SHIWORD(lParam));
|
return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
|
|
||||||
case LVM_SETIMAGELIST:
|
case LVM_SETIMAGELIST:
|
||||||
return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam);
|
return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam);
|
||||||
|
@ -8749,7 +8749,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
case LVM_SETITEMPOSITION:
|
case LVM_SETITEMPOSITION:
|
||||||
{
|
{
|
||||||
POINT pt = { SLOWORD(lParam), SHIWORD(lParam) };
|
POINT pt;
|
||||||
|
pt.x = (short)LOWORD(lParam);
|
||||||
|
pt.y = (short)HIWORD(lParam);
|
||||||
return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, pt);
|
return LISTVIEW_SetItemPosition(infoPtr, (INT)wParam, pt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8887,7 +8889,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
return LISTVIEW_SetRedraw(infoPtr, (BOOL)wParam);
|
return LISTVIEW_SetRedraw(infoPtr, (BOOL)wParam);
|
||||||
|
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
return LISTVIEW_Size(infoPtr, (int)SLOWORD(lParam), (int)SHIWORD(lParam));
|
return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
|
|
||||||
case WM_STYLECHANGED:
|
case WM_STYLECHANGED:
|
||||||
return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam);
|
return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam);
|
||||||
|
|
|
@ -2024,7 +2024,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
return MONTHCAL_SetFocus(hwnd, wParam, lParam);
|
return MONTHCAL_SetFocus(hwnd, wParam, lParam);
|
||||||
|
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
return MONTHCAL_Size(hwnd, (int)SLOWORD(lParam), (int)SHIWORD(lParam));
|
return MONTHCAL_Size(hwnd, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
|
|
||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
return MONTHCAL_Create(hwnd, wParam, lParam);
|
return MONTHCAL_Create(hwnd, wParam, lParam);
|
||||||
|
|
|
@ -1118,8 +1118,8 @@ PAGER_NCHitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
|
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
ScreenToClient (hwnd, &pt);
|
ScreenToClient (hwnd, &pt);
|
||||||
return PAGER_HitTest(hwnd, &pt);
|
return PAGER_HitTest(hwnd, &pt);
|
||||||
|
@ -1198,8 +1198,8 @@ PAGER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
INT hit;
|
INT hit;
|
||||||
HDC hdc;
|
HDC hdc;
|
||||||
|
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TRACE("[%p] to (%ld,%ld)\n", hwnd, pt.x, pt.y);
|
TRACE("[%p] to (%ld,%ld)\n", hwnd, pt.x, pt.y);
|
||||||
ClientToScreen(hwnd, &pt);
|
ClientToScreen(hwnd, &pt);
|
||||||
|
@ -1284,10 +1284,10 @@ PAGER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
POINT pt;
|
POINT pt;
|
||||||
INT hit;
|
INT hit;
|
||||||
|
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
|
TRACE("[%p] at (%d,%d)\n", hwnd, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
|
|
||||||
hit = PAGER_HitTest(hwnd, &pt);
|
hit = PAGER_HitTest(hwnd, &pt);
|
||||||
|
|
||||||
|
@ -1353,10 +1353,10 @@ PAGER_NCLButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
|
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
|
TRACE("[%p] at (%ld,%ld)\n", hwnd, pt.x, pt.y );
|
||||||
MapWindowPoints(0, hwnd, &pt, 1);
|
MapWindowPoints(0, hwnd, &pt, 1);
|
||||||
lParam = MAKELONG(pt.x, pt.y);
|
lParam = MAKELONG(pt.x, pt.y);
|
||||||
return PAGER_LButtonDown (hwnd, wParam, lParam);
|
return PAGER_LButtonDown (hwnd, wParam, lParam);
|
||||||
|
@ -1454,12 +1454,12 @@ PAGER_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
/* note that WM_SIZE is sent whenever NCCalcSize resizes the client wnd */
|
/* note that WM_SIZE is sent whenever NCCalcSize resizes the client wnd */
|
||||||
|
|
||||||
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
|
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
|
||||||
TRACE("[%p] %dx%d\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
|
TRACE("[%p] %dx%d\n", hwnd, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||||
|
|
||||||
if (PAGER_IsHorizontal(hwnd))
|
if (PAGER_IsHorizontal(hwnd))
|
||||||
infoPtr->nHeight = SHIWORD(lParam);
|
infoPtr->nHeight = (short)HIWORD(lParam);
|
||||||
else
|
else
|
||||||
infoPtr->nWidth = SLOWORD(lParam);
|
infoPtr->nWidth = (short)LOWORD(lParam);
|
||||||
|
|
||||||
return PAGER_RecalcSize(hwnd);
|
return PAGER_RecalcSize(hwnd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3780,8 +3780,8 @@ TREEVIEW_TrackMouse(TREEVIEW_INFO *infoPtr, POINT pt)
|
||||||
{
|
{
|
||||||
if (msg.message == WM_MOUSEMOVE)
|
if (msg.message == WM_MOUSEMOVE)
|
||||||
{
|
{
|
||||||
pt.x = SLOWORD(msg.lParam);
|
pt.x = (short)LOWORD(msg.lParam);
|
||||||
pt.y = SHIWORD(msg.lParam);
|
pt.y = (short)HIWORD(msg.lParam);
|
||||||
if (PtInRect(&r, pt))
|
if (PtInRect(&r, pt))
|
||||||
continue;
|
continue;
|
||||||
else
|
else
|
||||||
|
@ -3825,8 +3825,8 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam)
|
||||||
KillTimer(infoPtr->hwnd, TV_EDIT_TIMER);
|
KillTimer(infoPtr->hwnd, TV_EDIT_TIMER);
|
||||||
}
|
}
|
||||||
|
|
||||||
hit.pt.x = SLOWORD(lParam);
|
hit.pt.x = (short)LOWORD(lParam);
|
||||||
hit.pt.y = SHIWORD(lParam);
|
hit.pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
wineItem = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit);
|
wineItem = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit);
|
||||||
if (!wineItem)
|
if (!wineItem)
|
||||||
|
@ -3896,8 +3896,8 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ht.pt.x = SLOWORD(lParam);
|
ht.pt.x = (short)LOWORD(lParam);
|
||||||
ht.pt.y = SHIWORD(lParam);
|
ht.pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TREEVIEW_HitTest(infoPtr, &ht);
|
TREEVIEW_HitTest(infoPtr, &ht);
|
||||||
TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem));
|
TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem));
|
||||||
|
@ -4043,8 +4043,8 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ht.pt.x = SLOWORD(lParam);
|
ht.pt.x = (short)LOWORD(lParam);
|
||||||
ht.pt.y = SHIWORD(lParam);
|
ht.pt.y = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TREEVIEW_HitTest(infoPtr, &ht);
|
TREEVIEW_HitTest(infoPtr, &ht);
|
||||||
|
|
||||||
|
@ -5103,8 +5103,8 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
if (wParam == SIZE_RESTORED)
|
if (wParam == SIZE_RESTORED)
|
||||||
{
|
{
|
||||||
infoPtr->clientWidth = SLOWORD(lParam);
|
infoPtr->clientWidth = (short)LOWORD(lParam);
|
||||||
infoPtr->clientHeight = SHIWORD(lParam);
|
infoPtr->clientHeight = (short)HIWORD(lParam);
|
||||||
|
|
||||||
TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL);
|
TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL);
|
||||||
TREEVIEW_SetFirstVisible(infoPtr, infoPtr->firstVisible, TRUE);
|
TREEVIEW_SetFirstVisible(infoPtr, infoPtr->firstVisible, TRUE);
|
||||||
|
|
|
@ -868,7 +868,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
|
||||||
return MAKELONG(infoPtr->CurVal, temp ? 0 : 1);
|
return MAKELONG(infoPtr->CurVal, temp ? 0 : 1);
|
||||||
|
|
||||||
case UDM_SETPOS:
|
case UDM_SETPOS:
|
||||||
temp = SLOWORD(lParam);
|
temp = (short)LOWORD(lParam);
|
||||||
TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd);
|
TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd);
|
||||||
if(!UPDOWN_InBounds(infoPtr, temp)) {
|
if(!UPDOWN_InBounds(infoPtr, temp)) {
|
||||||
if(temp < infoPtr->MinVal) temp = infoPtr->MinVal;
|
if(temp < infoPtr->MinVal) temp = infoPtr->MinVal;
|
||||||
|
@ -884,8 +884,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
|
||||||
|
|
||||||
case UDM_SETRANGE:
|
case UDM_SETRANGE:
|
||||||
/* we must have: */
|
/* we must have: */
|
||||||
infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
|
infoPtr->MaxVal = (short)(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
|
||||||
infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
|
infoPtr->MinVal = (short)HIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
|
||||||
/* |Max-Min| <= UD_MAXVAL */
|
/* |Max-Min| <= UD_MAXVAL */
|
||||||
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
|
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
|
||||||
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
|
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
|
||||||
|
|
|
@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
|
||||||
|
|
||||||
static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
|
static INT_PTR CALLBACK ColorDlgProc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
|
||||||
|
|
||||||
#define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = SLOWORD(lp); (p)->y = SHIWORD(lp); } while(0)
|
#define CONV_LPARAMTOPOINT(lp,p) do { (p)->x = (short)LOWORD(lp); (p)->y = (short)HIWORD(lp); } while(0)
|
||||||
|
|
||||||
static const COLORREF predefcolors[6][8]=
|
static const COLORREF predefcolors[6][8]=
|
||||||
{
|
{
|
||||||
|
|
|
@ -1894,8 +1894,8 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
|
||||||
|
|
||||||
SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);
|
SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);
|
||||||
|
|
||||||
pt.x = SLOWORD(dwPoint);
|
pt.x = (short)LOWORD(dwPoint);
|
||||||
pt.y = SHIWORD(dwPoint);
|
pt.y = (short)HIWORD(dwPoint);
|
||||||
capturePoint = pt;
|
capturePoint = pt;
|
||||||
|
|
||||||
if (IsZoomed(hwnd) || !IsWindowVisible(hwnd) || (exstyle & WS_EX_MANAGED)) return;
|
if (IsZoomed(hwnd) || !IsWindowVisible(hwnd) || (exstyle & WS_EX_MANAGED)) return;
|
||||||
|
|
|
@ -304,7 +304,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
|
||||||
{
|
{
|
||||||
sum += lpDx[i];
|
sum += lpDx[i];
|
||||||
fSum = sum*ve_we+err;
|
fSum = sum*ve_we+err;
|
||||||
delta = SHIWORD(fSum)
|
delta = (short)HIWORD(fSum)
|
||||||
- X11DRV_cptable[pfo->fi->cptable].pTextWidth(
|
- X11DRV_cptable[pfo->fi->cptable].pTextWidth(
|
||||||
pfo, pitem->chars, pitem->nchars+1);
|
pfo, pitem->chars, pitem->nchars+1);
|
||||||
pitem->nchars++;
|
pitem->nchars++;
|
||||||
|
|
|
@ -336,8 +336,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
|
||||||
case WM_NCHITTEST:
|
case WM_NCHITTEST:
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
return NC_HandleNCHitTest( hwnd, pt );
|
return NC_HandleNCHitTest( hwnd, pt );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -364,8 +364,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
|
||||||
/* release capture if we took it on WM_NCRBUTTONDOWN */
|
/* release capture if we took it on WM_NCRBUTTONDOWN */
|
||||||
ReleaseCapture();
|
ReleaseCapture();
|
||||||
|
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
ClientToScreen(hwnd, &pt);
|
ClientToScreen(hwnd, &pt);
|
||||||
SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(pt.x, pt.y) );
|
SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(pt.x, pt.y) );
|
||||||
}
|
}
|
||||||
|
@ -391,8 +391,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
|
||||||
HMENU hMenu = wndPtr->hSysMenu;
|
HMENU hMenu = wndPtr->hSysMenu;
|
||||||
WIN_ReleasePtr( wndPtr );
|
WIN_ReleasePtr( wndPtr );
|
||||||
if (!hMenu) return 0;
|
if (!hMenu) return 0;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
hitcode = NC_HandleNCHitTest(hwnd, pt);
|
hitcode = NC_HandleNCHitTest(hwnd, pt);
|
||||||
|
|
||||||
/* Track system popup if click was in the caption area. */
|
/* Track system popup if click was in the caption area. */
|
||||||
|
|
|
@ -1369,8 +1369,8 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
|
||||||
{
|
{
|
||||||
HWND child;
|
HWND child;
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
child = ChildWindowFromPoint(hwnd, pt);
|
child = ChildWindowFromPoint(hwnd, pt);
|
||||||
|
|
||||||
TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y);
|
TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y);
|
||||||
|
|
|
@ -2177,8 +2177,8 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
|
||||||
case SC_HSCROLL:
|
case SC_HSCROLL:
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
NC_TrackScrollBar( hwnd, wParam, pt );
|
NC_TrackScrollBar( hwnd, wParam, pt );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -2186,8 +2186,8 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
|
||||||
case SC_MOUSEMENU:
|
case SC_MOUSEMENU:
|
||||||
{
|
{
|
||||||
POINT pt;
|
POINT pt;
|
||||||
pt.x = SLOWORD(lParam);
|
pt.x = (short)LOWORD(lParam);
|
||||||
pt.y = SHIWORD(lParam);
|
pt.y = (short)HIWORD(lParam);
|
||||||
MENU_TrackMouseMenuBar( hwnd, wParam & 0x000F, pt );
|
MENU_TrackMouseMenuBar( hwnd, wParam & 0x000F, pt );
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue