Sun May 17 16:23:56 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [file/profile.c] Fix the return value of PROFILE_GetSection * [misc/crtdll.c] Do _getdrive, fix _chdrive. * [misc/commdlg.c] First cut at ChooseColor[WA]. * [misc/network.c] Do something sensible for WNetGetDirectoryType16. Sun May 17 10:21:35 1998 Andreas Mohr <100.30936@germany.net> * [controls/menu.c] Fixed disabled sub menus with MF_BYPOSITION that were not disabled. * [misc/crtdll.c] [relay32/crtdll.spec] [include/winerror.h] Implemented fscanf, fsetpos, _access, _fpreset (thanks to Uwe Bonnes), and _ltoa. * [loader/task.c] MakeProcInstance: must use CURRENT_DS if hInst == NULL. * [misc/shell.c] SHELL_GetResourceTable, InternalExtractIcon: fixed broken .ICO handling * [windows/winpos.c] DeferWindowPos: removed "same parent" requirement. Which doc states that this is required ? Sat May 16 20:08:11 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [loader/module.c] [loader/ne/module.c] More NE module cleanups. * [loader/task.c] Fixed SwitchStackBack(). Fri May 15 10:04:27 1998 Marcus Meissner <marcus@jet.franken.de> * [configure.in][inlcude/acconfig.h] Fixed broken OSS check, added check for working sigaltstack, fixed broken statfs checks on some linux systems. * [files/directory.c][loader/pe_image.c][relay32/builtin.c] [loader/module.c] Added handling of win32 module pathnames. * [relay32/wnaspi32.spec] New file. * [misc/lzexpand.c] LZCopy auto-decompresses LZ compressed files, even if they are not specially flagged. Fixes some InstallShield problems. * [misc/registry.c] Some fixes for RegQueryInfoKey (reference program monkey.exe from Win32 SDK works now better). Probably still has faults. Fri May 15 08:58:58 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] [include/dc.h] [include/gdi.h] [objects/dc.c] Reworked the way world transformations and mapping modes are handled so that both of these transformations can be computed in a single step. * [graphics/painting.c] [graphics/path.c] [include/path.h] More GDI path support. * [graphics/x11drv/graphics.c] Fixed the return value of GRAPH_DrawArc for the zero height / zero width case to reflect Windows' behaviour. * [include/windows.h] [relay32/gdi32.spec] [objects/dc.c] Implemented ModifyWorldTransform and CombineTransform. Tue May 14 18:03:46 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [controls/commctrl.c][relay32/comctl32.spec] [controls/*.c][include/*.h] Implemented InitCommonControlsEx (dll version 4.72 compatible). InitCommonControls calls ImageCommonControlsEx. Registering code of the common controls had to be changed (see XXXX_Register functions). * [controls/status.c][include/commctrl.h][include/status.h] Implemented most new features and fixed the look and feel. * [contols/commctrl.c][include/commctrl.h][relay32/comctl32.spec] Implemented MenuHelp (incomplete). * [controls/status.c][controls/progress.c] Changed allocation strategy for control specific memory. * [controls/header.c][include/header.h][include/commctrl.h] First implementation of header control. * [windows/defwnd.c][windows/syscolors.c] Fixed default control colors for Win95 look. * [windows/nonclient.c] Fixed off by one error for Win95 look. Top border of child windows should be visible. * [misc/imagelist.h] Improved documentation and fixed some bugs. Thu May 14 15:42:21 1998 Robert Wilhelm <robert@physiol.med.tu-muenchen.de> * [relay32/crtdll.spec] Added hypot,j0,j1,jn and ceil. Wed May 13 19:10:10 1998 Pascal Cuoq <pcuoq@ens-lyon.fr> * [controls/listbox.c] Item height is now exactly font height. Wine listboxes now behave like Windows' when they are created without WS_VSCROLL but the program subsequently calls ShowScrollBar or SetScrollInfo. Wed May 13 18:33:01 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [relay32/relay386.c] Restore ES also in the non-debug case. * [windows/event.c] Bugfix: Blocking TSXNextEvent could deadlock Wine. * [win32/process.c] [windows/message.c] Silly stubs for MsgWaitForMultipleObjects / PostThreadMessage that make some programs run better. * [windows/winproc.c] WINPROC_MapMsg32Ato16/16To32A: added WM_NOTIFY. * [win32/kernel32.c] Added 16->32 thunking and improved 32->16 thunking functions. * [tools/build.c] Added new variant of CallFrom16 stub for use with Win95 thunks. * [if1632/kernel.spec] [if1632/builtin.c] [win32/kernel32.c] Added a few undocumented KERNEL functions. * [loader/ne/module.c] [loader/ne/segment.c] Call DllEntryPoint for 16-bit DLLs with subsystem >= 4.0. * [win32/kernel32.spec] [win32/wow32.spec] [win32/ordinals.c] Use names from the Oct 94 beta release for undoc. functions. Wed May 13 14:18:26 1998 Matthew Becker <mbecker@glasscity.net> * [misc/registry.c] Code cleanup. * [misc/cpu.c] Commented out the registry puts temporarily. * [programs/regtest/*] New registry testing program. Tue May 12 22:54:03 1998 Michael Mess <michael@kawo2.rwth-aachen.de> * [multimedia/audio.c] ioctl's do not commute in /dev/dsp initialization. Tue May 12 20:11:42 1998 Karl Garrison <karlos@eznet.net> * [win32/console.c] Implemented SetConsoleTextAttribute, FillConsoleOutputCharacter. Improved cursor positioning. This allows for text colors in an xterm, rxvt, or console. Tue May 12 17:57:52 1998 Petter Reinholdtsen <pere@td.org.uit.no> * [Makefile.in] Create prefix/{bin|lib} directories if missing during install. Sun May 10 19:37:51 1998 Jan Willamowius <jan@janhh.shnet.org> * [multimedia/mmio.c] Have mmioSetBuffer return success (0), so Corel Draw 4 keeps working. (IO is still unbuffered) Wed May 6 16:57:55 1998 James Juran <jrj120@psu.edu> * [Makefile.in] [Make.rules.in] Changed "make clean" to remove `textedit` backup files (*%) * [controls/menu.c][graphics/x11drv/xfont.c][include/libres.h] [loader/main.c][loader/ne/module.c][scheduler/synchro.c] [win32/time.c][windows/winpos.c][include/windows.h] Fixed miscellaneous compilation warnings. * [misc/main.c][miscemu/main.c][include/main.h] Moved prototypes to new include file main.h, various cleanups. Tue May 5 21:05:06 1998 Morten Welinder <terra@diku.dk> * [misc/winsock.c] Don't refer to __FreeBSD__ when HAVE_STRERROR is meant. * [misc/debugstr.c] For debug_dumpstrSend, send strings to stderr. Tue May 5 21:47:40 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [objects/region.c] Fix for REGION_RegionOp() if newReg is one of the source regions. Tue May 5 18:27:32 1998 Jim Peterson <jspeter@roanoke.infi.net> * [misc/main.c] Add '-h/-help' option and print WINE_RELEASE_INFO with usage message. * [misc/spy.c] Realign trace messages. Tue May 5 15:46:47 1998 Donnie V. Savage <dsavage@cisco.com> * [graphics/ddraw.c] Fixed compile warnings * [misc/winsock.c] Warnings should not be errors. Tue May 5 13:40:42 1998 Jim Peterson <jspeter@roanoke.infi.net> * [*/*] Remove many warnings through explicit casts, added #include's, and corrected printf formats. Tue May 5 05:18:12 1998 Insomnia (Stea Greene) <insomnia@core.binghamton.edu> * [graphics/ddraw.c] Kept unchanged portion of old palette when changing only a few palette entries. Really should only deallocate the changed cells. This make StarCraft work almost perfectly (sound overflows still cause static). Mon May 4 15:04:57 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [misc/lstr.c] FormatMessage: terminate string on %0, undo linefeed strip.
286 lines
8.2 KiB
C
286 lines
8.2 KiB
C
/*
|
|
* WingG support
|
|
*
|
|
* Started by Robert Pouliot <krynos@clic.net>
|
|
*/
|
|
|
|
#include "ts_xlib.h"
|
|
#include "ts_xshm.h"
|
|
#include <sys/types.h>
|
|
#include <sys/ipc.h>
|
|
#ifndef __EMX__
|
|
#include <sys/shm.h>
|
|
#endif
|
|
|
|
#include "windows.h"
|
|
#include "bitmap.h"
|
|
#include "dc.h"
|
|
#include "gdi.h"
|
|
#include "xmalloc.h"
|
|
#include "debug.h"
|
|
|
|
extern void CLIPPING_UpdateGCRegion(DC* );
|
|
|
|
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(void)
|
|
{
|
|
if( __WinGOK < 0 )
|
|
{
|
|
Status s = TSXShmQueryExtension(display);
|
|
if( s )
|
|
{
|
|
int i = TSXShmPixmapFormat(display);
|
|
if( i == ZPixmap && screenDepth == 8 )
|
|
{
|
|
__WinGOK = True;
|
|
return;
|
|
}
|
|
}
|
|
FIXME(wing,"WinG: no joy.\n");
|
|
__WinGOK = False;
|
|
}
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateDC16 (WING.1001)
|
|
*/
|
|
HDC16 WINAPI WinGCreateDC16(void)
|
|
{
|
|
__initWinG();
|
|
|
|
if( __WinGOK > 0 )
|
|
return CreateCompatibleDC16(0);
|
|
return (HDC16)NULL;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGRecommendDIBFormat16 (WING.1002)
|
|
*/
|
|
BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *fmt)
|
|
{
|
|
FIXME(wing,"(%p): stub\n", fmt);
|
|
|
|
if( __WinGOK > 0 && fmt )
|
|
{
|
|
memcpy(&fmt->bmiHeader, &__bmpiWinG, sizeof(BITMAPINFOHEADER));
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateBitmap16 (WING.1003)
|
|
*/
|
|
HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 winDC, BITMAPINFO *header,
|
|
void **bits)
|
|
{
|
|
FIXME(wing,"(%x,%p,%p): empty stub! (expect failure)\n",
|
|
winDC, header, bits);
|
|
if( __WinGOK > 0 && header )
|
|
{
|
|
BITMAPINFOHEADER* bmpi = &header->bmiHeader;
|
|
|
|
FIXME(wing,"bytes=%i,planes=%i,bpp=%i,x=%i,y=%i,rle=0x%08x,size=%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_LOCK( 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 )
|
|
{
|
|
sel = SELECTOR_AllocBlock( p->si.shmaddr, bytes,
|
|
SEGMENT_DATA, FALSE, FALSE);
|
|
if (sel) p->bits = PTR_SEG_OFF_TO_SEGPTR(sel,0);
|
|
else TSXFreePixmap( display, bmpObjPtr->pixmap );
|
|
}
|
|
if( !sel )
|
|
{
|
|
shmdt( p->si.shmaddr );
|
|
p->si.shmaddr = NULL;
|
|
}
|
|
}
|
|
if( !p->si.shmaddr )
|
|
{
|
|
GDI_FreeObject( hbitmap );
|
|
hbitmap = 0;
|
|
}
|
|
}
|
|
GDI_HEAP_UNLOCK( hbitmap );
|
|
return hbitmap;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGGetDIBPointer (WING.1004)
|
|
*/
|
|
SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi)
|
|
{
|
|
#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));
|
|
GDI_HEAP_UNLOCK( hWinGBitmap );
|
|
return p->bits;
|
|
}
|
|
}
|
|
#endif
|
|
return (SEGPTR)NULL;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGSetDIBColorTable (WING.1004)
|
|
*/
|
|
UINT16 WINAPI WinGSetDIBColorTable16(HDC16 hWinGDC, UINT16 start, UINT16 num,
|
|
RGBQUAD* pColor)
|
|
{
|
|
FIXME(wing,"(%x,%d,%d,%p): empty stub!\n",hWinGDC,start,num,pColor);
|
|
return num;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGGetDIBColorTable16 (WING.1005)
|
|
*/
|
|
UINT16 WINAPI WinGGetDIBColorTable16(HDC16 winDC, UINT16 start,
|
|
UINT16 num, RGBQUAD* colors)
|
|
{
|
|
FIXME(wing,"(%x,%d,%d,%p): empty stub!\n",winDC,start,num,colors);
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateHalfTonePalette16 (WING.1007)
|
|
*/
|
|
HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
|
|
{
|
|
FIXME(wing,"(void): empty stub!\n");
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateHalfToneBrush16 (WING.1008)
|
|
*/
|
|
HPALETTE16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
|
|
WING_DITHER_TYPE type)
|
|
{
|
|
FIXME(wing,"(...): empty stub!\n");
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGStretchBlt16 (WING.1009)
|
|
*/
|
|
BOOL16 WINAPI 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);
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGBitBlt16 (WING.1010)
|
|
*/
|
|
BOOL16 WINAPI WinGBitBlt16(HDC16 destDC, INT16 xDest, INT16 yDest,
|
|
INT16 widDest, INT16 heiDest, HDC16 srcDC,
|
|
INT16 xSrc, INT16 ySrc)
|
|
{
|
|
/* 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->vportExtX / dcDst->wndExtX;
|
|
heiDest = heiDest * dcDst->vportExtY / dcDst->wndExtY;
|
|
|
|
TSXSetFunction( display, dcDst->u.x.gc, GXcopy );
|
|
TSXCopyArea( display, dcSrc->u.x.drawable,
|
|
dcDst->u.x.drawable, dcDst->u.x.gc,
|
|
xSrc, ySrc, widDest, heiDest, xDest, yDest );
|
|
return TRUE;
|
|
}
|
|
|