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/windows/scroll.c b/windows/scroll.c
index d06015f..b26ba15 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -53,7 +53,7 @@
else hCaretWnd = 0;
hdc = GetDCEx32(hwnd, hrgnClip, DCX_CACHE | DCX_CLIPSIBLINGS);
- DeleteObject(hrgnClip);
+ DeleteObject32( hrgnClip );
}
else /* clip children */
{
@@ -71,7 +71,7 @@
else
CopyRect16(&cliprc, clipRect);
- hrgnUpdate = CreateRectRgn(0, 0, 0, 0);
+ hrgnUpdate = CreateRectRgn32( 0, 0, 0, 0 );
ScrollDC(hdc, dx, dy, &rc, &cliprc, hrgnUpdate, NULL);
ReleaseDC32(hwnd, hdc);
@@ -80,7 +80,7 @@
WND* wndPtr;
if( wndScroll->hrgnUpdate > 1 )
- OffsetRgn( wndScroll->hrgnUpdate, dx, dy );
+ OffsetRgn32( wndScroll->hrgnUpdate, dx, dy );
for (wndPtr = wndScroll->child; wndPtr; wndPtr = wndPtr->next)
SetWindowPos(wndPtr->hwndSelf, 0, wndPtr->rectWindow.left + dx,
@@ -92,7 +92,7 @@
PAINT_RedrawWindow( hwnd, NULL, hrgnUpdate, RDW_ALLCHILDREN |
RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW, RDW_C_USEHRGN );
- DeleteObject(hrgnUpdate);
+ DeleteObject32( hrgnUpdate );
if( hCaretWnd ) ShowCaret(hCaretWnd);
}
@@ -135,13 +135,14 @@
{
/* save a copy and change cliprgn directly */
- CombineRgn( hrgnScrollClip, hrgnClip, 0, RGN_COPY );
- SetRectRgn( hrgnClip, rectClip.left, rectClip.top, rectClip.right, rectClip.bottom );
+ CombineRgn32( hrgnScrollClip, hrgnClip, 0, RGN_COPY );
+ SetRectRgn( hrgnClip, rectClip.left, rectClip.top,
+ rectClip.right, rectClip.bottom );
CLIPPING_UpdateGCRegion( dc );
}
else
- SelectClipRgn( hdc, hrgnScrollClip );
+ SelectClipRgn16( hdc, hrgnScrollClip );
/* translate coordinates */
@@ -179,15 +180,18 @@
if (hrgnUpdate || rcUpdate)
{
- HRGN32 hrgn1 = (hrgnUpdate)?hrgnUpdate:CreateRectRgn( 0,0,0,0 );
+ HRGN32 hrgn1 = (hrgnUpdate) ? hrgnUpdate : CreateRectRgn32( 0,0,0,0 );
if( dc->w.hVisRgn )
{
- CombineRgn( hrgn1, dc->w.hVisRgn, 0, RGN_COPY);
- CombineRgn( hrgn1, hrgn1, (hrgnClip)?hrgnClip:hrgnScrollClip, RGN_AND);
- OffsetRgn( hrgn1, dx, dy );
- CombineRgn( hrgn1, dc->w.hVisRgn, hrgn1, RGN_DIFF);
- RgnType = CombineRgn( hrgn1, hrgn1, (hrgnClip)?hrgnClip:hrgnScrollClip, RGN_AND);
+ CombineRgn32( hrgn1, dc->w.hVisRgn, 0, RGN_COPY );
+ CombineRgn32( hrgn1, hrgn1, hrgnClip ? hrgnClip : hrgnScrollClip,
+ RGN_AND );
+ OffsetRgn32( hrgn1, dx, dy );
+ CombineRgn32( hrgn1, dc->w.hVisRgn, hrgn1, RGN_DIFF );
+ RgnType = CombineRgn32( hrgn1, hrgn1,
+ hrgnClip ? hrgnClip : hrgnScrollClip,
+ RGN_AND );
}
else
{
@@ -208,13 +212,13 @@
}
if (rcUpdate) GetRgnBox16( hrgn1, rcUpdate );
- if (!hrgnUpdate) DeleteObject( hrgn1 );
+ if (!hrgnUpdate) DeleteObject32( hrgn1 );
}
/* restore clipping region */
- SelectClipRgn( hdc, (hrgnClip)?hrgnScrollClip:0 );
- DeleteObject( hrgnScrollClip );
+ SelectClipRgn32( hdc, hrgnClip ? hrgnScrollClip : 0 );
+ DeleteObject32( hrgnScrollClip );
return TRUE;
}
