Release 961215
Sun Dec 15 16:18:15 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [graphics/x11drv/bitblt.c]
Fixed BITBLT_StretchImage for partially covered or inverted
bitmaps.
* [objects/dib.c]
Fixed the upside-down bitmap problem.
Sat Dec 14 02:49:57 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
IsMenu and RemoveMenu added (use existing Win16 functions).
* [include/windows.h]
Corrections to BITMAPINFOHEADER structure.
* [loader/module.c] [if1632/kernel32.spec]
New function GetModuleFileName32A (heavily based on original
Win16 version).
* [loader/pe_image.c]
Hack to allow files with short PE header to be loaded (e.g.
COMDLG32.DLL from Win32s).
* [misc/winsock_async.c]
#if out EIDRM case (not present in FreeBSD).
* [tools/build.c]
Remove trailing comments from .s files generated by build
as these break assembly when not run through pre-processor.
* [windows/graphics.c] [if1632/gdi32.spec]
New function Polyline32 - based on original Polyline. Needs
metafile support adding still.
Fri Dec 13 13:04:06 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [win32/findfile.c] [if1632/kernel.spec]
FindFirstFile32A(): Use dos current directory for drive prefixes.
FindNextFile32A(): Fill in file attribute information.
Implement FindFirstFile16, FindNextFile16, FindClose16.
* [files/drive.c]
GetCurrentDirectory32A - Fix problem with null 3rd character in
string.
Tue Dec 10 14:49:07 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/painting.c][windows/message.c]
Don't use linked lists to call SendMessage(), for it might destroy
the current listentry.
* [misc/registry.c]
Fixed temporary file saving (rename doesn't work across
partitions).
* [files/*.c]
GetFullPathName*,GetDriveType32A fixed, CreateDirectoryEx*,
GetVolumeInformation32W fixed.
* [win32/process.c][if1632/kernel.spec][if1632/kernel32.spec]
LoadLibrary* updated to new naming std., *32W added.
* [win32/console.c] [include/wincon.h]
Additions for NT commandline executables.
* [if1632/advapi32.spec][if1632/kernel32.spec][win32/init.c]
GetUserName32W added, GetComputerName32W added,
GetStartupInfo32W added, GetSystemInfo updated to NT standard.
* [windows/msgbox.c][misc/shell.c][windows/graphics.c]
MessageBox32W, ShellAbout32W, CommandLineToArgvW, Polygon32 added.
* [misc/crtdll.c][include/crtdll.h][if1632/crtdll.spec][misc/ntdll.c]
[if1632/ntdll.spec]
Lot of new unicode functions added (needed for NT).
* [loader/pe_image.c]
NtCurrentTeb added.
Tue Dec 10 22:39:33 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/keyboard.c]
Rewrote function TranslateAccelerator().
Mon Dec 9 14:52:13 1996 Slaven Rezic <eserte@cs.tu-berlin.de>
* [windows/defwnd.c]
DEFWND_SetText(): Set icon name.
Sun Dec 8 23:30:00 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [loader/signal.c] [misc/winsock.c] [misc/winsock_async.c]
[if1632/winsock.spec]
IPC resource cleanup, bugfixes.
* [windows/dialog.c] [windows/defdlg.c]
More DefDlgProc() fixes.
Sun Dec 8 14:01:42 1996 Vadim Strizhevsky <striv@ms.com>
* [misc/clipboard.c] [objects/font.c] [win32/init.c]
[win32/newfns.c] [windows/graphics.c]
Added a few WIN32 functions which needed to run some win32
accessories. Clock should now work almost as well as 16 bit version.
Add: RegisterClipboardFormat32W GetTextExtentExPoint32*
GetModuleHandleW, DisableThreadLibraryCalls (empty stub),
Polygon32
Fix: Polygon16 possible memory leak on error return.
diff --git a/graphics/wing.c b/graphics/wing.c
index 3bae489..697b5b9 100644
--- a/graphics/wing.c
+++ b/graphics/wing.c
@@ -4,41 +4,86 @@
* Started by Robert Pouliot <krynos@clic.net>
*/
-#include "gdi.h"
+#include <X11/Xlib.h>
+#include <X11/extensions/XShm.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
#include "windows.h"
+#include "bitmap.h"
+#include "dc.h"
+#include "gdi.h"
+#include "xmalloc.h"
#include "stddebug.h"
#include "debug.h"
+typedef enum WING_DITHER_TYPE
+{
+ WING_DISPERSED_4x4, WING_DISPERSED_8x8, WING_CLUSTERED_4x4
+} WING_DITHER_TYPE;
+
+static int __WinGOK = -1;
+
+/*
+ * WinG DIB bitmaps can be selected into DC and then scribbled upon
+ * by GDI functions. They can also be changed directly. This gives us
+ * three choices
+ * - use original WinG 16-bit DLL
+ * requires working 16-bit driver interface
+ * - implement DIB graphics driver from scratch
+ * see wing.zip size
+ * - use shared pixmaps
+ * won't work with some videocards and/or videomodes
+ * 961208 - AK
+ */
+
+static BITMAPINFOHEADER __bmpiWinG = { 0, 1, -1, 1, 8, BI_RGB, 1, 0, 0, 0, 0 };
+
+static void __initWinG()
+{
+ if( __WinGOK < 0 )
+ {
+ Status s = XShmQueryExtension(display);
+ if( s )
+ {
+ int i = XShmPixmapFormat(display);
+ if( i == ZPixmap && screenDepth == 8 )
+ {
+ __WinGOK = True;
+ return;
+ }
+ }
+ fprintf(stdnimp,"WinG: no joy.\n");
+ __WinGOK = False;
+ }
+}
+
/***********************************************************************
- * WingCreateDC16 (WING.1001)
+ * WinGCreateDC16 (WING.1001)
*/
HDC16 WinGCreateDC16(void)
{
- /* FIXME: Probably wrong... */
- return CreateDC("DISPLAY", NULL, NULL, NULL);
-}
+ __initWinG();
+ if( __WinGOK > 0 )
+ return CreateCompatibleDC(NULL);
+ return (HDC16)NULL;
+}
/***********************************************************************
* WinGRecommendDIBFormat16 (WING.1002)
*/
BOOL16 WinGRecommendDIBFormat16(BITMAPINFO *fmt)
{
- HDC16 i=GetDC16(0);
+ fprintf(stdnimp,"WinGRecommendDIBFormat()\n");
- fmt->bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
- fmt->bmiHeader.biWidth=0;
- fmt->bmiHeader.biHeight=1; /* The important part */
- fmt->bmiHeader.biPlanes=GetDeviceCaps(i, PLANES);
- fmt->bmiHeader.biBitCount=GetDeviceCaps(i, BITSPIXEL);
- fmt->bmiHeader.biCompression=BI_RGB;
- fmt->bmiHeader.biSizeImage=0;
- fmt->bmiHeader.biXPelsPerMeter=1000/25.4*GetDeviceCaps(i,LOGPIXELSX);
- fmt->bmiHeader.biYPelsPerMeter=1000/25.4*GetDeviceCaps(i,LOGPIXELSY);
- fmt->bmiHeader.biClrUsed=0;
- fmt->bmiHeader.biClrImportant=0;
- ReleaseDC16(0, i);
- return 1;
+ if( __WinGOK > 0 && fmt )
+ {
+ memcpy(&fmt->bmiHeader, &__bmpiWinG, sizeof(BITMAPINFOHEADER));
+ return TRUE;
+ }
+ return FALSE;
}
/***********************************************************************
@@ -46,72 +91,172 @@
*/
HBITMAP16 WinGCreateBitmap16(HDC16 winDC, BITMAPINFO *header, void **bits)
{
- fprintf(stdnimp,"WinGCreateBitmap: almost empty stub! (expect failure)\n");
- /* Assume RGB color */
- if(bits==NULL)
- return CreateDIBitmap(winDC, header, 0, bits, header, 0);
- else
- return CreateDIBitmap(winDC, header, 1, bits, header, 0);
- return 0;
+ fprintf(stdnimp,"WinGCreateBitmap: empty stub! (expect failure)\n");
+ if( __WinGOK > 0 && header )
+ {
+ BITMAPINFOHEADER* bmpi = &header->bmiHeader;
+
+ fprintf(stdnimp,"bytes\t=%i\nplanes\t=%i\nbpp\t=%i\nx\t=%i\ny\t=%i\nrle\t=0x%08x\nsize\t=%i\n",
+ (int)bmpi->biSize, bmpi->biPlanes, bmpi->biBitCount,
+ (int)bmpi->biWidth, (int)bmpi->biHeight, (unsigned)bmpi->biCompression, (int)bmpi->biSizeImage);
+
+#ifdef PRELIMINARY_WING16_SUPPORT
+ if( bmpi->biPlanes == __bmpiWinG.biPlanes && bmpi->biBitCount == __bmpiWinG.biBitCount &&
+ bmpi->biCompression == __bmpiWinG.biCompression && (int)bmpi->biHeight < 0 &&
+ bmpi->biWidth )
+ {
+ unsigned bytes = (bmpi->biWidth + bmpi->biWidth % 2)*(-bmpi->biHeight) * bmpi->biBitCount/8;
+ int key = shmget(IPC_PRIVATE, bytes, IPC_CREAT | 0x01FF);
+
+ if( key )
+ {
+ /* Create the BITMAPOBJ
+ *
+ * FIXME: A facility to manage shared memory structures
+ * which would clean up when Wine crashes. Perhaps a part of
+ * IPC code can be adapted. Otherwise this code leaves a lot
+ * of junk in shared memory.
+ */
+
+ HBITMAP16 hbitmap = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC );
+ if (hbitmap)
+ {
+ __ShmBitmapCtl* p = (__ShmBitmapCtl*)xmalloc(sizeof(__ShmBitmapCtl));
+ BITMAPOBJ* bmpObjPtr = (BITMAPOBJ *) GDI_HEAP_LIN_ADDR( hbitmap );
+
+ bmpObjPtr->size.cx = 0;
+ bmpObjPtr->size.cy = 0;
+ bmpObjPtr->bitmap.bmType = 0;
+ bmpObjPtr->bitmap.bmWidth = (INT16)abs(bmpi->biWidth);
+ bmpObjPtr->bitmap.bmHeight = -(INT16)bmpi->biHeight;
+ bmpObjPtr->bitmap.bmPlanes = (BYTE)bmpi->biPlanes;
+ bmpObjPtr->bitmap.bmBitsPixel = (BYTE)bmpi->biBitCount;
+ bmpObjPtr->bitmap.bmWidthBytes =
+ (INT16)BITMAP_WIDTH_BYTES( bmpObjPtr->bitmap.bmWidth, bmpi->biBitCount );
+ bmpObjPtr->bitmap.bmBits = (SEGPTR)p;
+
+ p->si.shmid = key;
+ p->si.shmaddr = shmat(key, NULL, 0);
+ p->si.readOnly = False;
+
+ if( p->si.shmaddr )
+ {
+ WORD sel = 0;
+
+ XShmAttach(display, &p->si);
+ bmpObjPtr->pixmap = XShmCreatePixmap(display, rootWindow,
+ p->si.shmaddr, &p->si, bmpObjPtr->bitmap.bmWidth,
+ bmpObjPtr->bitmap.bmHeight, bmpi->biBitCount );
+ if( bmpObjPtr->pixmap )
+ {
+ WORD s;
+ if( (sel = AllocSelectorArray( (bytes + 0xFFFF) >> 16 )) )
+ {
+ DWORD base = (DWORD)p->si.shmaddr, l;
+
+ SetSelectorBase( sel, base );
+ SetSelectorLimit( sel, bytes );
+ s = sel;
+ for( l = 0x10000; l < bytes ; )
+ {
+ s += __AHINCR;
+ SetSelectorBase( s, base + l );
+ l += 0x10000;
+ SetSelectorLimit( s, (l < bytes)?0xFFFF:bytes%0x10000);
+ }
+ p->bits = MAKELONG(0, sel);
+ }
+ else XFreePixmap( display, bmpObjPtr->pixmap );
+ }
+ if( !sel )
+ {
+ shmdt( p->si.shmaddr );
+ p->si.shmaddr = NULL;
+ }
+ }
+ if( !p->si.shmaddr )
+ {
+ GDI_FreeObject( hbitmap );
+ hbitmap = 0;
+ }
+ }
+ return hbitmap;
+ }
+ }
+#endif
+ }
+ return 0;
}
/***********************************************************************
- * WinGGetDIBPointer16 (WING.1004)
+ * WinGGetDIBPointer (WING.1004)
*/
-void* WinGGetDIBPointer16(HBITMAP16 bmap, BITMAPINFO *header)
+SEGPTR WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
{
- fprintf(stdnimp,"WinGGetDIBPointer16: empty stub!\n");
- return NULL;
+#ifdef PRELIMINARY_WING16_SUPPORT
+ BITMAPOBJ* bmp = (BITMAPOBJ *) GDI_GetObjPtr( hWinGBitmap, BITMAP_MAGIC );
+
+ if( bmp )
+ {
+ __ShmBitmapCtl* p = (__ShmBitmapCtl*)bmp->bitmap.bmBits;
+ if( p )
+ {
+ if( bmpi ) memcpy( bmpi, &__bmpiWinG, sizeof(BITMAPINFOHEADER));
+ return p->bits;
+ }
+ }
+#endif
+ return (SEGPTR)NULL;
+}
+
+/***********************************************************************
+ * WinGSetDIBColorTable (WING.1004)
+ */
+UINT16 WinGSetDIBColorTable16(HDC16 hWinGDC, UINT16 start, UINT16 num, RGBQUAD* pColor)
+{
+ fprintf(stdnimp,"WinGSetDIBColorTable: empty stub!\n");
+ return num;
}
/***********************************************************************
* WinGGetDIBColorTable16 (WING.1005)
*/
-UINT16 WinGGetDIBColorTable16(HDC16 winDC, UINT16 start, UINT16 numentry,
+UINT16 WinGGetDIBColorTable16(HDC16 winDC, UINT16 start, UINT16 numentry,
RGBQUAD* colors)
{
- return GetPaletteEntries(winDC, start, numentry, colors);
+ fprintf(stdnimp,"WinGGetDIBColorTable: empty stub!\n");
+ return 0;
}
/***********************************************************************
- * WinGSetDIBColorTable16 (WING.1006)
- */
-UINT16 WinGSetDIBColorTable16(HDC16 winDC, UINT16 start, UINT16 numentry,
- RGBQUAD* colors)
-{
- return SetPaletteEntries(winDC, start, numentry, colors);
-}
-
-
-/***********************************************************************
* WinGCreateHalfTonePalette16 (WING.1007)
*/
HPALETTE16 WinGCreateHalfTonePalette16(void)
{
- fprintf(stdnimp,"WinGCreateHalfTonePalette16: empty stub!\n");
+ fprintf(stdnimp,"WinGCreateHalfTonePalette: empty stub!\n");
return 0;
}
/***********************************************************************
* WinGCreateHalfToneBrush16 (WING.1008)
*/
-HPALETTE16 WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col, INT16 dithertype)
+HPALETTE16 WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col, WING_DITHER_TYPE type)
{
- fprintf(stdnimp,"WinGCreateHalfToneBrush16: empty stub!\n");
+ fprintf(stdnimp,"WinGCreateHalfToneBrush: empty stub!\n");
return 0;
}
/***********************************************************************
* WinGStretchBlt16 (WING.1009)
*/
-BOOL16 WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest, INT16 widDest,
- INT16 heiDest, HDC16 srcDC, INT16 xSrc, INT16 ySrc,
- INT16 widSrc, INT16 heiSrc)
+BOOL16 WinGStretchBlt16(HDC16 destDC, INT16 xDest, INT16 yDest, INT16 widDest,
+ INT16 heiDest, HDC16 srcDC, INT16 xSrc, INT16 ySrc,
+ INT16 widSrc, INT16 heiSrc)
{
- return StretchBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC, xSrc, ySrc, widSrc, heiSrc, SRCCOPY);
+ return StretchBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC, xSrc, ySrc, widSrc, heiSrc, SRCCOPY);
/* fprintf(stdnimp,"WinGStretchBlt16: empty stub!\n");*/
-/* return 0; */
+/* return 0; */
}
/***********************************************************************
@@ -120,8 +265,26 @@
BOOL16 WinGBitBlt16(HDC16 destDC, INT16 xDest, INT16 yDest, INT16 widDest,
INT16 heiDest, HDC16 srcDC, INT16 xSrc, INT16 ySrc)
{
- return BitBlt16(destDC, xDest, yDest, widDest, heiDest, srcDC, xSrc, ySrc, SRCCOPY);
-/* fprintf(stdnimp,"WinGBitBlt16: empty stub!\n");*/
-/* return 0;*/
+ /* destDC is a display DC, srcDC is a memory DC */
+
+ DC *dcDst, *dcSrc;
+
+ if (!(dcDst = (DC *)GDI_GetObjPtr( destDC, DC_MAGIC ))) return FALSE;
+ if (!(dcSrc = (DC *) GDI_GetObjPtr( srcDC, DC_MAGIC ))) return FALSE;
+
+ if (dcDst->w.flags & DC_DIRTY) CLIPPING_UpdateGCRegion( dcDst );
+
+ xSrc = dcSrc->w.DCOrgX + XLPTODP( dcSrc, xSrc );
+ ySrc = dcSrc->w.DCOrgY + YLPTODP( dcSrc, ySrc );
+ xDest = dcDst->w.DCOrgX + XLPTODP( dcDst, xDest );
+ yDest = dcDst->w.DCOrgY + YLPTODP( dcDst, yDest );
+ widDest = widDest * dcDst->w.VportExtX / dcDst->w.WndExtX;
+ heiDest = heiDest * dcDst->w.VportExtY / dcDst->w.WndExtY;
+
+ XSetFunction( display, dcDst->u.x.gc, GXcopy );
+ XCopyArea( display, dcSrc->u.x.drawable,
+ dcDst->u.x.drawable, dcDst->u.x.gc,
+ xSrc, ySrc, widDest, heiDest, xDest, yDest );
+ return TRUE;
}
