Release 961102
Sat Nov 2 12:50:40 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [files/dos_fs.c]
Added long file name mask in DOSFS_FindNext().
* [loader/pe_image.c] [loader/task.c]
Moved Win32 task startup into TASK_CallToStart().
* [objects/dc.c]
Fixed SetDCState() for memory DC (thanks to Constantine
Sapuntzakis for spotting this one).
* [windows/winpos.c]
Fixed WINPOS_ForceXWindowRaise() to preserve correct Z-order.
* [*/*]
Added Win32 version for many graphics functions.
Thu Oct 31 10:00:18 1996 Huw D. M. Davies <h.davies1@physics.oxford.ac.uk>
* [controls/button.c]
BUTTON_CheckAutoRadioButton() unchecks only auto radio buttons.
* [controls/edit.c]
EM_GETSEL result should have HIWORD(result) >= LOWORD(result); old
EDIT_EM_GetSel() renamed to EDIT_GetSel().
* [windows/dialog.c]
DS_LOCALEDIT is a dialog style not an edit style.
* [windows/winproc.c]
Stop stack trashing when wndPtr->text == NULL.
Tue Oct 29 23:35:04 1996 Constantine P Sapuntzakis <csapuntz@mit.edu>
* [windows/dce.c]
GetDCEx32 - The determination of whether to use the DC cache or
not should be independent of DCX_USESTYLE.
Sat Oct 26 17:31:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [files/directory.c]
Added errno.h to #includes
* [tools/makedep.c]
Close files once they have been processed.
diff --git a/controls/scroll.c b/controls/scroll.c
index 1364fc1..481f6cb 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -312,7 +312,7 @@
BOOL32 top_pressed, BOOL32 bottom_pressed )
{
HDC32 hdcMem = CreateCompatibleDC( hdc );
- HBITMAP32 hbmpPrev = SelectObject( hdcMem, vertical ?
+ HBITMAP32 hbmpPrev = SelectObject32( hdcMem, vertical ?
TOP_ARROW(infoPtr->flags, top_pressed)
: LEFT_ARROW(infoPtr->flags, top_pressed));
SetStretchBltMode( hdc, STRETCH_DELETESCANS );
@@ -323,9 +323,9 @@
SYSMETRICS_CXVSCROLL + 1, SYSMETRICS_CYHSCROLL + 1,
SRCCOPY );
- SelectObject( hdcMem, vertical ?
- BOTTOM_ARROW( infoPtr->flags, bottom_pressed )
- : RIGHT_ARROW( infoPtr->flags, bottom_pressed ) );
+ SelectObject32( hdcMem, vertical ?
+ BOTTOM_ARROW( infoPtr->flags, bottom_pressed )
+ : RIGHT_ARROW( infoPtr->flags, bottom_pressed ) );
if (vertical)
StretchBlt( hdc, rect->left, rect->bottom - arrowSize - 1,
rect->right - rect->left, arrowSize + 1,
@@ -338,7 +338,7 @@
hdcMem, 0, 0,
SYSMETRICS_CXVSCROLL + 1, SYSMETRICS_CYHSCROLL + 1,
SRCCOPY );
- SelectObject( hdcMem, hbmpPrev );
+ SelectObject32( hdcMem, hbmpPrev );
DeleteDC( hdcMem );
}
@@ -389,11 +389,11 @@
/* Select the correct brush and pen */
- SelectObject( hdc, sysColorObjects.hpenWindowFrame );
+ SelectObject32( hdc, sysColorObjects.hpenWindowFrame );
if ((flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)
{
/* This ought to be the color of the parent window */
- SelectObject( hdc, sysColorObjects.hbrushWindow );
+ SelectObject32( hdc, sysColorObjects.hbrushWindow );
}
else
{
@@ -401,9 +401,9 @@
{
HBRUSH32 hbrush = SendMessage32A(GetParent32(hwnd),
WM_CTLCOLORSCROLLBAR, hdc, hwnd );
- SelectObject( hdc, hbrush );
+ SelectObject32( hdc, hbrush );
}
- else SelectObject( hdc, sysColorObjects.hbrushScrollbar );
+ else SelectObject32( hdc, sysColorObjects.hbrushScrollbar );
}
/* Calculate the scroll rectangle */
@@ -423,10 +423,10 @@
/* Draw the scroll bar frame */
MoveTo( hdc, r.left, r.top );
- LineTo( hdc, r.right-1, r.top );
- LineTo( hdc, r.right-1, r.bottom-1 );
- LineTo( hdc, r.left, r.bottom-1 );
- LineTo( hdc, r.left, r.top );
+ LineTo32( hdc, r.right-1, r.top );
+ LineTo32( hdc, r.right-1, r.bottom-1 );
+ LineTo32( hdc, r.left, r.bottom-1 );
+ LineTo32( hdc, r.left, r.top );
/* Draw the scroll rectangles and thumb */
@@ -466,8 +466,8 @@
/* Draw the thumb */
- SelectObject( hdc, sysColorObjects.hbrushBtnFace );
- Rectangle( hdc, r.left, r.top, r.right, r.bottom );
+ SelectObject32( hdc, sysColorObjects.hbrushBtnFace );
+ Rectangle32( hdc, r.left, r.top, r.right, r.bottom );
InflateRect32( &r, -1, -1 );
GRAPH_DrawReliefRect( hdc, &r, 1, 2, FALSE );
if (SCROLL_MovingThumb &&
