Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 45d2f73..dd490a9 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -6,16 +6,11 @@
*
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "gdi.h"
-#include "syscolor.h"
-#include "stddebug.h"
#include "tweak.h"
-/* #define DEBUG_SYSCOLOR */
-#include "debug.h"
-
-struct SysColorObjects sysColorObjects;
static const char * const DefSysColors[] =
{
@@ -79,6 +74,8 @@
#define NUM_SYS_COLORS (COLOR_INFOBK+1)
static COLORREF SysColors[NUM_SYS_COLORS];
+static HBRUSH32 SysColorBrushes[NUM_SYS_COLORS];
+static HPEN32 SysColorPens[NUM_SYS_COLORS];
#define MAKE_SOLID(color) \
(PALETTEINDEX(GetNearestPaletteIndex32(STOCK_DEFAULT_PALETTE,(color))))
@@ -90,114 +87,10 @@
{
if (index < 0 || index >= NUM_SYS_COLORS) return;
SysColors[index] = color;
- switch(index)
- {
- case COLOR_SCROLLBAR:
- DeleteObject32( sysColorObjects.hbrushScrollbar );
- sysColorObjects.hbrushScrollbar = CreateSolidBrush32( color );
- break;
- case COLOR_BACKGROUND:
- DeleteObject32( sysColorObjects.hbrushBackground );
- sysColorObjects.hbrushBackground = CreateSolidBrush32( color );
- break;
- case COLOR_ACTIVECAPTION:
- DeleteObject32( sysColorObjects.hbrushActiveCaption );
- sysColorObjects.hbrushActiveCaption = CreateSolidBrush32( color );
- break;
- case COLOR_INACTIVECAPTION:
- DeleteObject32( sysColorObjects.hbrushInactiveCaption );
- sysColorObjects.hbrushInactiveCaption = CreateSolidBrush32( color );
- break;
- case COLOR_MENU:
- DeleteObject32( sysColorObjects.hbrushMenu );
- sysColorObjects.hbrushMenu = CreateSolidBrush32( MAKE_SOLID(color) );
- break;
- case COLOR_WINDOW:
- DeleteObject32( sysColorObjects.hbrushWindow );
- sysColorObjects.hbrushWindow = CreateSolidBrush32( color );
- break;
- case COLOR_WINDOWFRAME:
- DeleteObject32( sysColorObjects.hbrushWindowFrame );
- sysColorObjects.hbrushWindowFrame = CreateSolidBrush32( color );
- /* FIXME: we should not need this pen */
- DeleteObject32( sysColorObjects.hpenWindowFrame );
- sysColorObjects.hpenWindowFrame = CreatePen32( PS_SOLID, 1, color );
- break;
- case COLOR_MENUTEXT:
- DeleteObject32( sysColorObjects.hbrushMenuText );
- sysColorObjects.hbrushMenuText = CreateSolidBrush32( color );
- break;
- case COLOR_WINDOWTEXT:
- DeleteObject32( sysColorObjects.hbrushWindowText );
- sysColorObjects.hbrushWindowText = CreateSolidBrush32( color );
- /* FIXME: we should not need this pen */
- DeleteObject32( sysColorObjects.hpenWindowText );
- sysColorObjects.hpenWindowText = CreatePen32( PS_DOT, 1, color );
- break;
- case COLOR_CAPTIONTEXT:
- DeleteObject32( sysColorObjects.hbrushCaptionText );
- sysColorObjects.hbrushCaptionText = CreateSolidBrush32( color );
- break;
- case COLOR_ACTIVEBORDER:
- DeleteObject32( sysColorObjects.hbrushActiveBorder );
- sysColorObjects.hbrushActiveBorder = CreateSolidBrush32( color );
- break;
- case COLOR_INACTIVEBORDER:
- DeleteObject32( sysColorObjects.hbrushInactiveBorder );
- sysColorObjects.hbrushInactiveBorder = CreateSolidBrush32( color );
- break;
- case COLOR_APPWORKSPACE:
- DeleteObject32( sysColorObjects.hbrushAppWorkspace );
- sysColorObjects.hbrushAppWorkspace = CreateSolidBrush32( color );
- break;
- case COLOR_HIGHLIGHT:
- DeleteObject32( sysColorObjects.hbrushHighlight );
- sysColorObjects.hbrushHighlight = CreateSolidBrush32( color );
- break;
- case COLOR_HIGHLIGHTTEXT:
- DeleteObject32( sysColorObjects.hbrushHighlightText );
- sysColorObjects.hbrushHighlightText = CreateSolidBrush32( color );
- break;
- case COLOR_BTNFACE:
- DeleteObject32( sysColorObjects.hbrushBtnFace );
- sysColorObjects.hbrushBtnFace = CreateSolidBrush32( color );
- break;
- case COLOR_BTNSHADOW:
- DeleteObject32( sysColorObjects.hbrushBtnShadow );
- sysColorObjects.hbrushBtnShadow = CreateSolidBrush32( color );
- break;
- case COLOR_GRAYTEXT:
- DeleteObject32( sysColorObjects.hbrushGrayText );
- sysColorObjects.hbrushGrayText = CreateSolidBrush32( color );
- case COLOR_BTNTEXT:
- DeleteObject32( sysColorObjects.hbrushBtnText );
- sysColorObjects.hbrushBtnText = CreateSolidBrush32( color );
- break;
- case COLOR_INACTIVECAPTIONTEXT:
- DeleteObject32( sysColorObjects.hbrushInactiveCaptionText );
- sysColorObjects.hbrushInactiveCaptionText = CreateSolidBrush32(color);
- break;
- case COLOR_BTNHIGHLIGHT:
- DeleteObject32( sysColorObjects.hbrushBtnHighlight );
- sysColorObjects.hbrushBtnHighlight = CreateSolidBrush32( color );
- break;
- case COLOR_3DDKSHADOW:
- DeleteObject32( sysColorObjects.hbrush3DDkShadow );
- sysColorObjects.hbrush3DDkShadow = CreateSolidBrush32( color );
- break;
- case COLOR_3DLIGHT:
- DeleteObject32( sysColorObjects.hbrush3DLight );
- sysColorObjects.hbrush3DLight = CreateSolidBrush32( color );
- break;
- case COLOR_INFOTEXT:
- DeleteObject32( sysColorObjects.hbrushInfoText );
- sysColorObjects.hbrushInfoText = CreateSolidBrush32( color );
- break;
- case COLOR_INFOBK:
- DeleteObject32( sysColorObjects.hbrushInfoBk );
- sysColorObjects.hbrushInfoBk = CreateSolidBrush32( color );
- break;
- }
+ if (SysColorBrushes[index]) DeleteObject32( SysColorBrushes[index] );
+ SysColorBrushes[index] = CreateSolidBrush32( color );
+ if (SysColorPens[index]) DeleteObject32( SysColorPens[index] );
+ SysColorPens[index] = CreatePen32( PS_SOLID, 1, color );
}
@@ -288,3 +181,49 @@
RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN );
return TRUE;
}
+
+
+/***********************************************************************
+ * GetSysColorBrush16 (USER.281)
+ */
+HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
+{
+ return (HBRUSH16)GetSysColorBrush32(index);
+}
+
+
+/***********************************************************************
+ * GetSysColorBrush32 (USER32.289)
+ */
+HBRUSH32 WINAPI GetSysColorBrush32( INT32 index )
+{
+ if (0 <= index && index < NUM_SYS_COLORS)
+ return SysColorBrushes[index];
+ fprintf( stderr, "GetSysColorBrush32: Unknown index(%d)\n", index );
+ return GetStockObject32(LTGRAY_BRUSH);
+}
+
+
+/***********************************************************************
+ * GetSysColorPen16 (Not a Windows API)
+ */
+HPEN16 WINAPI GetSysColorPen16( INT16 index )
+{
+ return (HPEN16)GetSysColorPen32(index);
+}
+
+
+/***********************************************************************
+ * GetSysColorPen32 (Not a Windows API)
+ *
+ * This function is new to the Wine lib -- it does not exist in
+ * Windows. However, it is a natural complement for GetSysColorBrush
+ * in the Win32 API and is needed quite a bit inside Wine.
+ */
+HPEN32 WINAPI GetSysColorPen32( INT32 index )
+{
+ /* We can assert here, because this function is internal to Wine */
+ assert (0 <= index && index < NUM_SYS_COLORS);
+ return SysColorPens[index];
+
+}
