Release 980215 Sun Feb 15 12:02:59 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [graphics/x11drv/*.c] [objects/*.c] A few X11 critical section optimizations, mostly with XGet/PutPixel. * [scheduler/sysdeps.c] [misc/main.c] Make sure X11 critical section is available before any Xlib call. * [if1632/relay.c] [tools/build.c] Yet another attempt at fixing Catch/Throw. * [loader/pe_image.c] Fixed broken PE DLL loading. * [include/winnt.h] [scheduler/handle.c] [scheduler/*.c] Implemented handle access rights. Added Get/SetHandleInformation. Sun Feb 15 09:45:23 1997 Andreas Mohr <100.30936@germany.net> * [misc/winsock.c] Fixed bug in WSACleanup which lead to crashes in WINSOCK_HandleIO. * [graphics/fontengine.c] [include/font.h] Minor improvements. * [memory/global.c] Implemented GlobalEntryHandle. * [misc/toolhelp.c] Fixed a memory bug in Notify*register. * [misc/w32scomb.c] Improved Get16DLLAddress. * [objects/gdiobj.c] Implemented GdiSeeGdiDo. Sat Feb 14 14:57:39 1998 John Richardson <jrichard@zko.dec.com> * [win32/console.c] Added the console implementation, AllocConsole, FreeConsole, CONSOLE_InheritConsole. * [documentation/console] Some documentation on the console. * [include/winerror.h] Added some error defines. * [scheduler/k32obj.c] Registered the scheduler ops. Fri Feb 13 19:35:35 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Some English language fixes for missing values. * [controls/listbox.c] Fix to allow an empty listbox to deselect all items. * [relay32/user32.spec] [windows/keyboard.c] CreateAcceleratorTableA stub method. * [windows/sysmetrics.c] Added missing SM_CXCURSOR & SM_CYCURSOR initializers. * [windows/message.c] PostThreadMessage32A stub method. Fri Feb 13 17:12:24 1998 Jim Peterson <jspeter@roanoke.infi.net> * [libtest/hello3res.rc] [libtest/hello3.c] [libtest/Makefile.in] Updated the 'hello3' test so that it functions properly again. Fri Feb 13 14:08:07 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] Fixed the embarrassing bugs I introduced into DPtoLP and LPtoDP. * [windows/scroll.c] Prevent ScrollWindow32 from sending WM_ERASEBKGND. Thu Feb 12 22:46:53 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [objects/metafile] [include/ldt.h] Fix to cope with records longer than 64K. * [windows/clipboard.c] Clean up bitmaps and metapicts properly. Mon Feb 3 21:52:18 1998 Karl Backström <karl_b@geocities.com> * [programs/winhelp/Sw.rc] [resources/sysres_Sw.rc] Minor update of Swedish language support.
diff --git a/graphics/fontengine.c b/graphics/fontengine.c index 5a118ac..f261b13 100644 --- a/graphics/fontengine.c +++ b/graphics/fontengine.c
@@ -6,6 +6,7 @@ #include <stdio.h> #include <stdlib.h> #include "windows.h" +#include "font.h" /* GDI 300 */ WORD WINAPI EngineEnumerateFont(LPSTR fontname, FARPROC16 proc, DWORD data ) @@ -13,13 +14,31 @@ fprintf(stderr,"EngineEnumerateFont(%s,%p,%lx),stub\n",fontname,proc,data); return 0; } -#ifdef NOTDEF + /* GDI 301 */ WORD WINAPI EngineDeleteFont(LPFONTINFO16 lpFontInfo) { - return 0 + WORD handle; + + /* untested, don't know if it works. + We seem to access some structure that is located after the + FONTINFO. The FONTINFO docu says that there may follow some char-width + table or font bitmap or vector info. + I think it is some kind of font bitmap that begins at offset 0x52, + as FONTINFO goes up to 0x51. + If this is correct, everything should be implemented correctly. + */ + if ( ((lpFontInfo->dfType & (RASTER_FONTTYPE|DEVICE_FONTTYPE)) + == (RASTER_FONTTYPE|DEVICE_FONTTYPE)) + && (LOWORD(lpFontInfo->dfFace) == LOWORD(lpFontInfo)+0x6e) + && (handle = *(WORD *)(lpFontInfo+0x54)) ) + { + *(WORD *)(lpFontInfo+0x54) = 0; + GlobalFree16(handle); + } + return 1; } -#endif + /* GDI 302 */ WORD WINAPI EngineRealizeFont(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo) { @@ -27,27 +46,33 @@ return 0; } -#ifdef NOTDEF + /* GDI 303 */ -WORD WINAPI EngineGetCharWidth(LPFONTINFO16 lpFontInfo, BYTE, BYTE, LPINT16) +WORD WINAPI EngineGetCharWidth(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE lastChar, LPINT16 buffer) { - return 0; + int i; + + for (i = firstChar; i <= lastChar; i++) + *buffer++ = lpFontInfo->dfAvgWidth; /* insert some charwidth functionality here; use average width for now */ + return 1; } /* GDI 304 */ -WORD WINAPI EngineSetFontContext(LPFONTINFO lpFontInfo, WORD data) +WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data) { + return 0; } + /* GDI 305 */ -WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO lpFontInfo, WORD, WORD, LPSTR string, DWORD dword, LPBITMAPMETRICS16 metrics) +WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, LPSTR string, DWORD dword, /*LPBITMAPMETRICS16*/ LPVOID metrics) { return 0; } /* GDI 306 */ -DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR fontdir, LPCSTR string) +DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string) { - return 0; + return -1; /* error */ } @@ -55,6 +80,5 @@ WORD WINAPI EngineExtTextOut() { + return 0; } - -#endif