Release 980614
Sun Jun 15 10:30:35 1998 Andreas Mohr <100.30936@germany.net>
* [files/dos_fs.c] [files/file.c] [if1632/wprocs.spec]
[misc/aspi.c]
Added support for scanners that need Adaptec's ASPI2DOS.
* [graphics/env.c] [misc/printerdrv.c] [graphics/win16drv/init.c]
[if1632/gdi.spec] [include/gdi.h]
Enhanced printer support (especially Win95):
Drv[GS]etPrinterData, [GS]etEnvironment; added AbortProc handling.
* [misc/tapi32.c] [relay32/tapi32.spec]
Added some stubs.
* [configure.in] [graphics/fontengine.c] [include/windows.h]
[misc/comm.c] [misc/w32skrnl.c] [misc/win32s16.c]
Made Wine compile on HP-UX (just for fun ;)
* [controls/menu.c] [include/windows.h]
Complete rewrite of EnableMenuItem32.
Free Agent 32 still doesn't work :(
* [misc/version.c] [if1632/kernel.spec] [include/winbase.h]
Implemented GetVersionEx16.
* [misc/network.c] [if1632/user.spec]
Fixed arguments of WNetGetPropertyText.
* [misc/version.c] [relay32/comctl32.spec] [relay32/oleaut32.spec]
Implemented COMCTL32_DllGetVersion, OaBuildVersion.
* [win32/file.c]
Fixed UNC handling of CreateFile32.
Sat Jun 13 22:35:12 1998 Douglas Ridgway <ridgway@winehq.com>
* [Makefile.in] [Make.rules.in]
Added pattern for CVS merge files to 'make clean'
* [ole/olecli.c] [windows/scroll.c] [windows/grahics.c]
Add some DC handle unlocking. (When hdc's are always unlocked,
they can be made moveable.)
* [documentation/wine.texinfo]
Started a Wine Design chapter with discussion of
graphics driver model.
Sat Jun 13 11:19:25 1998 David Luyer <luyer@ucs.uwa.edu.au>
* [misc/main.c] [relay32/relay386.c]
Added new option -debugmsg +relay=.... or -debugmsg -relay=...
Fri Jun 12 22:56:09 1998 Marcus Meissner <marcus@jet.franken.de>
* [relay32/snoop.c][relay32/builtin.c][loader/pe_image.c]
Added inter win32 dll snooping. Use -debugmsg +snoop.
Number of arguments and string references are autodetected.
Some small bugfixes in the PE loader.
* [misc/system.c]
Disabled SystemTimers. They do not work with the current
%fs handling in the 32->16 relaycode. (helps labview)
* [msdos/dpmi.c][msdos/int2f.c][files/drive.c]
Added a monoton linear increasing memory allocator for DPMI (required
for LabView, HAFAS, ...)
mscdex handling in emulated realmode interrupts (for mcicda.drv)
allocate logical drives only once. (helps Myst)
* [files/profile.c]
Handle ^Z as space. Found on CDROMS (helps Myst Installer).
* [multimedia/mmio.c]
mmio* partially updated to win32. No funny additions.
* [windows/driver.c]
Added win32 driver handling (will be used for win32 multimedia/
msvideo drivers).
* [win32/device.c]
Added device handling (K32OBJ_DEVICE_IOCTL). Implemented
VTDAPI.5 (used by win95' WINMM.timeGetTime())
Fri Jun 12 18:01:18 1998 Rein Klazes <rklazes@casema.net>
* [ole/compobj.c relay32/ole32.spec]
Add a stub for CoLockObjectExternal32.
* [objects/clipping.c]
Fix in IntersectClipRect(), when there is no initial clipping
region.
* [graphics/x11drv/graphics.c]
Corrected several "one-off" errors for the Ellipse, Rectangle
and RoundRectangle (especially small ones) draw routines.
Arc and friends still have to be done.
Fri Jun 12 06:23:19 1998 Matthew Becker <mbecker@glasscity.net>
* [misc/ntdll.c]
Fixed some of the parameter counts.
* [misc/registry.c]
General cleanup, documentation.
Standard keys are allowed to be 'closed' and succeed.
* [misc/shell.c]
Check for correct return values from Reg* functions.
* [win32/newfns.c]
Added stubs for OpenDesktopA, SetThreadDesktop, and
SetUserObjectInformationA.
Wed Jun 10 20:28:08 1998 James Juran <jrj120@psu.edu>
* [debugger/break.c]
Fixed bug introduced in 980503 that broke the -debug command
line option for PE executable files.
* [configure.in] [include/acconfig.h] [include/debugtools.h]
[documentation/debug-msgs]
Added 'configure' options to compile out debugging messages.
Use --disable-debug to disable all debugging messages, and
--disable-trace to just disable TRACE messages. This results
in a stripped executable that is 15-20% smaller. This option
is very much untested--don't expect it to work.
* [documentation/debug-msgs] [documentation/debugging]
Minor updates.
* [*/*.c]
Fixed some compile warnings. This also includes the
compile_warnings_trivial patch from WineHQ.
Tue Jun 10 22:00:18 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [windows/sysmetrics.c][include/sysmetrics.h]
Fixed some Win95 values.
* [windows/nonclient.c][include/windows.h]
Fixed some Win95 drawing bugs.
Added extended window style flags (WS_EX_xxx).
* [misc/printdrv.c][relay32/winspool.spec]
Added stubs for DeletePrinterDriver32A, DeleteMonitor32A
and DeletePort32A.
* [windows/mdi.c][include/windows.h][relay32/user32.spec]
Added stubs for CascadeWindows and TileWindows.
* [controls/toolbar.c][include/toolbar.h]
Fixed a few bugs and implemented new features.
* [misc/shellord.c][relay32/shell32.spec]
Added stubs for SHELL32_60, SHELL32_61 and SHELL32_184.
* [controls/comctl32undoc.c][relay32/comctl32.spec]
New file comctl32undoc.c. Contains undocumented functions
of COMCTL32.DLL. These functions are needed to run EXPLORER.EXE
IEXPLORE.EXE and TASKMAN.EXE.
* [controls/status.c]
Added text alignment.
Tue Jun 8 22:00:00 1998 Bertho Stultiens <bertho@akhphd.au.dk>
* [programs/*/Makefile.in]
Changed the rules to use wrc as resource compiler but
passing the source through gcc first for macro expansion.
* [programs/*/*.rc]
Added #include "windows.h" for the resource compiler in the
appropriate files.
* [tools/wrc/wrc.[ch]] [tools/wrc/writeres.c]
Added commandline option -A for autoregister code.
Corrected the underscore problem by checking the proper define
from config.h.
Sun Jun 7 22:09:29 1998 Pascal Cuoq <pcuoq@ens-lyon.fr>
* [ole/ole2nls.c] [memory/string.c]
Improved LCMapString32A, and changed CompareString32A,
lstrcmp, lstrcmpi to use it.
Sat Jun 6 19:00:50 1998 Martin Strömberg <ams@ludd.luth.se>
* [include/winnt.h]
Added typedefs for security and tokens.
Sat Jun 6 12:26:31 1998 Morten Welinder <terra@diku.dk>
* [objects/text.c]
Use debugstr_an in DrawText16.
* [loader/resource.c]
Use debugres_w in FindResourceEx32W. Avoid crashing during
debug when wm is NULL.
* [if1632/relay.c]
In RELAY_DebugCallTo16, send output to the right place and
avoid side effects in macro arguments.
Wed Jun 3 20:56:03 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [controls/scroll.c] [windows/nonclient.c]
Fix several off by one errors in scrollbar painting.
Tue Jun 2 23:58:59 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu>
* [graphics/dsound.c]
Rewrote mixer code to handle panning and volume for 16->16, 16->8,
8->16, and 8->8 bit mixes. Conforms to DirectX's "logarithmic
hearing scale" as specified in M$VC docs. Still does not handle
mixing of different frequencies (I am still working on that).
Tested 16->16 extensively with StarCraft. Other mixing combinations
untested but should work fine. Still kind of a work in progress,
so be warned.
Tue Jun 2 03:31:33 1998 Alexander V. Lukyanov <lav@long.yar.ru>
* [tools/wrc/utils.c]
dup_basename: fix to strip directory.
Mon Jun 1 20:00:00 1998 Juergen Schmied <juergen.schmied@metronet.de>
* [include/windows.h] [objects/cursoricon.c] [relay32/user32.spec]
Added stubs LoadCursorFromFileW and LoadCursorFromFileA.
diff --git a/controls/scroll.c b/controls/scroll.c
index 4f844cf..0cade01 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -46,6 +46,9 @@
/* Minimum size of the thumb in pixels */
#define SCROLL_MIN_THUMB 6
+ /* Overlap between arrows and thumb */
+#define SCROLL_ARROW_THUMB_OVERLAP 1
+
/* Delay (in ms) before first repetition when holding the button down */
#define SCROLL_FIRST_DELAY 200
@@ -159,18 +162,28 @@
switch(nBar)
{
case SB_HORZ:
- lprect->left = wndPtr->rectClient.left - wndPtr->rectWindow.left - 1;
+ lprect->left = wndPtr->rectClient.left - wndPtr->rectWindow.left;
lprect->top = wndPtr->rectClient.bottom - wndPtr->rectWindow.top;
- lprect->right = wndPtr->rectClient.right - wndPtr->rectWindow.left +1;
- lprect->bottom = lprect->top + SYSMETRICS_CYHSCROLL + 1;
+ lprect->right = wndPtr->rectClient.right - wndPtr->rectWindow.left;
+ lprect->bottom = lprect->top + SYSMETRICS_CYHSCROLL;
+ if(wndPtr->dwStyle & WS_BORDER) {
+ lprect->left--;
+ lprect->right++;
+ } else if(wndPtr->dwStyle & WS_VSCROLL)
+ lprect->right++;
vertical = FALSE;
break;
case SB_VERT:
lprect->left = wndPtr->rectClient.right - wndPtr->rectWindow.left;
- lprect->top = wndPtr->rectClient.top - wndPtr->rectWindow.top - 1;
- lprect->right = lprect->left + SYSMETRICS_CXVSCROLL + 1;
- lprect->bottom = wndPtr->rectClient.bottom - wndPtr->rectWindow.top +1;
+ lprect->top = wndPtr->rectClient.top - wndPtr->rectWindow.top;
+ lprect->right = lprect->left + SYSMETRICS_CXVSCROLL;
+ lprect->bottom = wndPtr->rectClient.bottom - wndPtr->rectWindow.top;
+ if(wndPtr->dwStyle & WS_BORDER) {
+ lprect->top--;
+ lprect->bottom++;
+ } else if(wndPtr->dwStyle & WS_HSCROLL)
+ lprect->bottom++;
vertical = TRUE;
break;
@@ -199,7 +212,7 @@
SCROLLBAR_INFO *info = SCROLL_GetPtrScrollInfo( wndPtr, nBar );
*arrowSize = SYSMETRICS_CXVSCROLL;
- pixels -= 2 * SYSMETRICS_CXVSCROLL;
+ pixels -= (2 * (SYSMETRICS_CXVSCROLL - SCROLL_ARROW_THUMB_OVERLAP));
if (info->Page)
{
@@ -208,7 +221,7 @@
}
else *thumbSize = SYSMETRICS_CXVSCROLL;
- if (((pixels -= *thumbSize + 1) < 0) ||
+ if (((pixels -= *thumbSize ) < 0) ||
((info->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH))
{
/* Rectangle too small or scrollbar disabled -> no thumb */
@@ -218,10 +231,10 @@
{
INT32 max = info->MaxVal - MAX( info->Page-1, 0 );
if (info->MinVal >= max)
- *thumbPos = *arrowSize;
+ *thumbPos = *arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
else
- *thumbPos = *arrowSize + pixels * (info->CurVal-info->MinVal) /
- (max - info->MinVal);
+ *thumbPos = *arrowSize - SCROLL_ARROW_THUMB_OVERLAP
+ + pixels * (info->CurVal-info->MinVal) / (max - info->MinVal);
}
}
return vertical;
@@ -240,7 +253,8 @@
INT32 thumbSize;
INT32 pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left;
- if ((pixels -= 2*SYSMETRICS_CXVSCROLL) <= 0) return infoPtr->MinVal;
+ if ((pixels -= 2*(SYSMETRICS_CXVSCROLL - SCROLL_ARROW_THUMB_OVERLAP)) <= 0)
+ return infoPtr->MinVal;
if (infoPtr->Page)
{
@@ -249,9 +263,9 @@
}
else thumbSize = SYSMETRICS_CXVSCROLL;
- if ((pixels -= thumbSize + 1) <= 0) return infoPtr->MinVal;
+ if ((pixels -= thumbSize) <= 0) return infoPtr->MinVal;
- pos = MAX( 0, pos - SYSMETRICS_CXVSCROLL );
+ pos = MAX( 0, pos - (SYSMETRICS_CXVSCROLL - SCROLL_ARROW_THUMB_OVERLAP) );
if (pos > pixels) pos = pixels;
if (!infoPtr->Page) pos *= infoPtr->MaxVal - infoPtr->MinVal;
@@ -277,22 +291,22 @@
if (vertical)
{
- if (pt.y <= rect.top + arrowSize + 1) return SCROLL_TOP_ARROW;
+ if (pt.y < rect.top + arrowSize) return SCROLL_TOP_ARROW;
if (pt.y >= rect.bottom - arrowSize) return SCROLL_BOTTOM_ARROW;
if (!thumbPos) return SCROLL_TOP_RECT;
pt.y -= rect.top;
if (pt.y < thumbPos) return SCROLL_TOP_RECT;
- if (pt.y > thumbPos + thumbSize) return SCROLL_BOTTOM_RECT;
+ if (pt.y >= thumbPos + thumbSize) return SCROLL_BOTTOM_RECT;
return SCROLL_THUMB;
}
else /* horizontal */
{
- if (pt.x <= rect.left + arrowSize) return SCROLL_TOP_ARROW;
+ if (pt.x < rect.left + arrowSize) return SCROLL_TOP_ARROW;
if (pt.x >= rect.right - arrowSize) return SCROLL_BOTTOM_ARROW;
if (!thumbPos) return SCROLL_TOP_RECT;
pt.x -= rect.left;
if (pt.x < thumbPos) return SCROLL_TOP_RECT;
- if (pt.x > thumbPos + thumbSize) return SCROLL_BOTTOM_RECT;
+ if (pt.x >= thumbPos + thumbSize) return SCROLL_BOTTOM_RECT;
return SCROLL_THUMB;
}
}
@@ -313,26 +327,26 @@
: LEFT_ARROW(infoPtr->flags, top_pressed));
SetStretchBltMode32( hdc, STRETCH_DELETESCANS );
StretchBlt32( hdc, rect->left, rect->top,
- vertical ? rect->right-rect->left : arrowSize+1,
- vertical ? arrowSize+1 : rect->bottom-rect->top,
+ vertical ? rect->right-rect->left : arrowSize,
+ vertical ? arrowSize : rect->bottom-rect->top,
hdcMem, 0, 0,
- SYSMETRICS_CXVSCROLL + 1, SYSMETRICS_CYHSCROLL + 1,
+ SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
SRCCOPY );
SelectObject32( hdcMem, vertical ?
BOTTOM_ARROW( infoPtr->flags, bottom_pressed )
: RIGHT_ARROW( infoPtr->flags, bottom_pressed ) );
if (vertical)
- StretchBlt32( hdc, rect->left, rect->bottom - arrowSize - 1,
- rect->right - rect->left, arrowSize + 1,
+ StretchBlt32( hdc, rect->left, rect->bottom - arrowSize,
+ rect->right - rect->left, arrowSize,
hdcMem, 0, 0,
- SYSMETRICS_CXVSCROLL + 1, SYSMETRICS_CYHSCROLL + 1,
+ SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
SRCCOPY );
else
- StretchBlt32( hdc, rect->right - arrowSize - 1, rect->top,
- arrowSize + 1, rect->bottom - rect->top,
+ StretchBlt32( hdc, rect->right - arrowSize, rect->top,
+ arrowSize, rect->bottom - rect->top,
hdcMem, 0, 0,
- SYSMETRICS_CXVSCROLL + 1, SYSMETRICS_CYHSCROLL + 1,
+ SYSMETRICS_CXVSCROLL, SYSMETRICS_CYHSCROLL,
SRCCOPY );
SelectObject32( hdcMem, hbmpPrev );
DeleteDC32( hdcMem );
@@ -351,20 +365,25 @@
if (vertical)
{
r.top += SCROLL_TrackingPos;
- if (r.top < rect->top + arrowSize) r.top = rect->top + arrowSize;
- if (r.top + thumbSize >= rect->bottom - arrowSize)
- r.top = rect->bottom - arrowSize - thumbSize - 1;
- r.bottom = r.top + thumbSize + 1;
+ if (r.top < rect->top + arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
+ r.top = rect->top + arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+ if (r.top + thumbSize >
+ rect->bottom - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP))
+ r.top = rect->bottom - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
+ - thumbSize;
+ r.bottom = r.top + thumbSize;
}
else
{
r.left += SCROLL_TrackingPos;
- if (r.left < rect->left + arrowSize) r.left = rect->left + arrowSize;
- if (r.left + thumbSize >= rect->right - arrowSize)
- r.left = rect->right - arrowSize - thumbSize - 1;
- r.right = r.left + thumbSize + 1;
+ if (r.left < rect->left + arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
+ r.left = rect->left + arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+ if (r.left + thumbSize >
+ rect->right - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP))
+ r.left = rect->right - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP)
+ - thumbSize;
+ r.right = r.left + thumbSize;
}
- InflateRect32( &r, -1, -1 );
DrawFocusRect32( hdc, &r );
SCROLL_MovingThumb = !SCROLL_MovingThumb;
}
@@ -407,15 +426,13 @@
r = *rect;
if (vertical)
{
- r.top += arrowSize - 1;
- r.bottom -= arrowSize;
- r.right--;
+ r.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+ r.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
}
else
{
- r.left += arrowSize - 1;
- r.right -= arrowSize;
- r.bottom--;
+ r.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
+ r.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
}
/* Draw the scroll bar frame */
@@ -435,27 +452,27 @@
{
PatBlt32( hdc, r.left + 1, r.top + 1,
r.right - r.left - 2,
- thumbPos - arrowSize,
+ thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
top_selected ? 0x0f0000 : PATCOPY );
- r.top += thumbPos - arrowSize;
- PatBlt32( hdc, r.left + 1, r.top + thumbSize + 1,
+ r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+ PatBlt32( hdc, r.left + 1, r.top + thumbSize,
r.right - r.left - 2,
- r.bottom - r.top - thumbSize - 2,
+ r.bottom - r.top - thumbSize - 1,
bottom_selected ? 0x0f0000 : PATCOPY );
- r.bottom = r.top + thumbSize + 2;
+ r.bottom = r.top + thumbSize;
}
else /* horizontal */
{
PatBlt32( hdc, r.left + 1, r.top + 1,
- thumbPos - arrowSize,
+ thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP) - 1,
r.bottom - r.top - 2,
top_selected ? 0x0f0000 : PATCOPY );
- r.left += thumbPos - arrowSize;
- PatBlt32( hdc, r.left + thumbSize + 1, r.top + 1,
- r.right - r.left - thumbSize - 2,
+ r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP);
+ PatBlt32( hdc, r.left + thumbSize, r.top + 1,
+ r.right - r.left - thumbSize - 1,
r.bottom - r.top - 2,
bottom_selected ? 0x0f0000 : PATCOPY );
- r.right = r.left + thumbSize + 2;
+ r.right = r.left + thumbSize;
}
/* Draw the thumb */
@@ -493,6 +510,7 @@
vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
&arrowSize, &thumbSize, &thumbPos );
+
/* Draw the arrows */
if (arrows && arrowSize) SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize,
