Release 960824
Sat Aug 24 13:57:01 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Renamed SCROLLINFO to SCROLLBAR_INFO to avoid conflict with Win32.
* [graphics/driver.c] [include/x11drv.h]
New files for graphics driver handling.
* [if1632/relay.c] [include/registers.h] [tools/build.c]
Implemented Win32 register functions. Not really tested yet.
* [include/gdi.h]
Added a lot of functions to the DC func table.
* [loader/pe_image.c]
Initialise %fs before calling out to 32-bit code.
* [windows/hook.c]
Fixed bug in HOOK_GetHook().
* [windows/win.c]
Fixed FindWindow to return an error if the class name doesn't exist.
Wed Aug 21 15:15:53 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/Makefile.in] [misc/mpr.c] [if1632/mpr.spec]
mpr.dll specs added.
* [if1632/kernel32.spec] [win32/newfns.c] [memory/global.c]
QueryPerformanceCounter(), GlobalMemoryStatus() added.
* [if1632/user32.spec] [win32/error.c]
SetLastErrorEx() added.
* [misc/commdlg.c]
lpstrFilter might be NULL in FILE_WMInitDialog (NS 3.0 setup).
* [misc/registry.c]
Some missing NULL ptr checks added, misc clean up.
Tue Aug 20 21:00:00 1996 Alex Korobka <alex@pharm.sunysb.edu>
* [controls/menu.c]
Adjust popup menu coordinates so that it always stays within
the desktop.
* [misc/main.c]
Fixed GetEnvironment() return value for lpEnv == NULL case.
Mon Aug 19 22:48:36 1996 Jukka Iivonen <iivonen@cc.helsinki.fi>
* [misc/crtdll.c] [if1632/crtdll.spec]
Added some is* functions, strlen and tolower.
Mon Aug 19 13:33:13 1996 Stephen Simmons <ssimmons@vitsemi.com>
* [tools/wineconf]
New perl script to generate the wine.conf file.
Fri Aug 16 15:31:44 1996 John Harvey <john@division.co.uk>
* [if1632/gdi.spec]
Lots of printer functions.
* [include/callback.h]
New functions for printer driver support.
* [include/gdi.h]
New/changed structures to support printer driver.
* [misc/escape.c]
New version that uses function table in DC structure.
* [objects/dc.c]
CreateDC copes with things other than Display.
X code for CreateDC moved to graphics/x11drv directory.
CreateCompatibleDC copies func table from original DC.
* [objects/font.c]
GetTextExtentPoint32A,GetTextMetrics16 use function table in
DC and code moved to drivers directory.
* [misc/printdrv.c] [graphics/*/*] [include/win16drv.h]
New files for printer support.
Fri Aug 16 12:33:00 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [controls/scroll.c]
Added SetScrollInfo32 and GetScrollInfo32. These just call existing
code. There are a few options in which I'm probably the wrong person
for the job (page size and disable bar). There are comments in the
code as to what they should do.
* [objects/gdiobj.c] [objects/font.c] [include/font.h]
Added 32 bit version of FONT_GetObject.
diff --git a/objects/bitmap.c b/objects/bitmap.c
index afc0b6b..b836e20 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -25,7 +25,7 @@
/***********************************************************************
* BITMAP_Init
*/
-BOOL BITMAP_Init(void)
+BOOL32 BITMAP_Init(void)
{
Pixmap tmpPixmap;
@@ -356,7 +356,7 @@
/***********************************************************************
* BITMAP_DeleteObject
*/
-BOOL BITMAP_DeleteObject( HBITMAP hbitmap, BITMAPOBJ * bitmap )
+BOOL32 BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bitmap )
{
XFreePixmap( display, bitmap->pixmap );
return GDI_FreeObject( hbitmap );
@@ -396,8 +396,8 @@
/***********************************************************************
* BITMAP_SelectObject
*/
-HBITMAP BITMAP_SelectObject( DC * dc, HBITMAP hbitmap,
- BITMAPOBJ * bmp )
+HBITMAP16 BITMAP_SelectObject( DC * dc, HBITMAP16 hbitmap,
+ BITMAPOBJ * bmp )
{
HRGN hrgn;
HBITMAP prevHandle = dc->w.hBitmap;
diff --git a/objects/color.c b/objects/color.c
index 5ed37ec..d5afb9d 100644
--- a/objects/color.c
+++ b/objects/color.c
@@ -602,7 +602,7 @@
*
* Check whether 'color' can be represented with a solid color.
*/
-BOOL COLOR_IsSolid( COLORREF color )
+BOOL32 COLOR_IsSolid( COLORREF color )
{
int i;
const PALETTEENTRY *pEntry = COLOR_sysPal;
@@ -626,7 +626,7 @@
* COLOR_PaletteLookupPixel
*/
int COLOR_PaletteLookupPixel( PALETTEENTRY* palPalEntry, int size,
- int* mapping, COLORREF col, BOOL skipReserved )
+ int* mapping, COLORREF col, BOOL32 skipReserved )
{
int i, best = 0, diff = 0x7fffffff;
int r,g,b;
@@ -898,7 +898,7 @@
* Set the color-mapping table for selected palette.
* Return number of entries which mapping has changed.
*/
-int COLOR_SetMapping( PALETTEOBJ* palPtr, BOOL mapOnly )
+int COLOR_SetMapping( PALETTEOBJ* palPtr, BOOL32 mapOnly )
{
int i, index;
char flag;
diff --git a/objects/dc.c b/objects/dc.c
index 58529ac..f8d552f 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -17,8 +17,6 @@
#include "callback.h"
#include "xmalloc.h"
-static DeviceCaps * displayDevCaps = NULL;
-
extern void CLIPPING_UpdateGCRegion( DC * dc ); /* objects/clipping.c */
extern BOOL DCHook( HDC, WORD, DWORD, DWORD ); /* windows/dce.c */
@@ -158,8 +156,6 @@
SelectObject( dc->hSelf, dc->w.hPen );
SelectObject( dc->hSelf, dc->w.hBrush );
SelectObject( dc->hSelf, dc->w.hFont );
- XSetGraphicsExposures( display, dc->u.x.gc, False );
- XSetSubwindowMode( display, dc->u.x.gc, IncludeInferiors );
CLIPPING_UpdateGCRegion( dc );
}
@@ -491,8 +487,11 @@
HDC CreateDC( LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODE* initData )
{
DC * dc;
- HANDLE handle;
-
+ HDC16 handle;
+ const DC_FUNCTIONS *funcs;
+
+ if (!(funcs = DRIVER_FindDriver( driver ))) return 0;
+
handle = GDI_AllocObject( sizeof(DC), DC_MAGIC );
if (!handle) return 0;
dc = (DC *) GDI_HEAP_LIN_ADDR( handle );
@@ -500,29 +499,20 @@
dprintf_dc(stddeb, "CreateDC(%s %s %s): returning %04x\n",
driver, device, output, handle );
- if (!displayDevCaps)
- {
- displayDevCaps = (DeviceCaps *) xmalloc( sizeof(DeviceCaps) );
- DC_FillDevCaps( displayDevCaps );
- }
-
- dc->hSelf = (HDC)handle;
- dc->saveLevel = 0;
+ dc->hSelf = handle;
+ dc->funcs = funcs;
+ dc->physDev = NULL;
+ dc->saveLevel = 0;
dc->dwHookData = 0L;
- dc->hookProc = (SEGPTR)NULL;
+ dc->hookProc = (SEGPTR)0;
memcpy( &dc->w, &DC_defaultValues, sizeof(DC_defaultValues) );
- memset( &dc->u.x, 0, sizeof(dc->u.x) );
+ dc->w.flags = 0;
- dc->u.x.drawable = rootWindow;
- dc->u.x.gc = XCreateGC( display, dc->u.x.drawable, 0, NULL );
- dc->w.flags = 0;
- dc->w.devCaps = displayDevCaps;
- dc->w.bitsPerPixel = displayDevCaps->bitsPixel;
- dc->w.hVisRgn = CreateRectRgn( 0, 0, displayDevCaps->horzRes,
- displayDevCaps->vertRes );
- if (!dc->w.hVisRgn)
+ if (dc->funcs->pCreateDC &&
+ !dc->funcs->pCreateDC( dc, driver, device, output, initData ))
{
+ dprintf_dc( stddeb, "CreateDC: creation aborted by device\n" );
GDI_HEAP_FREE( handle );
return 0;
}
@@ -548,10 +538,14 @@
*/
HDC CreateCompatibleDC( HDC hdc )
{
- DC * dc;
- HANDLE handle;
+ DC *dc, *origDC;
+ HDC16 handle;
HBITMAP hbitmap;
- BITMAPOBJ *bmp;
+ const DC_FUNCTIONS *funcs;
+
+ if ((origDC = (DC *)GDI_GetObjPtr( hdc, DC_MAGIC ))) funcs = origDC->funcs;
+ else funcs = DRIVER_FindDriver( "DISPLAY" );
+ if (!funcs) return 0;
handle = GDI_AllocObject( sizeof(DC), DC_MAGIC );
if (!handle) return 0;
@@ -565,34 +559,29 @@
GDI_HEAP_FREE( handle );
return 0;
}
- bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
-
- dc->hSelf = (HDC)handle;
- dc->saveLevel = 0;
- dc->dwHookData = 0L;
- dc->hookProc = (SEGPTR)NULL;
memcpy( &dc->w, &DC_defaultValues, sizeof(DC_defaultValues) );
- memset( &dc->u.x, 0, sizeof(dc->u.x) );
- dc->u.x.drawable = bmp->pixmap;
- dc->u.x.gc = XCreateGC( display, dc->u.x.drawable, 0, NULL );
+ dc->hSelf = handle;
+ dc->funcs = funcs;
+ dc->physDev = NULL;
+ dc->saveLevel = 0;
+ dc->dwHookData = 0L;
+ dc->hookProc = (SEGPTR)0;
dc->w.flags = DC_MEMORY;
dc->w.bitsPerPixel = 1;
- dc->w.devCaps = displayDevCaps;
dc->w.hBitmap = hbitmap;
dc->w.hFirstBitmap = hbitmap;
- dc->w.hVisRgn = CreateRectRgn( 0, 0, 1, 1 );
- if (!dc->w.hVisRgn)
+ if (dc->funcs->pCreateDC &&
+ !dc->funcs->pCreateDC( dc, NULL, NULL, NULL, NULL ))
{
+ dprintf_dc( stddeb, "CreateDC: creation aborted by device\n" );
DeleteObject( hbitmap );
GDI_HEAP_FREE( handle );
return 0;
}
- DC_InitDC( dc );
-
return handle;
}
@@ -622,8 +611,8 @@
SelectObject( hdc, STOCK_BLACK_PEN );
SelectObject( hdc, STOCK_WHITE_BRUSH );
SelectObject( hdc, STOCK_SYSTEM_FONT );
- XFreeGC( display, dc->u.x.gc );
if (dc->w.flags & DC_MEMORY) DeleteObject( dc->w.hFirstBitmap );
+ if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc);
}
if (dc->w.hClipRgn) DeleteObject( dc->w.hClipRgn );
diff --git a/objects/font.c b/objects/font.c
index 5cdfd38..615569f 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -64,7 +64,7 @@
/***********************************************************************
* FONT_Init
*/
-BOOL FONT_Init( void )
+BOOL32 FONT_Init( void )
{
char temp[1024];
LPSTR ptr;
@@ -480,9 +480,9 @@
/***********************************************************************
- * FONT_GetObject
+ * FONT_GetObject16
*/
-int FONT_GetObject( FONTOBJ * font, int count, LPSTR buffer )
+INT16 FONT_GetObject16( FONTOBJ * font, INT16 count, LPSTR buffer )
{
if (count > sizeof(LOGFONT16)) count = sizeof(LOGFONT16);
memcpy( buffer, &font->logfont, count );
@@ -491,9 +491,39 @@
/***********************************************************************
+ * FONT_GetObject32A
+ */
+INT32 FONT_GetObject32A( FONTOBJ *font, INT32 count, LPSTR buffer )
+{
+ LOGFONT32A fnt32;
+
+ memset(&fnt32, 0, sizeof(fnt32));
+ fnt32.lfHeight = font->logfont.lfHeight;
+ fnt32.lfWidth = font->logfont.lfWidth;
+ fnt32.lfEscapement = font->logfont.lfEscapement;
+ fnt32.lfOrientation = font->logfont.lfOrientation;
+ fnt32.lfWeight = font->logfont.lfWeight;
+ fnt32.lfItalic = font->logfont.lfItalic;
+ fnt32.lfUnderline = font->logfont.lfUnderline;
+ fnt32.lfStrikeOut = font->logfont.lfStrikeOut;
+ fnt32.lfCharSet = font->logfont.lfCharSet;
+ fnt32.lfOutPrecision = font->logfont.lfOutPrecision;
+ fnt32.lfClipPrecision = font->logfont.lfClipPrecision;
+ fnt32.lfQuality = font->logfont.lfQuality;
+ fnt32.lfPitchAndFamily = font->logfont.lfPitchAndFamily;
+ strncpy( fnt32.lfFaceName, font->logfont.lfFaceName,
+ sizeof(fnt32.lfFaceName) );
+
+ if (count > sizeof(fnt32)) count = sizeof(fnt32);
+ memcpy( buffer, &fnt32, count );
+ return count;
+}
+
+
+/***********************************************************************
* FONT_SelectObject
*/
-HFONT FONT_SelectObject( DC * dc, HFONT hfont, FONTOBJ * font )
+HFONT16 FONT_SelectObject( DC * dc, HFONT16 hfont, FONTOBJ * font )
{
static X_PHYSFONT stockFonts[LAST_STOCK_FONT-FIRST_STOCK_FONT+1];
@@ -749,20 +779,19 @@
BOOL32 GetTextExtentPoint32A( HDC32 hdc, LPCSTR str, INT32 count,
LPSIZE32 size )
{
- int dir, ascent, descent;
- XCharStruct info;
-
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
- if (!dc) return FALSE;
- XTextExtents( dc->u.x.font.fstruct, str, count, &dir,
- &ascent, &descent, &info );
- size->cx = abs((info.width + dc->w.breakRem + count * dc->w.charExtra)
- * dc->w.WndExtX / dc->w.VportExtX);
- size->cy = abs((dc->u.x.font.fstruct->ascent+dc->u.x.font.fstruct->descent)
- * dc->w.WndExtY / dc->w.VportExtY);
+ if (!dc)
+ {
+ if (!(dc = (DC *)GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC )))
+ return FALSE;
+ }
- dprintf_font(stddeb,"GetTextExtentPoint(%08x '%*.*s' %d %p): returning %d,%d\n",
- hdc, count, count, str, count, size, size->cx, size->cy );
+ if (!dc->funcs->pGetTextExtentPoint ||
+ !dc->funcs->pGetTextExtentPoint( dc, str, count, size ))
+ return FALSE;
+
+ dprintf_font(stddeb,"GetTextExtentPoint(%08x '%.*s' %d %p): returning %d,%d\n",
+ hdc, count, str, count, size, size->cx, size->cy );
return TRUE;
}
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index d36acda..7686405 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -32,96 +32,96 @@
static BRUSHOBJ WhiteBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
{ BS_SOLID, RGB(255,255,255), 0 } /* logbrush */
};
static BRUSHOBJ LtGrayBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
{ BS_SOLID, RGB(192,192,192), 0 } /* logbrush */
};
static BRUSHOBJ GrayBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
{ BS_SOLID, RGB(128,128,128), 0 } /* logbrush */
};
static BRUSHOBJ DkGrayBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
{ BS_SOLID, RGB(64,64,64), 0 } /* logbrush */
};
static BRUSHOBJ BlackBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
{ BS_SOLID, RGB(0,0,0), 0 } /* logbrush */
};
static BRUSHOBJ NullBrush =
{
- { 0, BRUSH_MAGIC, 1, 0 }, /* header */
- { BS_NULL, 0, 0 } /* logbrush */
+ { 0, BRUSH_MAGIC, 1 }, /* header */
+ { BS_NULL, 0, 0 } /* logbrush */
};
static PENOBJ WhitePen =
{
- { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { 0, PEN_MAGIC, 1 }, /* header */
{ PS_SOLID, { 1, 0 }, RGB(255,255,255) } /* logpen */
};
static PENOBJ BlackPen =
{
- { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { 0, PEN_MAGIC, 1 }, /* header */
{ PS_SOLID, { 1, 0 }, RGB(0,0,0) } /* logpen */
};
static PENOBJ NullPen =
{
- { 0, PEN_MAGIC, 1, 0 }, /* header */
+ { 0, PEN_MAGIC, 1 }, /* header */
{ PS_NULL, { 1, 0 }, 0 } /* logpen */
};
static FONTOBJ OEMFixedFont =
{
- { 0, FONT_MAGIC, 1, 0 }, /* header */
+ { 0, FONT_MAGIC, 1 }, /* 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 */
+ { 0, FONT_MAGIC, 1 }, /* 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 */
+ { 0, FONT_MAGIC, 1 }, /* 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 */
+ { 0, FONT_MAGIC, 1 }, /* 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 */
+ { 0, FONT_MAGIC, 1 }, /* 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 */
+ { 0, FONT_MAGIC, 1 }, /* header */
{ 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" }
};
@@ -159,6 +159,13 @@
BOOL32 GDI_Init(void)
{
HPALETTE16 hpalette;
+ extern BOOL32 X11DRV_Init(void);
+
+ /* Initialize drivers */
+
+ if (!X11DRV_Init()) return FALSE;
+
+ /* Get default hook */
defDCHookCallback = (FARPROC16)MODULE_GetEntryPoint(GetModuleHandle("USER"),
362 /* DCHook */ );
@@ -317,7 +324,7 @@
case BITMAP_MAGIC:
return BITMAP_GetObject16( (BITMAPOBJ *)ptr, count, buffer );
case FONT_MAGIC:
- return FONT_GetObject( (FONTOBJ *)ptr, count, buffer );
+ return FONT_GetObject16( (FONTOBJ *)ptr, count, buffer );
case PALETTE_MAGIC:
return PALETTE_GetObject( (PALETTEOBJ *)ptr, count, buffer );
}
@@ -344,9 +351,10 @@
{
case BITMAP_MAGIC:
return BITMAP_GetObject32( (BITMAPOBJ *)ptr, count, buffer );
+ case FONT_MAGIC:
+ return FONT_GetObject32A( (FONTOBJ *)ptr, count, buffer );
case PEN_MAGIC:
case BRUSH_MAGIC:
- case FONT_MAGIC:
case PALETTE_MAGIC:
fprintf( stderr, "GetObject32: magic %04x not implemented\n",
ptr->wMagic );
diff --git a/objects/metafile.c b/objects/metafile.c
index 37d0b56..b273a54 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -1261,7 +1261,7 @@
*(mr->rdParam + 1) = x;
*(mr->rdParam + 2) = count;
*(mr->rdParam + 3) = flags;
- memcpy(mr->rdParam + 4, rect, sizeof(RECT16));
+ if (rect) memcpy(mr->rdParam + 4, rect, sizeof(RECT16));
memcpy(mr->rdParam + 8, str, count);
if (lpDx)
memcpy(mr->rdParam + 8+ ((count + 1) >> 1),lpDx,count*sizeof(INT16));
diff --git a/objects/palette.c b/objects/palette.c
index ab8f25b..a4897ba 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -243,7 +243,7 @@
/***********************************************************************
* PALETTE_UnrealizeObject
*/
-BOOL PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
+BOOL32 PALETTE_UnrealizeObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
{
if (palette->mapping)
{
@@ -258,7 +258,7 @@
/***********************************************************************
* PALETTE_DeleteObject
*/
-BOOL PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
+BOOL32 PALETTE_DeleteObject( HPALETTE16 hpalette, PALETTEOBJ *palette )
{
free( palette->mapping );
return GDI_FreeObject( hpalette );
