Release 0.3.0
Fri Sep 3 11:52:18 1993 Bob Amstadt
* [windows/timer.c]
Changed to use CallWindowProc() rather directly calling callback.
* [windows/event.c]
Implemented SetCapture() and ReleaseCapture()
* [windows/keyboard.c]
Created stub for GetKeyState()
* [objects/linedda.c]
Created stub for LineDDA()
* [if1632/callback.c]
Created callback handler for LineDDA callback procedure.
* [if1632/callback.c]
Created FreeProcInstance()
Fri Sep 3 08:36:52 1993 David Metcalfe
* [loader/signal.c]
Patch to and code for INT 1A
Thu Sep 2 00:31:54 1993 Alexandre Julliard
* [objects/font.c] [objects/text.c]
More text support: implemented justification and underlining.
* [windows/clipping.c] [objects/clipping.c]
Moved low-level clipping functions to objects/clipping.c.
* [windows/clipping.c] [windows/event.c] [windows/message.c]
Implemented window update regions.
* [windows/dc.c] [objects/dcvalues.c]
Moved some device-independent DC functions to objects/dcvalues.c.
* [windows/graphics.c]
Implemented InvertRect() and GetPixel().
Sat Aug 28 08:40:23 1993 Eric Youngdale
* [include/neexe.h] [loader/wine.c]
Added code to handle relocation type 4.
* [loader/signal.h] [loader/wine.c] [loader/selector.c]
Added support for dos interrupts.
Thu 26 Aug 19:15:00 1993 Eric Youngdale
* [loader/selector.c]
Fixed bug dealing with loading DLLs.
Thu Aug 26 19:22:40 1993 Alexandre Julliard
* [include/gdi.h] [objects/font.c] [windows/dc.c]
Beginning of real font support.
* [windows/graphics.c]
Implemented PatBlt().
* [memory/global.c]
Corrected a bug with linked list handling in GlobalAlloc().
* [objects/bitmap.c]
Corrected a bug in BITMAP_SelectObject().
Tue Aug 24 19:22:40 1993 David Metcalfe
* [controls/Command*] [controls/Label*] [controls[MenuButto*]
[controls/SmeMenuButt*]
Change code to support & as a special character in menu item text.
Tue Aug 24 19:22:40 1993 Alexandre Julliard
* [include/gdi.h] [windows/dc.c]
Heavily modified the DC structure for better device-independence.
* [objects/bitmap.c]
Implemented bitmap dimensions.
* [windows/dc.c] [windows/dce.c]
Implemented DC state saving and restoring.
* [windows/dc.c]
Implemented ROP mode.
* [windows/graphics.c]
Implemented FillRect().
Mon Aug 23 22:08:34 1993 Bob Amstadt (bob at pooh)
* [misc/xt.c]
Fixed bug in InvalidateRect(). Solitaire attempted to
clear window before it was realized.
* [loader/resource.c]
Began rewrite of LoadBitmap().
* [loader/wine.c]
Fixed code which set Argv and Argc global variables.
* [loader/selector.c]
Added code to set up command line arguments.
* [include/neexe.h]
Fixed error in PSP structure.
Tue Aug 17 20:41:12 1993 Alexandre Julliard
* [include/gdi.h] [windows/dc.c]
Implemented device capabilities.
* [objects/region.c]
Implemented EqualRgn() and CombineRgn().
* [windows/clipping.c]
Implemented Save/RestoreVisRgn().
* [windows/graphics.c]
Implemented PaintRgn() and FillRgn().
* [windows/mapping.c]
Implemented mapping modes.
Tue Aug 10 14:07:38 1993 Alexandre Julliard
* [if1632/user.spec] [misc/rect.c]
Implemented rectangle API functions.
* [if1632/gdi.spec] [include/gdi.h] [objects/region.c]
Implemented regions.
* [windows/class.c]
Corrected a typo in UnregisterClass().
* [windows/clipping.c] [windows/dc.c]
Implemented DC clipping and visible region.
Tue Aug 10 20:57:56 1993 Bob Amstadt (bob at pooh)
* [controls/menu.c] [windows/win.c]
SetMenu(), GetMenu(), CheckMenuItem() implemented
Thu Aug 5 22:33:22 1993 Bob Amstadt (bob at pooh)
* [controls/menu.c] [windows/win.c]
Many improvements menus. LoadMenu() should work.
Wed Aug 4 14:55:36 1993 Alexandre Julliard
* [objects/dib.c]
Started the implementation of device-independent bitmaps.
* [objects/bitmap.c]
Added support for multiple bitmap depths.
* [objects/brush.c]
Implemented pattern brushes.
* [windows/dc.c] [windows/graphics.c]
Implemented some GDI graphics primitives.
Tue Aug 3 21:16:47 1993 Bob Amstadt (bob at pooh)
* [controls/menu.c] [windows/win.c] [include/menu.h]
Code to load class menus from executable file.
* [if1632/user.spec]
Fixed specification of SendMessage() and PostMessage.
Mon Jul 26 21:53:24 1993 Alexandre Julliard
* [if1632/call.S]
Corrected a bug in KERNEL_InitTask().
* [include/windows.h]
Added a lot of constants.
* [loader/selector.c]
Corrected a bug in segment allocation in CreateSelectors().
* [objects/bitmap.c]
Implemented SelectObject() for bitmaps.
* [objects/brush.c]
Implemented hatched brushes and SelectObject().
* [objects/gdiobj.c]
Removed linked list (not needed).
* [objects/palette.c]
Implemented system palette creation and misc. palette API functions.
* [windows/timer.c]
Implemented timers.
* [windows/dc.c]
Implemented memory device contexts.
Tue Jul 20 10:38:59 1993 Bob Amstadt (bob at pooh)
* [dos.c]
Split DOS3Call() out of kernel.c. Added support for get date
and time functions.
* [call.S]
Added function ReturnFromRegisterFunc() to allow DOS calls
to return values in registers.
* [regfunc.h]
Macros to access registers saved on stack.
Tue Jul 20 10:38:59 1993 Alexandre Julliard
* [win.c]
Corrected allocation of the WM_CREATE data structure.
* [dce.c] [dce.h]
Implemented DCE handling.
* [bitmap.c] [brush.c] [dc.c] [font.c] [gdi.h] [gdi.spec]
[gdiobj.c] [palette.c] [pen.c]
Implemented the GDI objects data structures and allocation.
* [windows.h]
Added several structures and constants for GDI objects.
Mon Jul 19 12:51:10 1993 Bob Amstadt (bob at pooh)
* [ldtlib.c]
Modified system calls to match Linus' new interface for
the LDT modification.
* [win.c]
Fixed bug with WM_CREATE message.
* [heap.c] [kernel.spec]
Completed local heap allocation functions.
* [global.c]
Created function GlobalQuickAlloc() for easy allocation from DLLs
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
new file mode 100644
index 0000000..55237c3
--- /dev/null
+++ b/objects/gdiobj.c
@@ -0,0 +1,380 @@
+/*
+ * GDI functions
+ *
+ * Copyright 1993 Alexandre Julliard
+ */
+
+static char Copyright[] = "Copyright Alexandre Julliard, 1993";
+
+#include "gdi.h"
+
+extern Display * XT_display;
+extern Screen * XT_screen;
+
+MDESC *GDI_Heap = NULL;
+
+
+/***********************************************************************
+ * GDI stock objects
+ */
+
+static BRUSHOBJ WhiteBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_SOLID, RGB(255,255,255), 0 } /* logbrush */
+};
+
+static BRUSHOBJ LtGrayBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_SOLID, RGB(192,192,192), 0 } /* logbrush */
+};
+
+static BRUSHOBJ GrayBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_SOLID, RGB(128,128,128), 0 } /* logbrush */
+};
+
+static BRUSHOBJ DkGrayBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_SOLID, RGB(64,64,64), 0 } /* logbrush */
+};
+
+static BRUSHOBJ BlackBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_SOLID, RGB(0,0,0), 0 } /* logbrush */
+};
+
+static BRUSHOBJ NullBrush =
+{
+ { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { BS_NULL, 0, 0 } /* logbrush */
+};
+
+static PENOBJ WhitePen =
+{
+ { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { PS_SOLID, { 1, 0 }, RGB(255,255,255) } /* logpen */
+};
+
+static PENOBJ BlackPen =
+{
+ { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { PS_SOLID, { 1, 0 }, RGB(0,0,0) } /* logpen */
+};
+
+static PENOBJ NullPen =
+{
+ { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { PS_NULL, { 1, 0 }, 0 } /* logpen */
+};
+
+static FONTOBJ OEMFixedFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET,
+ 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }
+};
+
+static FONTOBJ AnsiFixedFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+ 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }
+};
+
+static FONTOBJ AnsiVarFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+ 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, "" }
+};
+
+static FONTOBJ SystemFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+ 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, "" }
+};
+
+static FONTOBJ DeviceDefaultFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+ 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, "" }
+};
+
+static FONTOBJ SystemFixedFont =
+{
+ { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
+ 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }
+};
+
+
+static GDIOBJHDR * StockObjects[NB_STOCK_OBJECTS] =
+{
+ (GDIOBJHDR *) &WhiteBrush,
+ (GDIOBJHDR *) &LtGrayBrush,
+ (GDIOBJHDR *) &GrayBrush,
+ (GDIOBJHDR *) &DkGrayBrush,
+ (GDIOBJHDR *) &BlackBrush,
+ (GDIOBJHDR *) &NullBrush,
+ (GDIOBJHDR *) &WhitePen,
+ (GDIOBJHDR *) &BlackPen,
+ (GDIOBJHDR *) &NullPen,
+ NULL,
+ (GDIOBJHDR *) &OEMFixedFont,
+ (GDIOBJHDR *) &AnsiFixedFont,
+ (GDIOBJHDR *) &AnsiVarFont,
+ (GDIOBJHDR *) &SystemFont,
+ (GDIOBJHDR *) &DeviceDefaultFont,
+ NULL, /* DEFAULT_PALETTE created by PALETTE_Init */
+ (GDIOBJHDR *) &SystemFixedFont
+};
+
+extern GDIOBJHDR * PALETTE_systemPalette;
+
+
+/***********************************************************************
+ * GDI_Init
+ *
+ * GDI initialisation.
+ */
+BOOL GDI_Init()
+{
+ struct segment_descriptor_s * s;
+
+ /* Create GDI heap */
+
+ s = GetNextSegment( 0, 0x10000 );
+ if (s == NULL) return FALSE;
+ HEAP_Init( &GDI_Heap, s->base_addr, GDI_HEAP_SIZE );
+ free(s);
+
+ /* Create default palette */
+
+ PALETTE_Init();
+ StockObjects[DEFAULT_PALETTE] = PALETTE_systemPalette;
+
+ /* Create default bitmap */
+
+ if (!BITMAP_Init()) return FALSE;
+
+ /* Initialise regions */
+
+ if (!REGION_Init()) return FALSE;
+
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * GDI_FindPrevObject
+ *
+ * Return the GDI object whose hNext field points to obj.
+ */
+HANDLE GDI_FindPrevObject( HANDLE first, HANDLE obj )
+{
+ HANDLE handle;
+
+ for (handle = first; handle && (handle != obj); )
+ {
+ GDIOBJHDR * header = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ handle = header->hNext;
+ }
+ return handle;
+}
+
+
+/***********************************************************************
+ * GDI_AllocObject
+ */
+HANDLE GDI_AllocObject( WORD size, WORD magic )
+{
+ static DWORD count = 0;
+ GDIOBJHDR * obj;
+ HANDLE handle = GDI_HEAP_ALLOC( GMEM_MOVEABLE, size );
+ if (!handle) return 0;
+
+ obj = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ obj->hNext = 0;
+ obj->wMagic = magic;
+ obj->dwCount = ++count;
+ return handle;
+}
+
+
+/***********************************************************************
+ * GDI_FreeObject
+ */
+BOOL GDI_FreeObject( HANDLE handle )
+{
+ GDIOBJHDR * object;
+ HANDLE prev;
+
+ /* Can't free stock objects */
+ if (handle >= FIRST_STOCK_HANDLE) return FALSE;
+
+ object = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ if (!object) return FALSE;
+
+ /* Free object */
+
+ GDI_HEAP_FREE( handle );
+ return TRUE;
+}
+
+/***********************************************************************
+ * GDI_GetObjPtr
+ *
+ * Return a pointer to the GDI object associated to the handle.
+ * Return NULL if the object has the wrong magic number.
+ */
+GDIOBJHDR * GDI_GetObjPtr( HANDLE handle, WORD magic )
+{
+ GDIOBJHDR * ptr = NULL;
+
+ if (handle >= FIRST_STOCK_HANDLE)
+ {
+ if (handle < FIRST_STOCK_HANDLE + NB_STOCK_OBJECTS)
+ ptr = StockObjects[handle - FIRST_STOCK_HANDLE];
+ }
+ else ptr = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ if (!ptr) return NULL;
+ if (ptr->wMagic != magic) return NULL;
+ return ptr;
+}
+
+
+/***********************************************************************
+ * DeleteObject (GDI.69)
+ */
+BOOL DeleteObject( HANDLE obj )
+{
+ /* Check if object is valid */
+
+ GDIOBJHDR * header = (GDIOBJHDR *) GDI_HEAP_ADDR( obj );
+ if (!header) return FALSE;
+
+#ifdef DEBUG_GDI
+ printf( "DeleteObject: %d\n", obj );
+#endif
+
+ /* Delete object */
+
+ switch(header->wMagic)
+ {
+ case PEN_MAGIC: return GDI_FreeObject( obj );
+ case BRUSH_MAGIC: return BRUSH_DeleteObject( obj, header );
+ case FONT_MAGIC: return GDI_FreeObject( obj );
+ case PALETTE_MAGIC: return GDI_FreeObject( obj );
+ case BITMAP_MAGIC: return BMP_DeleteObject( obj, header );
+ case REGION_MAGIC: return REGION_DeleteObject( obj, header );
+ }
+ return FALSE;
+}
+
+
+/***********************************************************************
+ * GetStockObject (GDI.87)
+ */
+HANDLE GetStockObject( int obj )
+{
+ if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0;
+ if (!StockObjects[obj]) return 0;
+#ifdef DEBUG_GDI
+ printf( "GetStockObject: returning %04x\n", FIRST_STOCK_HANDLE + obj );
+#endif
+ return FIRST_STOCK_HANDLE + obj;
+}
+
+
+/***********************************************************************
+ * GetObject (GDI.82)
+ */
+int GetObject( HANDLE handle, int count, LPSTR buffer )
+{
+ GDIOBJHDR * ptr = NULL;
+#ifdef DEBUG_GDI
+ printf( "GetObject: %04x %d %08x\n", handle, count, buffer );
+#endif
+ if (!count) return 0;
+
+ if (handle >= FIRST_STOCK_HANDLE)
+ {
+ if (handle < FIRST_STOCK_HANDLE + NB_STOCK_OBJECTS)
+ ptr = StockObjects[handle - FIRST_STOCK_HANDLE];
+ }
+ else ptr = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ if (!ptr) return 0;
+
+ switch(ptr->wMagic)
+ {
+ case PEN_MAGIC:
+ return PEN_GetObject( (PENOBJ *)ptr, count, buffer );
+ case BRUSH_MAGIC:
+ return BRUSH_GetObject( (BRUSHOBJ *)ptr, count, buffer );
+ case BITMAP_MAGIC:
+ return BMP_GetObject( (BITMAPOBJ *)ptr, count, buffer );
+ case FONT_MAGIC:
+ return FONT_GetObject( (FONTOBJ *)ptr, count, buffer );
+ case PALETTE_MAGIC:
+ return PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer );
+ }
+ return 0;
+}
+
+
+/***********************************************************************
+ * SelectObject (GDI.45)
+ */
+HANDLE SelectObject( HDC hdc, HANDLE handle )
+{
+ GDIOBJHDR * ptr = NULL;
+ DC * dc;
+
+#ifdef DEBUG_GDI
+ printf( "SelectObject: %d %04x\n", hdc, handle );
+#endif
+ if (handle >= FIRST_STOCK_HANDLE)
+ {
+ if (handle < FIRST_STOCK_HANDLE + NB_STOCK_OBJECTS)
+ ptr = StockObjects[handle - FIRST_STOCK_HANDLE];
+ }
+ else ptr = (GDIOBJHDR *) GDI_HEAP_ADDR( handle );
+ if (!ptr) return 0;
+
+ dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
+ if (!dc) return 0;
+
+ switch(ptr->wMagic)
+ {
+ case PEN_MAGIC:
+ return PEN_SelectObject( dc, handle, (PENOBJ *)ptr );
+ case BRUSH_MAGIC:
+ return BRUSH_SelectObject( hdc, dc, handle, (BRUSHOBJ *)ptr );
+ case BITMAP_MAGIC:
+ return BITMAP_SelectObject( hdc, dc, handle, (BITMAPOBJ *)ptr );
+ case FONT_MAGIC:
+ return FONT_SelectObject( dc, handle, (FONTOBJ *)ptr );
+ case REGION_MAGIC:
+ return SelectClipRgn( hdc, handle );
+ }
+ return 0;
+}
+
+
+/***********************************************************************
+ * UnrealizeObject (GDI.150)
+ */
+BOOL UnrealizeObject( HANDLE handle )
+{
+#ifdef DEBUG_GDI
+ printf( "UnrealizeObject: %04x\n", handle );
+#endif
+ return TRUE;
+}
