1993-09-04 10:09:32 +00:00
|
|
|
/*
|
|
|
|
|
* GDI brush objects
|
|
|
|
|
*
|
1995-01-09 18:21:16 +00:00
|
|
|
* Copyright 1993, 1994 Alexandre Julliard
|
|
|
|
|
*/
|
1993-09-04 10:09:32 +00:00
|
|
|
|
1995-01-09 18:21:16 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include "brush.h"
|
Release 940405
Tue Apr 5 14:36:59 1994 Bob Amstadt (bob@pooh)
* [include/mdi.h] [windows/mdi.c]
Use WM_PARENTNOTIFY messages to activate children.
Generate WM_CHILDACTIVATE messages.
Beginnings handler for maxmized child window.
Clean up when children are destroyed.
* [windows/message.c] [windows/nonclient.c] [windows/winpos.c]
Removed code add 94/03/26.
Apr 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c]
Make mouse menu navigation working again. :-))
(be carefull, clicking outside menus (ie.: clientrect)
not resolved yet)
* [windows/nonclient.c] [controls/scroll.c]
Bugs fix in NCTrackScrollBars().
* [misc/dos_fs.c]
Bug fix in 'ToDos()' in conversion for '/',
(example: '/window/' was translated to 'WINDOWs').
* [miscemu/int21.c]
Function ChangeDir() extract possible drive before DOS_ChangeDir().
* [loader/library.c] [loader/wine.c]
Playing around moving function GetProcAddress() and put some code in.
Mon Apr 4 21:39:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [misc/main.c]
Better explanation of command-line options.
* [objects/dib.c]
Implemented SetDIBitsToDevice().
* [windows/dc.c]
Bug fix in SetDCState().
* [windows/event.c]
Removed WS_DISABLED handling (now done in message.c).
* [windows/message.c]
Added sending a WM_PARENTNOTIFY message in MSG_TranslateMouseMsg().
Use WindowFromPoint() to find the window for mouse events, taking
into account disabled windows.
* [windows/painting.c]
Bug fix in BeginPaint() to allow calling it at other times than
on WM_PAINT (Solitaire needs it...)
* [windows/win.c]
Implemented FindWindow().
Rewritten EnableWindow() to behave more like Windows.
* [windows/winpos.c]
Rewritten WindowFromPoint() to also search child windows.
Mon Apr 4 17:36:32 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [include/int21.h] -> [msdos.h]
renamed.
* [miscemu/int10.h] [miscemu/int25.h] [miscemu/int26.h]
new, added for int 10, 25 and 26.
* [miscemu/ioports.c]
new, added to allow win apps to use ioports.
* [loader/signal.c]
Added support for in, inb, out, outb instructions.
Sun Mar 27 13:40:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (InsertMenu): Changed to use FindMenuItem().
Sat Mar 26 21:23:55 1994 Bob Amstadt (bob@pooh)
* [windows/mdi.c]
Window list properly updated.
* [windows/message.c]
Call WINPOS_ChildActivate() when mouse pressed.
* [windows/nonclient.c]
Use WINPOS_IsAnActiveWindow() instead of GetActiveWindow() in
NC_HandleNCPaint().
* [windows/winpos.c]
Created functions WINPOS_IsAnActiveWindow() and WINPOS_ActivateChild()
Thu Mar 24 14:49:17 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (DeleteMenu): Changed to use FindMenuItem
(DeleteMenu): Many bug fixes.
* [controls/menu.c]
Created function FindMenuItem().
Thu Mar 24 14:17:24 1994 Bob Amstadt (bob@pooh)
* [windows/win.c]
Removed incorrect MDI handling code from CreateWindowEx().
* [controls/menu.c]
MF_STRING items needed to allocate a private copy of string.
* [controls/menu.c]
Fixed buggy calls to GlobalFree().
* [memory/global.c]
Eliminated some redundant code with function call.
Wed Mar 23 1994 Pentti Moilanen (pentti.moilanen@ntc.nokia.com)
* [windows/timer.c]
timer list pointers looped in InsertTimer
Tue Mar 29 13:32:08 MET DST 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [misc/cursor.c]
A few changes for desktop window support.
* [misc/main.c]
Added -depth option.
* [misc/rect.c]
Yet another bug fix in SubtractRect().
* [objects/bitmap.c]
Changes to use only one depth (specified with -depth)
for color bitmaps.
* [objects/brush.c]
Added support for dithered solid brushes.
* [objects/color.c]
Use the same 20 system colors as in Windows.
System palette initialisation now done in COLOR_InitPalette().
Added support for a color mapping table to map logical color
indexes to X colormap entries.
Implemented GetNearestColor() and RealizeDefaultPalette().
* [objects/dib.c]
Added support for color mapping table.
* [objects/dither.c] (New file)
Implemented solid color dithering.
* [objects/palette.c]
Implemented GetSystemPaletteEntries() and SelectPalette().
* [windows/class.c]
Make a copy of the menu name in RegisterClass().
* [windows/dc.c]
Fixed device caps when using a desktop window.
Added support for the color mapping table in DCs.
* [windows/event.c]
Added ConfigureNotify handler on desktop window.
* [windows/message.c]
Removed call to XTranslateCoordinates() on every mouse motion
New function MSG_Synchronize() to synchronize with the X server.
* [windows/syscolor.c]
Rewritten SYSCOLOR_Init() to read the system colors from WIN.INI.
* [windows/winpos.c]
Added synchronization on window mapping. Solves the double redraw
problem when starting Solitaire.
Mar 27, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c] * [windows/defwnd.c]
Make keyboard navigation working with menubar,
but temporarely inserted a bug in menubar mouse handling ... :-((
(it will be fix next week !)
* [windows/defwnd.c]
Connect VK_MENU to menubar navigation.
* [loader/library.c]
GetModuleHandle() return 'fictive 0xF000+ handles' for built-in DLLs.
Sun Mar 20 22:32:13 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/main.c]
Added Copy(). Added a check for `-h' to show usage.
* [misc/dos_fs.c]
Fixed bug in FindFile(), to load directories as dlls.
* [misc/dos_fs.c]
Fixed ToUnix() and ToDos() again, as my previous patch
didn't make it.
* [misc/dos_fs.c] [miscemu/int21.c]
Bug fixes, should be able to handle all winfile and progman int21
requests now except for a few small things.
Tue Mar 29 06:25:54 1994 crw@harris.mlb.semi.harris.com (Carl Williams)
* [memory/heap.c]
Implemented GetFreeSystemResources().
Mon Mar 21 17:32:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (GetSubMenu): Function did not return correct value
* [windows/mdi.c]
Beginnings of menu handling.
Thu Mar 10 11:32:06 1994 Stefan (SAM) Muenzel (muenzel@tat.physik.uni-tuebingen.de)
* [objects/font.c]
if font.width equals zero use asterix instead.
Mon Mar 21 17:23:37 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/bitmap.c]
Rewritten bitmap code to use exclusively X pixmaps; *much* faster.
* [objects/brush.c]
Some changes with pattern brushes because of the new bitmap code.
* [objects/color.c]
Added function COLOR_ToPhysical for better color mapping.
* [objects/dib.c]
Heavily optimized SetDIBits().
* [windows/dc.c]
Opimized SetDCState() and DC_SetupGC*() functions.
Added stub for CreateIC().
Mar 20, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [misc/message.c]
Call SetFocus() after closing box to give back focus to previous owner.
* [misc/files.c]
Small bug fix in GetTempFilename() : replace a '\' to '\\'.
* [control/scroll.c]
Calls to BitBlt() replace by StretchBlt().
* [control/menu.c]
Call SetFocus() to previous owner after closing Popups.
Fill stub DeleteMenu().
* [control/listbox.c]
* [control/combo.c]
Use SetFocus() in WM_LBUTTONDOWN.
Close ComboBox List upon WM_KILLFOCUS.
Early development of WM_MEASUREITEM mecanism.
* [windows/defwnd.c]
Early development of WM_MEASUREITEM mecanism.
Tue Mar 22 10:44:57 1994 Miguel de Icaza (miguel@xochitl)
* [misc/atom.c]
Fixed sintaxis problem when building the library.
Tue Mar 15 13:11:56 1994 Bob Amstadt (bob@pooh)
* [include/windows.h]
Added message types and structures for MDI
* [include/mdi.h]
Created internal structures for handling MDI
* [windows/mdi.c]
Began creating MDI support
Thu Mar 10 16:51:46 1994 Bob Amstadt (bob@pooh)
* [loader/wine.c] [include/wine.h]
Added new field to "struct w_files" to hold the "name table"
resource for Windows 3.0 programs
* [loader/resource.c]
Added code to handle programs with a "name table" resource.
LoadResourceByName() modified to check for the existence of
this resource.
Mon Mar 14 22:31:42 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c]
Added installing the private colormap on the desktop window.
* [windows/event.c]
Cleaned up focus event handling (see focus.c).
Use GetFocus() to direct key events to the correct window.
* [windows/focus.c]
Rewritten SetFocus() to:
- only set X focus on top-level windows
- send WM_SETFOCUS and WM_KILLFOCUS messages (was done in event.c)
- prevent setting focus to disabled windows
- install private colormap so -privatemap option works again
* [windows/message.c] [windows/timer.c]
Changed timer management to no longer use PostMessage(), but
to generate timer messages on the fly. Also fixed a related bug
in GetMessage() which could cause busy-waiting.
* [windows/win.c]
Only select focus events on top-level windows.
* [windows/winpos.c]
Added some sanity checks for desktop window.
Fri Mar 4 20:42:01 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/dos_fs.c]
bug fixes in ToUnix(), WinIniFileName(), GetUnixFileName().
Support for tilde symbol added for rootdirectories in [drives]
section of wine's configfile.
* [misc/file.c]
hread(), hwrite() added.
* [misc/main.c]
hmemcpy() added.
* [if1632/stress.spec] [include/stress.h] [misc/stress.c]
Added STRESS.DLL, an useless dll used to stress a windows system.
* [*/*]
Added missing #includes, fixed prototypes for prototype checking.
* [include/prototypes.h]
Added prototypes for loader/*c, if1632/*c.
Tue Mar 8 09:54:34 1994 Bob Amstadt (bob@pooh)
* [Configure]
Added reminder to set WINEPATH, if it is not set.
* [Imakefile]
Removed #elif's
* [controls/button.c]
Added BN_CLICKED notification for owner-draw buttons.
* [if1632/kernel.spec] [memory/heap.c]
Changed Local* functions to WIN16_Local* to prevent unconcious use
of these functions.
* [if1632/relay.c]
Push old Stack16Frame on stack before setting.
* [include/atom.h] [misc/atom.c] [include/heap.h] [memory/local.c]
Added multiple local heap handling in Atom* functions.
* [include/regfunc.h] [miscemu/int21.c]
Rewrote DOS3Call() use context frame that is already on the stack.
* [misc/profile.c]
Fixed to allow leading ";" to mark comments.
* [misc/spy.c]
Fixed bugs and added support for "include" and "exclude" filters.
* [misc/user.c]
Rearranged calls in InitApp().
* [misc/font.c]
Fixed font handling to create system fonts, if they are used.
* [windows/dc.c]
If text drawn on window with no font specified, then default the
font to the system font.
Mon Mar 7 20:32:09 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [controls/desktop.c]
Added handling of WM_NCCREATE and WM_ERASEBKGND functions.
Implemented SetDeskPattern().
* [misc/main.c]
Added -desktop option to get a large desktop window with
everything inside it.
Added -name option.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/*.c]
Replaced the DefaultRootWindow() macro by the rootWindow variable.
* [windows/event.c] [windows/message.c]
[windows/nonclient.c] [windows/win.c]
A few changes to accomodate the new desktop window.
Tue Mar 8 11:13:03 1994 Miguel de Icaza (miguel@xochitl.nuclecu.unam.mx)
* [toolkit/arch.c] --New file--
Routines for converting little endian data structures to
big-endian data structures, currently only BITMAP structures are
converted.
* [misc/atom.c]
When used as part of the WineLib, the code is much simpler.
Doesn't depend on alignement.
* [loader/wine.c]
Ifdefed Emulator dependent code if compiling WineLib.
* [loader/resource.c]
Moved misc/resource.c to loader/resource.c.
* [loader/dump.c,ldt.c,ldtlib.c,library,c,selector.c,signal.c]
Ifdefed whole code if compiling WINELIB.
* [include/winsock.h]
Added compilation define to allow compilation on SunOS.
* [include/wine.h]
Removed load_typeinfo and load_nameinfo prototypes, they belong
to neexe.h
* [include/neexe.h]
Added load_typeinfo and load_nameinfo prototypes.
* [include/arch.h]
Fixed some bugs in the conversion routines.
Added macros for Bitmap loading.
Tue Mar 8 12:52:05 1994 crw@maniac.mlb.semi.harris.com (Carl Williams)
* [if1632/kernel.spec] [memory/global.c]
Implemented GetFreeSpace()
* [if1632/user.spec] [loader/resource.c]
Implemented CreateIcon()
1994-04-05 21:42:43 +00:00
|
|
|
#include "bitmap.h"
|
1994-10-17 18:12:41 +00:00
|
|
|
#include "debug.h"
|
1993-09-04 10:09:32 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
1996-11-02 14:24:07 +00:00
|
|
|
* CreateBrushIndirect16 (GDI.50)
|
1993-09-04 10:09:32 +00:00
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH16 WINAPI CreateBrushIndirect16( const LOGBRUSH16 * brush )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
|
|
|
|
BRUSHOBJ * brushPtr;
|
1996-10-13 17:45:47 +00:00
|
|
|
HBRUSH16 hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
|
1993-09-04 10:09:32 +00:00
|
|
|
if (!hbrush) return 0;
|
1997-08-24 16:00:30 +00:00
|
|
|
brushPtr = (BRUSHOBJ *) GDI_HEAP_LOCK( hbrush );
|
1996-11-02 14:24:07 +00:00
|
|
|
brushPtr->logbrush.lbStyle = brush->lbStyle;
|
|
|
|
|
brushPtr->logbrush.lbColor = brush->lbColor;
|
|
|
|
|
brushPtr->logbrush.lbHatch = brush->lbHatch;
|
1997-08-24 16:00:30 +00:00
|
|
|
GDI_HEAP_UNLOCK( hbrush );
|
1998-11-22 17:45:06 +00:00
|
|
|
TRACE(gdi, "%04x\n", hbrush);
|
1993-09-04 10:09:32 +00:00
|
|
|
return hbrush;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
1996-11-02 14:24:07 +00:00
|
|
|
* CreateBrushIndirect32 (GDI32.27)
|
1993-09-04 10:09:32 +00:00
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH32 WINAPI CreateBrushIndirect32( const LOGBRUSH32 * brush )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
1996-11-02 14:24:07 +00:00
|
|
|
BRUSHOBJ * brushPtr;
|
|
|
|
|
HBRUSH32 hbrush = GDI_AllocObject( sizeof(BRUSHOBJ), BRUSH_MAGIC );
|
|
|
|
|
if (!hbrush) return 0;
|
1997-08-24 16:00:30 +00:00
|
|
|
brushPtr = (BRUSHOBJ *) GDI_HEAP_LOCK( hbrush );
|
1996-11-02 14:24:07 +00:00
|
|
|
brushPtr->logbrush.lbStyle = brush->lbStyle;
|
|
|
|
|
brushPtr->logbrush.lbColor = brush->lbColor;
|
|
|
|
|
brushPtr->logbrush.lbHatch = brush->lbHatch;
|
1997-08-24 16:00:30 +00:00
|
|
|
GDI_HEAP_UNLOCK( hbrush );
|
1998-11-22 17:45:06 +00:00
|
|
|
TRACE(gdi, "%08x\n", hbrush);
|
1996-11-02 14:24:07 +00:00
|
|
|
return hbrush;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateHatchBrush16 (GDI.58)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH16 WINAPI CreateHatchBrush16( INT16 style, COLORREF color )
|
1996-11-02 14:24:07 +00:00
|
|
|
{
|
|
|
|
|
LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%d %06lx\n", style, color );
|
1993-09-04 10:09:32 +00:00
|
|
|
if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
|
1996-11-02 14:24:07 +00:00
|
|
|
return CreateBrushIndirect32( &logbrush );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateHatchBrush32 (GDI32.48)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH32 WINAPI CreateHatchBrush32( INT32 style, COLORREF color )
|
1996-11-02 14:24:07 +00:00
|
|
|
{
|
|
|
|
|
LOGBRUSH32 logbrush = { BS_HATCHED, color, style };
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%d %06lx\n", style, color );
|
1996-11-02 14:24:07 +00:00
|
|
|
if ((style < 0) || (style >= NB_HATCH_STYLES)) return 0;
|
|
|
|
|
return CreateBrushIndirect32( &logbrush );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreatePatternBrush16 (GDI.60)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH16 WINAPI CreatePatternBrush16( HBITMAP16 hbitmap )
|
1996-11-02 14:24:07 +00:00
|
|
|
{
|
|
|
|
|
return (HBRUSH16)CreatePatternBrush32( hbitmap );
|
1993-09-04 10:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
1996-11-02 14:24:07 +00:00
|
|
|
* CreatePatternBrush32 (GDI32.54)
|
1993-09-04 10:09:32 +00:00
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH32 WINAPI CreatePatternBrush32( HBITMAP32 hbitmap )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
1996-11-02 14:24:07 +00:00
|
|
|
LOGBRUSH32 logbrush = { BS_PATTERN, 0, 0 };
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%04x\n", hbitmap );
|
1993-09-04 10:09:32 +00:00
|
|
|
|
1998-10-28 09:53:53 +00:00
|
|
|
logbrush.lbHatch = (INT32)BITMAP_CopyBitmap( hbitmap );
|
|
|
|
|
if(!logbrush.lbHatch)
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
return CreateBrushIndirect32( &logbrush );
|
1996-11-02 14:24:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateDIBPatternBrush16 (GDI.445)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
|
1996-11-02 14:24:07 +00:00
|
|
|
{
|
|
|
|
|
LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
|
|
|
|
BITMAPINFO *info, *newInfo;
|
|
|
|
|
INT32 size;
|
|
|
|
|
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%04x\n", hbitmap );
|
1996-11-02 14:24:07 +00:00
|
|
|
|
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
|
|
|
|
|
|
if (!(info = (BITMAPINFO *)GlobalLock16( hbitmap ))) return 0;
|
|
|
|
|
|
|
|
|
|
if (info->bmiHeader.biCompression)
|
|
|
|
|
size = info->bmiHeader.biSizeImage;
|
|
|
|
|
else
|
1998-11-14 11:20:51 +00:00
|
|
|
size = DIB_GetDIBWidthBytes(info->bmiHeader.biWidth,
|
|
|
|
|
info->bmiHeader.biBitCount) *
|
|
|
|
|
info->bmiHeader.biHeight;
|
1996-11-02 14:24:07 +00:00
|
|
|
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 );
|
1993-09-04 10:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
1996-11-02 14:24:07 +00:00
|
|
|
* CreateDIBPatternBrush32 (GDI32.34)
|
1998-11-08 15:07:22 +00:00
|
|
|
*
|
|
|
|
|
* Create a logical brush which has the pattern specified by the DIB
|
|
|
|
|
*
|
|
|
|
|
* Function call is for compatability only. CreateDIBPatternBrushPt should be used.
|
|
|
|
|
*
|
|
|
|
|
* RETURNS
|
|
|
|
|
*
|
|
|
|
|
* Handle to a logical brush on success, NULL on failure.
|
|
|
|
|
*
|
|
|
|
|
* BUGS
|
|
|
|
|
*
|
1993-09-04 10:09:32 +00:00
|
|
|
*/
|
1998-11-08 15:07:22 +00:00
|
|
|
HBRUSH32 WINAPI CreateDIBPatternBrush32(
|
|
|
|
|
HGLOBAL32 hbitmap, /* Global object containg BITMAPINFO structure */
|
|
|
|
|
UINT32 coloruse /* Specifies color format, if provided */
|
|
|
|
|
)
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
1996-11-02 14:24:07 +00:00
|
|
|
LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
1993-09-04 10:09:32 +00:00
|
|
|
BITMAPINFO *info, *newInfo;
|
1996-11-02 14:24:07 +00:00
|
|
|
INT32 size;
|
1993-09-04 10:09:32 +00:00
|
|
|
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%04x\n", hbitmap );
|
1993-09-04 10:09:32 +00:00
|
|
|
|
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
|
|
1996-11-02 14:24:07 +00:00
|
|
|
if (!(info = (BITMAPINFO *)GlobalLock32( hbitmap ))) return 0;
|
1993-09-04 10:09:32 +00:00
|
|
|
|
Release 960611
Tue Jun 11 15:20:43 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/break.c] [loader/signal.c]
Fixed breakpoints in 32-bit code.
* [include/windows.h]
Added many more Win32 versions of standard structures.
* [include/winreg.h] [misc/registry.c]
Moved private types into registry.c.
* [memory/string.c] (New file)
Moved most string functions from misc/lstr.c; added Win32 version
of all functions.
* [misc/wsprintf.c]
Implemented Win32 wsprintf functions.
* [objects/bitmap.c]
Implemented Win32 bitmap functions.
* [windows/dialog.c]
Don't set dialog procedure before the controls are created. This
avoids a crash in Winhelp.
Tue Jun 11 14:10:06 1996 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [controls/menu.c] [if1632/user.spec] [windows/message.c]
Replace PeekMessage with PeekMessage16.
* [if1632/kernel32.spec][misc/main.c]
GetVersion32,GetVersionEx32A,GetVersionEx32W: new functions.
MAIN_ParseVersion: new function, new command line option -winver.
GetVersion: modified to take command line argument into account.
* [if1632/kernel32.spec] [win32/process.c]
FreeLibrary32: new function.
TlsAlloc: initialize Tls to zero.
InterlockedIncrement,InterlockedDecrement,InterlockedExchange: new
functions.
* [if1632/kernel32.spec]
SetErrorMode,GetActiveWindow: new relays to existing functions.
* [if1632/kernel32.spec][win32/user32.c]
PeekMessage32A,PeekMessage32W: new functions.
* [include/struct32.h][include/windows.h]
Moved MSG32 to windows.h.
Renamed MSG to MSG16.
Modified prototypes to use MSG16
* [include/winbase.h]
OSVERSIONINFO32A,OSVERSIONINFO32W: new structures.
Sun Jun 9 20:53:30 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/Makefile.in] [loader/builtin.c]
version.dll,lz32.dll added.
* [include/lzexpand.h] [if1632/lz32.spec] [if1632/lzexpand.spec]
[misc/lzexpand.c]
lz32.dll added.
Modified to new function naming standard.
* [include/ver.h] [if1632/ver.spec] [if1632/version.spec] [misc/ver.c]
version.dll added (win32 version of ver.dll).
Modified to new function naming standard.
Use registry to look up a LOCALE langids too.
(VerInstallFile,VerFindFile still stubs)
Fri Jun 7 20:40:20 1996 Albrecht Kleine <kleine@ak.sax.de>
* [files/file.c]
Added a warning if GetTempFileName() gets a bad drive parameter.
* [misc/commdlg.c]
Changed file listbox color to gray in SaveFile dialog
(just like Windows does this).
1996-06-11 16:02:08 +00:00
|
|
|
if (info->bmiHeader.biCompression)
|
|
|
|
|
size = info->bmiHeader.biSizeImage;
|
|
|
|
|
else
|
1998-11-14 11:20:51 +00:00
|
|
|
size = DIB_GetDIBWidthBytes(info->bmiHeader.biWidth,
|
|
|
|
|
info->bmiHeader.biBitCount) *
|
|
|
|
|
info->bmiHeader.biHeight;
|
1993-09-04 10:09:32 +00:00
|
|
|
size += DIB_BitmapInfoSize( info, coloruse );
|
|
|
|
|
|
1996-11-02 14:24:07 +00:00
|
|
|
if (!(logbrush.lbHatch = (INT32)GlobalAlloc16( GMEM_MOVEABLE, size )))
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
1996-05-06 16:06:24 +00:00
|
|
|
GlobalUnlock16( hbitmap );
|
1993-09-04 10:09:32 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
1996-10-13 17:45:47 +00:00
|
|
|
newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
|
1993-09-04 10:09:32 +00:00
|
|
|
memcpy( newInfo, info, size );
|
1996-10-13 17:45:47 +00:00
|
|
|
GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
|
1998-11-14 11:20:51 +00:00
|
|
|
GlobalUnlock32( hbitmap );
|
1996-11-02 14:24:07 +00:00
|
|
|
return CreateBrushIndirect32( &logbrush );
|
1998-11-08 15:07:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateDIBPatternBrushPt32 (GDI32.35)
|
|
|
|
|
*
|
|
|
|
|
* Create a logical brush which has the pattern specified by the DIB
|
|
|
|
|
*
|
|
|
|
|
* RETURNS
|
|
|
|
|
*
|
|
|
|
|
* Handle to a logical brush on success, NULL on failure.
|
|
|
|
|
*
|
|
|
|
|
* BUGS
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
HBRUSH32 WINAPI CreateDIBPatternBrushPt32(
|
|
|
|
|
BITMAPINFO *info, /* Pointer to a BITMAPINFO structure */
|
|
|
|
|
UINT32 coloruse /* Specifies color format, if provided */
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 };
|
|
|
|
|
BITMAPINFO *newInfo;
|
|
|
|
|
INT32 size;
|
|
|
|
|
|
1998-11-14 11:20:51 +00:00
|
|
|
TRACE(gdi, "%p\n", info );
|
1998-11-08 15:07:22 +00:00
|
|
|
|
|
|
|
|
/* Make a copy of the bitmap */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (info->bmiHeader.biCompression)
|
|
|
|
|
size = info->bmiHeader.biSizeImage;
|
|
|
|
|
else
|
1998-11-14 11:20:51 +00:00
|
|
|
size = DIB_GetDIBWidthBytes(info->bmiHeader.biWidth,
|
|
|
|
|
info->bmiHeader.biBitCount) *
|
|
|
|
|
info->bmiHeader.biHeight;
|
1998-11-08 15:07:22 +00:00
|
|
|
size += DIB_BitmapInfoSize( info, coloruse );
|
|
|
|
|
|
|
|
|
|
if (!(logbrush.lbHatch = (INT32)GlobalAlloc16( GMEM_MOVEABLE, size )))
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
newInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch );
|
|
|
|
|
memcpy( newInfo, info, size );
|
|
|
|
|
GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch );
|
|
|
|
|
return CreateBrushIndirect32( &logbrush );
|
1993-09-04 10:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateSolidBrush (GDI.66)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH16 WINAPI CreateSolidBrush16( COLORREF color )
|
1996-11-02 14:24:07 +00:00
|
|
|
{
|
|
|
|
|
LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%06lx\n", color );
|
1996-11-02 14:24:07 +00:00
|
|
|
return CreateBrushIndirect32( &logbrush );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* CreateSolidBrush32 (GDI32.64)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
HBRUSH32 WINAPI CreateSolidBrush32( COLORREF color )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
1996-11-02 14:24:07 +00:00
|
|
|
LOGBRUSH32 logbrush = { BS_SOLID, color, 0 };
|
1998-03-15 20:29:56 +00:00
|
|
|
TRACE(gdi, "%06lx\n", color );
|
1996-11-02 14:24:07 +00:00
|
|
|
return CreateBrushIndirect32( &logbrush );
|
1993-09-04 10:09:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* SetBrushOrg (GDI.148)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
DWORD WINAPI SetBrushOrg( HDC16 hdc, INT16 x, INT16 y )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
Release 960728
Sun Jul 28 17:57:19 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/task.c] [include/task.h]
Implemented SwitchStackTo()/SwitchStackBack().
* [include/wintypes.h] [loader/main.c]
Added __winelib variable to distinguish between emulator and
library at run-time. Later on, this should avoid some
recompilations when building Winelib.
* [windows/property.c]
Implemented Win32 functions for window properties.
Fri Jul 26 18:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [controls/listbox.c]
Implemented LBS_SORT style, WM_COMPAREITEM, and WM_DELETEITEM
messages.
* [controls/menu.c]
Call TranslateMessage() to enable shortcuts (on WM_CHAR).
* [include/cursoricon.h]
Moved #pragma pack(1) back to where it belongs.
* [objects/palette.c]
RealizeDefaultPalette() maps to system colors only.
Do not broadcast palette notifications when in TrueColor.
* [objects/color.c] [include/palette.h]
Miscellaneous optimizations. Had to fix several
"improvements" made to my patch for previous release.
* [objects/dib.c]
Reverse dib bits order for 24-bit SetDIBits().
* [objects/dc.c]
GetDeviceCaps() does not return RC_PALETTE when in TrueColor.
* [windows/scroll.c]
Scroll update region too.
* [windows/message.c]
Include QS_MOUSE into the event mask for nonclient mouse
message filter. Fixes problems with Word 6 freezing when
mouse hits nonclient area.
* [windows/win.c]
Allow top-level windows to be linked as HWND_TOP in CreateWindow().
* [windows/winpos.c] [windows/mdi.c]
Attempt to fix control menu duplication.
Fri Jul 26 09:49:35 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/drive.c]
GetDriveType32A(): return value for CDROM fixed.
* [files/file.c]
SearchPath* added.
* [if1632/gdi32.spec] [objects/brush.c]
SetBrushOrgEx() added.
* [loader/pe_resource.c]
If even loading the default entry fails, we just use the first
entry from the resource directory.
[loader/task.c]
SetSigHandler() stub added, Paradox 4.5 now starts up.
* [misc/comm.c] [include/windows.h] [if1632/kernel32.spec]
COMM functions updated to win32, not complete.
* [misc/lstr.c]
FormatMessageA partially implemented.
* [include/miscemu.h] [memory/selector.c]
[memory/global.c] [miscemu/dosmem.c]
DOS memory handling changed: 1MB preallocated block, real-mode
segment handling possible, SetSelectorBase into lower physical 1MB
possible.
* [miscemu/dpmi.c]
Real-mode segments changed, real-mode int 21,ax=6506 added.
AX=0x0303 added.
* [multimedia/time.c]
Fixed bug in killTimer.
* [objects/bitmap.c]
LoadImageA partially implemented.
Wed Jul 24 18:20:24 1996 Albrecht Kleine <kleine@ak.sax.de>
* [include/dde_mem.h][include/dde_proc.h]
[ipc/dde_atom.c][ipc/dde_proc.c][windows/message.c]
[ipc/generic_hash.h][library/miscstubs.c]
Changes for error free compilation using "--with-ipc":
replaced some names with *16-equivalent (e.g. MSG to MSG16),
modified prototype of function DDE_GlobalFree() .
* [objects/palette.c]
Added check for metafile-DC in GDISelectPalette(),
GDIRealizePalette(),RealizeDefaultPalette() and
IsDCCurrentPalette().
Tue Jul 23 22:46:53 1996 Andrew Lewycky <plewycky@oise.utoronto.ca>
* [controls/edit.c]
EDIT_WM_Create: Don't EDIT_EM_ReplaceSel if created with lParam = "",
fixes Winhelp.
* [windows/dialog.c]
DIALOG_CreateIndirect: Initialise dlgProc before creating children.
1996-07-28 18:50:11 +00:00
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* SetBrushOrgEx (GDI32.308)
|
|
|
|
|
*/
|
1997-08-24 16:00:30 +00:00
|
|
|
BOOL32 WINAPI SetBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
|
Release 960728
Sun Jul 28 17:57:19 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/task.c] [include/task.h]
Implemented SwitchStackTo()/SwitchStackBack().
* [include/wintypes.h] [loader/main.c]
Added __winelib variable to distinguish between emulator and
library at run-time. Later on, this should avoid some
recompilations when building Winelib.
* [windows/property.c]
Implemented Win32 functions for window properties.
Fri Jul 26 18:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [controls/listbox.c]
Implemented LBS_SORT style, WM_COMPAREITEM, and WM_DELETEITEM
messages.
* [controls/menu.c]
Call TranslateMessage() to enable shortcuts (on WM_CHAR).
* [include/cursoricon.h]
Moved #pragma pack(1) back to where it belongs.
* [objects/palette.c]
RealizeDefaultPalette() maps to system colors only.
Do not broadcast palette notifications when in TrueColor.
* [objects/color.c] [include/palette.h]
Miscellaneous optimizations. Had to fix several
"improvements" made to my patch for previous release.
* [objects/dib.c]
Reverse dib bits order for 24-bit SetDIBits().
* [objects/dc.c]
GetDeviceCaps() does not return RC_PALETTE when in TrueColor.
* [windows/scroll.c]
Scroll update region too.
* [windows/message.c]
Include QS_MOUSE into the event mask for nonclient mouse
message filter. Fixes problems with Word 6 freezing when
mouse hits nonclient area.
* [windows/win.c]
Allow top-level windows to be linked as HWND_TOP in CreateWindow().
* [windows/winpos.c] [windows/mdi.c]
Attempt to fix control menu duplication.
Fri Jul 26 09:49:35 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/drive.c]
GetDriveType32A(): return value for CDROM fixed.
* [files/file.c]
SearchPath* added.
* [if1632/gdi32.spec] [objects/brush.c]
SetBrushOrgEx() added.
* [loader/pe_resource.c]
If even loading the default entry fails, we just use the first
entry from the resource directory.
[loader/task.c]
SetSigHandler() stub added, Paradox 4.5 now starts up.
* [misc/comm.c] [include/windows.h] [if1632/kernel32.spec]
COMM functions updated to win32, not complete.
* [misc/lstr.c]
FormatMessageA partially implemented.
* [include/miscemu.h] [memory/selector.c]
[memory/global.c] [miscemu/dosmem.c]
DOS memory handling changed: 1MB preallocated block, real-mode
segment handling possible, SetSelectorBase into lower physical 1MB
possible.
* [miscemu/dpmi.c]
Real-mode segments changed, real-mode int 21,ax=6506 added.
AX=0x0303 added.
* [multimedia/time.c]
Fixed bug in killTimer.
* [objects/bitmap.c]
LoadImageA partially implemented.
Wed Jul 24 18:20:24 1996 Albrecht Kleine <kleine@ak.sax.de>
* [include/dde_mem.h][include/dde_proc.h]
[ipc/dde_atom.c][ipc/dde_proc.c][windows/message.c]
[ipc/generic_hash.h][library/miscstubs.c]
Changes for error free compilation using "--with-ipc":
replaced some names with *16-equivalent (e.g. MSG to MSG16),
modified prototype of function DDE_GlobalFree() .
* [objects/palette.c]
Added check for metafile-DC in GDISelectPalette(),
GDIRealizePalette(),RealizeDefaultPalette() and
IsDCCurrentPalette().
Tue Jul 23 22:46:53 1996 Andrew Lewycky <plewycky@oise.utoronto.ca>
* [controls/edit.c]
EDIT_WM_Create: Don't EDIT_EM_ReplaceSel if created with lParam = "",
fixes Winhelp.
* [windows/dialog.c]
DIALOG_CreateIndirect: Initialise dlgProc before creating children.
1996-07-28 18:50:11 +00:00
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
Release 971221
Fri Dec 19 10:50:46 1997 Douglas Ridgway <ridgway@winehq.com>
* [Make.rules.in] [Makefile.in] [documentation/Makefile.in]
[documentation/README.documentation]
First cut at Wine API documentation. No longer install reference
manual by default.
Wed Dec 17 21:32:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed GetTempFileName16() to use current path of requested drive
as needed.
* [if1632/Makefile.in] [if1632/builtin.c] [if1632/dciman32.spec]
[if1632/msvfw32.spec] [if1632/tapi32.spec] [if1632/wow32.spec]
Added misc DLLs needed by various apps.
Wed Dec 17 12:01:50 1997 Morten Eriksen <mortene@sim.no>
* [if1632/gdi32.spec] [include/windows.h] [objects/palette.c]
Inserted empty stub for CreateHalftonePalette.
Tue Dec 16 22:08:06 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/mdi.c]
Use VK_TAB instead of VK_SEPARATOR in TranslateMDISysAccel().
* [graphics/metafiledrv/init.c]
DeleteDC() on a MetaDC doesn't do anything - it shouldn't. Therefore
fix cleanup of MetaDCs in CloseMetaFile(); they now actually get
removed from the GDI heap!
* [graphics/x11drv/xfont.c]
Preserve FO_MATCH_XYINDEP flag in XFONT_MatchFIList(). Should reduce
the number of bold-italic matches.
Tue Dec 16 20:11:43 1997 Bertho Stultiens <bertho@panter.soci.aau.dk>
* [graphics/painting.c]
Included an implementation of DrawState
* [if1632/thunk.c]
Changed many fprintfs into dprintf_thunk
* [include/cache.h] [graphics/cache.c]
New files to hold cached handles to regulary used GDI object.
* [include/windows.h]
Added DRAWSTATExx typedefs
Added DSS_DEFAULT define for DrawState
* [objects/text.c]
New implementation of GrayString()
* [controls/uitools.c]
Implemented DrawFrameControl() functions
Changed DrawEdge() behaviour to win95 implementation
Mon Dec 15 23:43:01 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [graphics/path.c] [include/path.h] [graphics/painting.c]
[if1632/gdi32.spec] [include/gdi.h] [include/windows.h]
[objects/dc.c]
Added preliminary support for GDI paths.
* [objects/dc.c]
Added DC_Init_DC_INFO function for initializing WIN_DC_INFO
structure.
* [include/windows.h] [include/gdi.h] [objects/gdiobj.c]
Added DEFAULT_GUI_FONT.
* [include/winerror.h]
Added a few error codes.
* [memory/heap.c]
Changed HeapAlloc to make the correct calls to SetLastError
(now conforms to NT's behaviour).
* [windows/win.c]
Changed WIN_CreateWindowEx to allow child windows with zero
width / height.
Sun Dec 14 12:01:07 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [if1632/*] [relay32/*]
Moved all 32-bit relay stuff to relay32/
* [fi1632/thunk.c] [win32/kernel32.c]
Moved all KERNEL32 ordinal functions to kernel32.c
* [memory/selector.c]
Initialize selectors in AllocSelectorArray.
* [tools/build.c]
Generate C instead of assembly for Win32 relays.
Fixed stack corruption in CallTo16 functions, found by Bertho
Stultiens.
Sun Dec 14 10:55:00 1997 Andreas Mohr <100.30936@germany.net>
* [if1632/Makefile.in] [if1632/builtin.c] [if1632/ole2thk.spec]
Added built-in OLE2THK.DLL.
* [if1632/toolhelp.spec] [include/toolhelp.h] [memory/selector.c]
[misc/toolhelp.c]
Added stubs for StackTraceFirst(), StackTraceCSIPFirst(),
StackTraceNext(), UTSelectorOffsetToLinear()
and UTLinearToSelectorOffset().
Sat Dec 13 17:26:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [misc/winsock.c]
32-bit API fixes for reported problems (thanks to Marcus
and David).
* [graphics/x11drv/xfont.c]
Little tweak in point size calculation.
* [windows/defwnd.c] [windows/dce.c] [windows/winhelp.c]
[windows/winproc.c] [windows/win.c]
Bug fixes.
Sat Dec 13 16:35:14 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [files/dos_fs.c]
OpenFile with empty filename and OF_PARSE returns current dir.
* [misc/commdlg.c]
Ignore initial dir if bogus.
* [files/file.c]
Locking an identic region in a file must not be an error.
* [misc/lstr.c]
Use wide char ctype functions.
Fri Dec 12 23:46:22 1997 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [file/drive.c]
First attempt for GetDiskFreeSpaceEx.
Fri Dec 12 23:18:41 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [loader/pe_resource.c]
Fixed wrongly appearing menus problem (only use default lookups in
last resource subtree).
* [multimedia/*.c]
Added win32 support for time* and joy* lowlevel drivers,
(not excessively tested), some misc fixes and cleanups.
* [misc/shellord.c][misc/shell.c][ole/folders.c][ole/ifs.c]
[include/interfaces.h][include/shlobj.h]
Added some more undocumented SHELL32 functions, some shell folder
interface stubs added, SHGetMalloc, SHGetDesktopFolder,
SHGetSpecialFolderLocation, SHGetPathFromIDList stubs added,
IMalloc, IUnknown implemented.
* [windows/msgbox.c]
Implemented MessageBoxIndirect*, some internal changes.
* [if1632/thunk.c]
KERNEL_431 implemented.
* [objects/gdiobj.c]
GetCurrentObject implemented.
Wed Dec 3 01:09:17 1997 Gordon Chaffee <chaffee@apu.cs.berkeley.edu>
* [objects/dib.c]
Fix a couple small DIB problems.
* [controls/edit.c]
Fix a typo.
* [files/dos_fs.c]
Try normal readdir in case fs is specified as vfat but isn't.
* [files/profile.c]
Implementation of WritePrivateProfileSection32A from Uwe Bonnes.
* [misc/printdrv.c]
OpenPrinter32A stub, helps Word97 start.
* [objects/text.c]
Fixup implementation of GetTextCharsetInfo.
* [scheduler/process.c]
Fix environment variable expansion.
* [win32/code_page.c]
Make MultiByteToWideChar and WideCharToMultiByte conform in return
values and error conditions to those in Windows NT 4.0.
* [windows/message.c]
Fix broadcasting problems in Win32. The Win32 docs say to use
HWND_TOPMOST to broadcast to all Win32 Windows.
* [memory/virtual.c] [loader/pe_image.c]
Do not map in VirtualAlloc if address is specified and space is
not available. This is required by Win32.
* [include/pen.h] [include/x11drv.h] [objects/dc.c]
[objects/pen.c] [graphics/x11drv/pen.c]
Support for ExtCreatePen.
Tue Dec 2 20:22:06 1997 Morten Welinder <terra@diku.dk>
* [*/*.c] [*/*.h]
Add lots of prototypes.
* [if1632/kernel32.spec][include/windows.h][include/winnt.h]
[misc/cpu.c]
Define IsProcessorFeaturePresent.
* [misc/crtdll.c]
(CRTDLL__getcwd): Allocate enough memory for the terminating zero.
* [misc/ver.c]
Improve check for null component in _find_data[AW]. Plug leaks
in VerQueryValue*.
* [win32/console.c][if1632/kernel32.spec]
Add stubs for GetConsoleCursorInfo32, SetConsoleCursorInfo32.
* [windows/message.c][if1632/user32.spec][include/windows.h]
Define SendMessageTimeout*.
* [graphics/x11drv/xfont.c]
Change algorithm of __genericCheckSum to be alignment safe.
* [misc/main.c] [misc/winsock.c] [misc/winsock_dns.c]
Include winsock.h early to avoid Solaris problem.
* [include/windows.h]
Undef FSHIFT before we define it.
* [rc/winerc.c]
Include <fcntl.h> instead of <sys/fcntl.h>.
* [files/file.c]
Use strerror in FILE_SetDosError if available.
* [include/config.h.in] [configure.in]
Check for strerror.
* [objects/gdiobj.c]
Make static font structures aligned.
Mon Dec 1 10:10:21 1997 Karl Garrison <karlos@eznet.net>
* [win32/console.c] [if1632/kernel32.spec] [include/windows.h]
Added stub for GetNumberOfConsoleMouseButtons.
Added stub for PeekConsoleInput(A,W).
Fixed parameter list for WriteConsole(A,W).
GetNumberOfConsoleInputEvents now returns 0 events instead of 1
(since low-level console functions are not yet supported).
GetConsoleMode no longer returns ENABLE_WINDOW_INPUT and
ENABLE_MOUSE_INPUT since these are not currently implemented.
1997-12-21 19:17:50 +00:00
|
|
|
/***********************************************************************
|
|
|
|
|
* FixBrushOrgEx (GDI32.102)
|
|
|
|
|
* SDK says discontinued, but in Win95 GDI32 this is the same as SetBrushOrgEx
|
|
|
|
|
*/
|
|
|
|
|
BOOL32 WINAPI FixBrushOrgEx( HDC32 hdc, INT32 x, INT32 y, LPPOINT32 oldorg )
|
|
|
|
|
{
|
|
|
|
|
return SetBrushOrgEx(hdc,x,y,oldorg);
|
|
|
|
|
}
|
|
|
|
|
|
Release 960728
Sun Jul 28 17:57:19 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [loader/task.c] [include/task.h]
Implemented SwitchStackTo()/SwitchStackBack().
* [include/wintypes.h] [loader/main.c]
Added __winelib variable to distinguish between emulator and
library at run-time. Later on, this should avoid some
recompilations when building Winelib.
* [windows/property.c]
Implemented Win32 functions for window properties.
Fri Jul 26 18:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [controls/listbox.c]
Implemented LBS_SORT style, WM_COMPAREITEM, and WM_DELETEITEM
messages.
* [controls/menu.c]
Call TranslateMessage() to enable shortcuts (on WM_CHAR).
* [include/cursoricon.h]
Moved #pragma pack(1) back to where it belongs.
* [objects/palette.c]
RealizeDefaultPalette() maps to system colors only.
Do not broadcast palette notifications when in TrueColor.
* [objects/color.c] [include/palette.h]
Miscellaneous optimizations. Had to fix several
"improvements" made to my patch for previous release.
* [objects/dib.c]
Reverse dib bits order for 24-bit SetDIBits().
* [objects/dc.c]
GetDeviceCaps() does not return RC_PALETTE when in TrueColor.
* [windows/scroll.c]
Scroll update region too.
* [windows/message.c]
Include QS_MOUSE into the event mask for nonclient mouse
message filter. Fixes problems with Word 6 freezing when
mouse hits nonclient area.
* [windows/win.c]
Allow top-level windows to be linked as HWND_TOP in CreateWindow().
* [windows/winpos.c] [windows/mdi.c]
Attempt to fix control menu duplication.
Fri Jul 26 09:49:35 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/drive.c]
GetDriveType32A(): return value for CDROM fixed.
* [files/file.c]
SearchPath* added.
* [if1632/gdi32.spec] [objects/brush.c]
SetBrushOrgEx() added.
* [loader/pe_resource.c]
If even loading the default entry fails, we just use the first
entry from the resource directory.
[loader/task.c]
SetSigHandler() stub added, Paradox 4.5 now starts up.
* [misc/comm.c] [include/windows.h] [if1632/kernel32.spec]
COMM functions updated to win32, not complete.
* [misc/lstr.c]
FormatMessageA partially implemented.
* [include/miscemu.h] [memory/selector.c]
[memory/global.c] [miscemu/dosmem.c]
DOS memory handling changed: 1MB preallocated block, real-mode
segment handling possible, SetSelectorBase into lower physical 1MB
possible.
* [miscemu/dpmi.c]
Real-mode segments changed, real-mode int 21,ax=6506 added.
AX=0x0303 added.
* [multimedia/time.c]
Fixed bug in killTimer.
* [objects/bitmap.c]
LoadImageA partially implemented.
Wed Jul 24 18:20:24 1996 Albrecht Kleine <kleine@ak.sax.de>
* [include/dde_mem.h][include/dde_proc.h]
[ipc/dde_atom.c][ipc/dde_proc.c][windows/message.c]
[ipc/generic_hash.h][library/miscstubs.c]
Changes for error free compilation using "--with-ipc":
replaced some names with *16-equivalent (e.g. MSG to MSG16),
modified prototype of function DDE_GlobalFree() .
* [objects/palette.c]
Added check for metafile-DC in GDISelectPalette(),
GDIRealizePalette(),RealizeDefaultPalette() and
IsDCCurrentPalette().
Tue Jul 23 22:46:53 1996 Andrew Lewycky <plewycky@oise.utoronto.ca>
* [controls/edit.c]
EDIT_WM_Create: Don't EDIT_EM_ReplaceSel if created with lParam = "",
fixes Winhelp.
* [windows/dialog.c]
DIALOG_CreateIndirect: Initialise dlgProc before creating children.
1996-07-28 18:50:11 +00:00
|
|
|
|
1993-09-04 10:09:32 +00:00
|
|
|
/***********************************************************************
|
|
|
|
|
* BRUSH_DeleteObject
|
|
|
|
|
*/
|
1996-10-13 17:45:47 +00:00
|
|
|
BOOL32 BRUSH_DeleteObject( HBRUSH16 hbrush, BRUSHOBJ * brush )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
|
|
|
|
switch(brush->logbrush.lbStyle)
|
|
|
|
|
{
|
|
|
|
|
case BS_PATTERN:
|
1996-11-02 14:24:07 +00:00
|
|
|
DeleteObject32( (HGDIOBJ32)brush->logbrush.lbHatch );
|
1993-09-04 10:09:32 +00:00
|
|
|
break;
|
|
|
|
|
case BS_DIBPATTERN:
|
1996-10-13 17:45:47 +00:00
|
|
|
GlobalFree16( (HGLOBAL16)brush->logbrush.lbHatch );
|
1993-09-04 10:09:32 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return GDI_FreeObject( hbrush );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
1996-11-02 14:24:07 +00:00
|
|
|
* BRUSH_GetObject16
|
1993-09-04 10:09:32 +00:00
|
|
|
*/
|
1996-11-02 14:24:07 +00:00
|
|
|
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 )
|
1993-09-04 10:09:32 +00:00
|
|
|
{
|
Release 960611
Tue Jun 11 15:20:43 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/break.c] [loader/signal.c]
Fixed breakpoints in 32-bit code.
* [include/windows.h]
Added many more Win32 versions of standard structures.
* [include/winreg.h] [misc/registry.c]
Moved private types into registry.c.
* [memory/string.c] (New file)
Moved most string functions from misc/lstr.c; added Win32 version
of all functions.
* [misc/wsprintf.c]
Implemented Win32 wsprintf functions.
* [objects/bitmap.c]
Implemented Win32 bitmap functions.
* [windows/dialog.c]
Don't set dialog procedure before the controls are created. This
avoids a crash in Winhelp.
Tue Jun 11 14:10:06 1996 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [controls/menu.c] [if1632/user.spec] [windows/message.c]
Replace PeekMessage with PeekMessage16.
* [if1632/kernel32.spec][misc/main.c]
GetVersion32,GetVersionEx32A,GetVersionEx32W: new functions.
MAIN_ParseVersion: new function, new command line option -winver.
GetVersion: modified to take command line argument into account.
* [if1632/kernel32.spec] [win32/process.c]
FreeLibrary32: new function.
TlsAlloc: initialize Tls to zero.
InterlockedIncrement,InterlockedDecrement,InterlockedExchange: new
functions.
* [if1632/kernel32.spec]
SetErrorMode,GetActiveWindow: new relays to existing functions.
* [if1632/kernel32.spec][win32/user32.c]
PeekMessage32A,PeekMessage32W: new functions.
* [include/struct32.h][include/windows.h]
Moved MSG32 to windows.h.
Renamed MSG to MSG16.
Modified prototypes to use MSG16
* [include/winbase.h]
OSVERSIONINFO32A,OSVERSIONINFO32W: new structures.
Sun Jun 9 20:53:30 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/Makefile.in] [loader/builtin.c]
version.dll,lz32.dll added.
* [include/lzexpand.h] [if1632/lz32.spec] [if1632/lzexpand.spec]
[misc/lzexpand.c]
lz32.dll added.
Modified to new function naming standard.
* [include/ver.h] [if1632/ver.spec] [if1632/version.spec] [misc/ver.c]
version.dll added (win32 version of ver.dll).
Modified to new function naming standard.
Use registry to look up a LOCALE langids too.
(VerInstallFile,VerFindFile still stubs)
Fri Jun 7 20:40:20 1996 Albrecht Kleine <kleine@ak.sax.de>
* [files/file.c]
Added a warning if GetTempFileName() gets a bad drive parameter.
* [misc/commdlg.c]
Changed file listbox color to gray in SaveFile dialog
(just like Windows does this).
1996-06-11 16:02:08 +00:00
|
|
|
if (count > sizeof(brush->logbrush)) count = sizeof(brush->logbrush);
|
1993-09-04 10:09:32 +00:00
|
|
|
memcpy( buffer, &brush->logbrush, count );
|
|
|
|
|
return count;
|
|
|
|
|
}
|
1998-11-22 12:54:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
|
* SetSolidBrush16 (GDI.604)
|
|
|
|
|
*
|
|
|
|
|
* If hBrush is a solid brush, change it's color to newColor.
|
|
|
|
|
*
|
|
|
|
|
* RETURNS
|
|
|
|
|
* TRUE on success, FALSE on failure.
|
|
|
|
|
* FIXME: not yet implemented!
|
|
|
|
|
*/
|
|
|
|
|
BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor )
|
|
|
|
|
{
|
|
|
|
|
FIXME(gdi, "(hBrush %04x, newColor %04x): stub!\n", hBrush, (int)newColor);
|
|
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
|
}
|
|
|
|
|
|