
Thu Sep 11 18:24:56 1997 Philippe De Muyter <phdm@info.ucl.ac.be> * [objects/dc.c] In DC_SetupGCForPatBlt, replace R2_NOT by GXxor with (black xor white). Tue Sep 9 23:04:02 1997 U. Bonnes <bon@elektron.ikp.physik.th-darmstadt.de> * [memory/virtual.c] Do not write debugging info unconditionally to stderr. * [files/profile.c] Call PROFILE_GetSection in PROFILE_GetString for key_name "" too. * [misc/crtdll.c] Many new functions. * [include/windows.h] [windows/winpos.c] ClientToScreen16 doesn't have a return value. Sun Sep 7 10:06:39 1997 Alexandre Julliard <julliard@lrc.epfl.ch> * [misc/main.c] [AUTHORS] Update the list of contributors. Please let me know if I forgot someone. * [if1632/*.spec] [if1632/builtin.c] [tools/build.c] Ordinal base for Win32 DLLs is now computed automatically from the lowest ordinal found. * [include/wintypes.h] WINAPI is now defined as attribute((stdcall)). This will require gcc to compile. * [if1632/thunk.c] Removed Win32 thunks (no longer needed with stdcall). * [if1632/crtdll.spec] [misc/crtdll.c] Make sure we only reference cdecl functions in the spec file. * [objects/dc.c] Use CapNotLast drawing style for 1-pixel wide lines. * [tools/build.c] Added 'double' argument type. Added 'varargs' function type for Win32. Made CallTo16_xxx functions stdcall. Fri Sep 5 14:50:49 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu> * [tools/build.c] [windows/win.c] [windows/event.c] [windows/message.c] More fixes to get message exchange closer to the original. * [misc/spy.c] Message logs now contain window names. * [loader/resource.c] [loader/ne_resource.c] [loader/task.c] [objects/cursoricon.c] [windows/user.c] Added some obscure features to fix memory leaks. Fri Sep 5 00:46:28 1997 Jan Willamowius <jan@janhh.shnet.org> * [if1632/kernel32.spec] [win32/newfns.c] Added stub for UTRegister() and UTUnRegister(). Thu Sep 4 12:03:12 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl> * [controls/edit.c] Allow ASCII codes > 127 in WM_CHAR. Mon Sep 1 17:23:24 1997 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/widgets.c] In InitCommonControls, remember the name of the class because lpszClassName was made to point to a local array Added the ProgressBar to the list of implemented controls. Call InitCommonControls from WIDGETS_Init to register all implemented Common Controls. * [include/commctrl.h] Added misc decl for the Progress Bar. * [controls/progress.c] [include/progress.h] First attempt at implementiong the Progress Bar class. * [objects/brush.h] Implementation for GetSysColorBrush[16|32] * [controls/status.c] Use DrawEdge to draw the borders and fill the background * [controls/uitools.c] Added DrawDiagEdge32 and DrawRectEdge32 * [graphics/painting.c] Implement DrawEdge[16|32] Started DrawFrameControl32 Mon Sep 1 10:07:09 1997 Lawson Whitney <lawson_whitney@juno.com> * [misc/comm.c] [include/windows.h] SetCommEventMask returns a SEGPTR. Sun Aug 31 23:28:32 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [loader/pe_image.c][loader/module.c][include/pe_image.h] [include/module.h] Cleaned up the whole Win32 library mess (a bit). * [debugger/stabs.c] If 'wine' has no absolute path and isn't found, check $PATH too. * [misc/ole2nls.c] Some fixes. * [misc/ver.c] Added support for PE style version resources. * [memory/string.c] Check for NULL pointers to _lstr* functions, just as Windows95 does. * [multimedia/time.c] Made list of timers a simple linked list. * [loader/resource.c] Netscape 3 seems to pass NEGATIVE resource Ids (in an unsigned int, yes). Don't know why, fixed it anyway. * [objects/bitmap.c] LoadImageW added. * [include/win.h][windows/win.c] Change wIDmenu from UINT16 to UINT32 and changed the SetWindow(Long|Word) accordingly. Thu Aug 28 19:30:08 1997 Morten Welinder <terra@diku.dk> * [include/windows.h] Add a few more colors defined for Win95. Add a few more brush styles. * [windows/syscolor.c] Add error checks for SYSCOLOR_SetColor, SYSCOLOR_Init, GetSysColor16, GetSysColor32. Add support for above colors. Sun Aug 24 16:22:57 1997 Andrew Taylor <andrew@riscan.com> * [multimedia/mmsystem.c] Changed mmioDescend to use mmio functions for file I/O, neccessary for memory files.
365 lines
11 KiB
C
365 lines
11 KiB
C
/*
|
|
* GDI brush objects
|
|
*
|
|
* Copyright 1993, 1994 Alexandre Julliard
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include "brush.h"
|
|
#include "bitmap.h"
|
|
#include "syscolor.h"
|
|
#include "metafile.h"
|
|
#include "color.h"
|
|
#include "stddebug.h"
|
|
#include "debug.h"
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateBrushIndirect16 (GDI.50)
|
|
*/
|
|
HBRUSH16 WINAPI CreateBrushIndirect16( const LOGBRUSH16 * brush )
|
|
{
|
|
BRUSHOBJ * brushPtr;
|
|
HBRUSH16 hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
|
|
if (!hbrush) return 0;
|
|
brushPtr = (BRUSHOBJ *) GDI_HEAP_LOCK( hbrush );
|
|
brushPtr->logbrush.lbStyle = brush->lbStyle;
|
|
brushPtr->logbrush.lbColor = brush->lbColor;
|
|
brushPtr->logbrush.lbHatch = brush->lbHatch;
|
|
GDI_HEAP_UNLOCK( hbrush );
|
|
return hbrush;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateBrushIndirect32 (GDI32.27)
|
|
*/
|
|
HBRUSH32 WINAPI CreateBrushIndirect32( const LOGBRUSH32 * brush )
|
|
{
|
|
BRUSHOBJ * brushPtr;
|
|
HBRUSH32 hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
|
|
if (!hbrush) return 0;
|
|
brushPtr = (BRUSHOBJ *) GDI_HEAP_LOCK( hbrush );
|
|
brushPtr->logbrush.lbStyle = brush->lbStyle;
|
|
brushPtr->logbrush.lbColor = brush->lbColor;
|
|
brushPtr->logbrush.lbHatch = brush->lbHatch;
|
|
GDI_HEAP_UNLOCK( hbrush );
|
|
return hbrush;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateHatchBrush16 (GDI.58)
|
|
*/
|
|
HBRUSH16 WINAPI CreateHatchBrush16( INT16 style, COLORREF color )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
|
|
dprintf_gdi(stddeb, "CreateHatchBrush16: %d %06lx\n", style, color );
|
|
if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateHatchBrush32 (GDI32.48)
|
|
*/
|
|
HBRUSH32 WINAPI CreateHatchBrush32( INT32 style, COLORREF color )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
|
|
dprintf_gdi(stddeb, "CreateHatchBrush32: %d %06lx\n", style, color );
|
|
if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreatePatternBrush16 (GDI.60)
|
|
*/
|
|
HBRUSH16 WINAPI CreatePatternBrush16( HBITMAP16 hbitmap )
|
|
{
|
|
return (HBRUSH16)CreatePatternBrush32( hbitmap );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreatePatternBrush32 (GDI32.54)
|
|
*/
|
|
HBRUSH32 WINAPI CreatePatternBrush32( HBITMAP32 hbitmap )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_PATTERN, 0, 0 };
|
|
BITMAPOBJ *bmp, *newbmp;
|
|
|
|
dprintf_gdi(stddeb, "CreatePatternBrush: %04x\n", hbitmap );
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
if (!(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
|
|
return 0;
|
|
logbrush.lbHatch = (INT32)CreateBitmapIndirect16( &bmp->bitmap );
|
|
newbmp = (BITMAPOBJ *) GDI_GetObjPtr( (HGDIOBJ32)logbrush.lbHatch,
|
|
BITMAP_MAGIC );
|
|
if (!newbmp)
|
|
{
|
|
GDI_HEAP_UNLOCK( hbitmap );
|
|
return 0;
|
|
}
|
|
XCopyArea( display, bmp->pixmap, newbmp->pixmap, BITMAP_GC(bmp),
|
|
0, 0, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, 0, 0 );
|
|
GDI_HEAP_UNLOCK( hbitmap );
|
|
GDI_HEAP_UNLOCK( logbrush.lbHatch );
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateDIBPatternBrush16 (GDI.445)
|
|
*/
|
|
HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
|
BITMAPINFO *info, *newInfo;
|
|
INT32 size;
|
|
|
|
dprintf_gdi(stddeb, "CreateDIBPatternBrush: %04x\n", hbitmap );
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
if (!(info = (BITMAPINFO *)GlobalLock16( hbitmap ))) return 0;
|
|
|
|
if (info->bmiHeader.biCompression)
|
|
size = info->bmiHeader.biSizeImage;
|
|
else
|
|
size = (info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) / 32
|
|
* 8 * info->bmiHeader.biHeight;
|
|
size += DIB_BitmapInfoSize( info, coloruse );
|
|
|
|
if (!(logbrush.lbHatch = (INT16)GlobalAlloc16( GMEM_MOVEABLE, size )))
|
|
{
|
|
GlobalUnlock16( hbitmap );
|
|
return 0;
|
|
}
|
|
newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
|
|
memcpy( newInfo, info, size );
|
|
GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
|
|
GlobalUnlock16( hbitmap );
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateDIBPatternBrush32 (GDI32.34)
|
|
*/
|
|
HBRUSH32 WINAPI CreateDIBPatternBrush32( HGLOBAL32 hbitmap, UINT32 coloruse )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
|
BITMAPINFO *info, *newInfo;
|
|
INT32 size;
|
|
|
|
dprintf_gdi(stddeb, "CreateDIBPatternBrush: %04x\n", hbitmap );
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
if (!(info = (BITMAPINFO *)GlobalLock32( hbitmap ))) return 0;
|
|
|
|
if (info->bmiHeader.biCompression)
|
|
size = info->bmiHeader.biSizeImage;
|
|
else
|
|
size = (info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) / 32
|
|
* 8 * info->bmiHeader.biHeight;
|
|
size += DIB_BitmapInfoSize( info, coloruse );
|
|
|
|
if (!(logbrush.lbHatch = (INT32)GlobalAlloc16( GMEM_MOVEABLE, size )))
|
|
{
|
|
GlobalUnlock16( hbitmap );
|
|
return 0;
|
|
}
|
|
newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
|
|
memcpy( newInfo, info, size );
|
|
GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
|
|
GlobalUnlock16( hbitmap );
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateSolidBrush (GDI.66)
|
|
*/
|
|
HBRUSH16 WINAPI CreateSolidBrush16( COLORREF color )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
|
|
dprintf_gdi(stddeb, "CreateSolidBrush16: %06lx\n", color );
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CreateSolidBrush32 (GDI32.64)
|
|
*/
|
|
HBRUSH32 WINAPI CreateSolidBrush32( COLORREF color )
|
|
{
|
|
LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
|
|
dprintf_gdi(stddeb, "CreateSolidBrush32: %06lx\n", color );
|
|
return CreateBrushIndirect32( &logbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetBrushOrg (GDI.148)
|
|
*/
|
|
DWORD WINAPI SetBrushOrg( HDC16 hdc, INT16 x, INT16 y )
|
|
{
|
|
DWORD retval;
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
if (!dc) return FALSE;
|
|
retval = dc->w.brushOrgX | (dc->w.brushOrgY << 16);
|
|
dc->w.brushOrgX = x;
|
|
dc->w.brushOrgY = y;
|
|
return retval;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetBrushOrgEx (GDI32.308)
|
|
*/
|
|
BOOL32 WINAPI SetBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
|
|
{
|
|
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
|
|
|
|
if (!dc) return FALSE;
|
|
if (oldorg)
|
|
{
|
|
oldorg->x = dc->w.brushOrgX;
|
|
oldorg->y = dc->w.brushOrgY;
|
|
}
|
|
dc->w.brushOrgX = x;
|
|
dc->w.brushOrgY = y;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorBrush16 (USER.281)
|
|
*/
|
|
HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
|
|
{
|
|
return (HBRUSH16)GetSysColorBrush32(index);
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* GetSysColorBrush32 (USER32.289)
|
|
*/
|
|
HBRUSH32 WINAPI GetSysColorBrush32( INT32 index )
|
|
{
|
|
switch(index){
|
|
case COLOR_SCROLLBAR:
|
|
return sysColorObjects.hbrushScrollbar;
|
|
case COLOR_BACKGROUND: /* same as COLOR_DESKTOP */
|
|
return sysColorObjects.hbrushScrollbar; /*FIXME*/
|
|
case COLOR_ACTIVECAPTION:
|
|
return sysColorObjects.hbrushActiveCaption;
|
|
case COLOR_INACTIVECAPTION:
|
|
return sysColorObjects.hbrushInactiveCaption;
|
|
case COLOR_MENU:
|
|
return sysColorObjects.hbrushMenu;
|
|
case COLOR_WINDOW:
|
|
return sysColorObjects.hbrushWindow;
|
|
case COLOR_WINDOWFRAME:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_MENUTEXT:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_WINDOWTEXT:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_CAPTIONTEXT:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_ACTIVEBORDER:
|
|
return sysColorObjects.hbrushActiveBorder;
|
|
case COLOR_INACTIVEBORDER:
|
|
return sysColorObjects.hbrushInactiveBorder;
|
|
case COLOR_APPWORKSPACE:
|
|
return sysColorObjects.hbrushActiveBorder; /*FIXME*/
|
|
case COLOR_HIGHLIGHT:
|
|
return sysColorObjects.hbrushHighlight;
|
|
case COLOR_HIGHLIGHTTEXT:
|
|
return sysColorObjects.hbrushHighlight; /*FIXME*/
|
|
case COLOR_BTNFACE: /* same as COLOR_3DFACE */
|
|
return sysColorObjects.hbrushBtnFace;
|
|
case COLOR_BTNSHADOW: /* same as COLOR_3DSHADOW */
|
|
return sysColorObjects.hbrushBtnShadow;
|
|
case COLOR_GRAYTEXT:
|
|
return sysColorObjects.hbrushBtnShadow; /*FIXME*/
|
|
case COLOR_BTNTEXT:
|
|
return sysColorObjects.hbrushBtnShadow; /*FIXME*/
|
|
case COLOR_INACTIVECAPTIONTEXT:
|
|
return sysColorObjects.hbrushBtnShadow; /*FIXME*/
|
|
case COLOR_BTNHIGHLIGHT: /* same as COLOR_(3DHIGH|3DHI|BTNHI)LIGHT */
|
|
return sysColorObjects.hbrushBtnHighlight;
|
|
/* case COLOR_3DDKSHADOW: FIXME
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_3DLIGHT:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_INFOTEXT:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;
|
|
case COLOR_INFOBK:
|
|
fprintf( stderr, "GetSysColorBrush32: Unimplemented index(%d)\n", index );
|
|
break;*/
|
|
default:
|
|
fprintf( stderr, "GetSysColorBrush32: Unknown index(%d)\n", index );
|
|
}
|
|
|
|
return GetStockObject32(LTGRAY_BRUSH);
|
|
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_DeleteObject
|
|
*/
|
|
BOOL32 BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush )
|
|
{
|
|
switch(brush->logbrush.lbStyle)
|
|
{
|
|
case BS_PATTERN:
|
|
DeleteObject32( (HGDIOBJ32)brush->logbrush.lbHatch );
|
|
break;
|
|
case BS_DIBPATTERN:
|
|
GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch );
|
|
break;
|
|
}
|
|
return GDI_FreeObject( hbrush );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_GetObject16
|
|
*/
|
|
INT16 BRUSH_GetObject16( BRUSHOBJ * brush, INT16 count, LPSTR buffer )
|
|
{
|
|
LOGBRUSH16 logbrush;
|
|
|
|
logbrush.lbStyle = brush->logbrush.lbStyle;
|
|
logbrush.lbColor = brush->logbrush.lbColor;
|
|
logbrush.lbHatch = brush->logbrush.lbHatch;
|
|
if (count > sizeof(logbrush)) count = sizeof(logbrush);
|
|
memcpy( buffer, &logbrush, count );
|
|
return count;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* BRUSH_GetObject32
|
|
*/
|
|
INT32 BRUSH_GetObject32( BRUSHOBJ * brush, INT32 count, LPSTR buffer )
|
|
{
|
|
if (count > sizeof(brush->logbrush)) count = sizeof(brush->logbrush);
|
|
memcpy( buffer, &brush->logbrush, count );
|
|
return count;
|
|
}
|