mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 16:46:17 +00:00
60ce85c965
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [files/drive.c] Added Device= parameter to drive configuration. * [if1632/relay.c] Throw() and Catch() now use the correct CATCHBUF layout (untested). * [tools/build.c] [include/stackframe.h] [loader/task.c] Moved 16-bit stack pointer into thread database. Save current %fs while running 16-bit code. Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] Made DPtoLP32 and LPtoDP32 respect world transforms. * [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec] [include/path.h] More path support. * [include/gdi.h] [include/windows.h] [objects/dc.c] [relay/gdi32.spec] Support for Get/SetArcDirection and Get/SetWorldTransform * [windows/hook.c] Fixed a bug in HOOK_Map16To32Common. Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com> * [graphics/metafiledrv/init.c] [objects/metafile.c] Documentation for metafile related API calls. Fixed a bug to avoid documenting it. * [include/windows.h] Declaration for LoadImage. Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [graphics/win16drv/*] Changes to printing code to enable use of printer fonts with the win3.1 postscript driver. Remember to add printer=on to [wine] section of wine.conf . You will also need to disable truetype fonts from control panel. Winword 6.0 and Write seem to be happy with this... * [include/bitmap.h] Fix Widthbytes for 15bpp displays. Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [tsx11/*] [include/ts*] [tools/make_X11wrappers] Implemented thread-safe X11 wrappers. Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu> * [windows/queue.c] Forgot to convert thdb to thread_id. * [misc/registry.c] Sped up Windows 95 registry reading. Changed code to traverse registry as a tree rather than read in all possible keys (including dead ones). Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [loader/pe_image.c][Makefile.in][scheduler/thread.c] [libtest/hello5.c] Don't exit() on failed to load referenced dlls. Fixed static tls allocation for multiple threads. WINELIB should now be able to load PE dlls. A sample winelib program, that dynamically loads a internal dll is included. * [graphics/ddraw.c][include/ddraw.h][include/d3d.h] Cleaned up and enhanced further. Added several DirectX5 interface definitions and DirectSurface3 implementation. Stubs for D3D (NOT coming soon, just there so it fails safely). * [multimedia/dsound.c][include/dsound.h] Actually works now for a lot of cases. Some DirectX5 stuff added. Still lacking several features. * [windows/dinput.c][include/dinput.h] Started implementing DirectInput. Doesn't work yet, don't know why. * [if1632/thunk.c][misc/callbacks.c] [win32/kernel.c][include/callbacks.h] Added WOWCallback16Ex, WOWHandle32. * [misc/cpu.c] Fixed GetSystemInfo, IsProcessorFeaturePresent. * [multimedia/joystick.c][multimedia/time.c] Several fixes. Small hack to get timerevents in timeGetTime() loops. Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de> * [configure.in] Fixed check for union semun on FreeBSD systems. Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com> * [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc] [resources/sysres_Sw.rc] Added/updated Swedish language support. Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu> * [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c] [windows/win.c] [windows/dce.c] [windows/winpos.c] Bug fixes. Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net> * [msdos/int25.c] [msdos/int26.c] Implemented "native" absolute disk read/write access. * [msdos/int13.c] [msdos/ioports.c] Enhanced GET DRIVE PARAMETERS (int13 AH=08). * [graphics/win16drv/prtdrv.c] [if1632/gdi.spec] Fixed typos, implemented dmEnumDFonts, Started implementation of dmRealizeObject. * [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec] Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented CoFileTimeNow. * [if1632/kernel.spec] [include/windows.h] [memory/global.c] [memory/string.c] [misc/kernel.c] [misc/Makefile.in] [misc/toolhelp.c] [msdos/int21.c] Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer, stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook (Undocumented Windows). * [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c] Misc stubs. * [if1632/winaspi.spec] [misc/aspi.c] Implemented GetASPIDLLVersion. * [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in] Added handler for Int 0x20 (terminate program, _very_ old-fashioned). * [misc/w32scomb.c] Implemented Get16DLLAddress() partially (big thanks to Marcus and Alexandre). * [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec] Added built-in DPLAY.DLL. * [relay32/winmm.spec] [multimedia/joystick.c] Added joySetThreshold. * [misc/windebug.c] Added WinNotify. * [win32/console.c] Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer, WriteConsoleOutput32A. * [windows/user.c] Stub SetEventHook. Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com> * [windows/painting.c] Fixed broken restore-to-maximized. Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es> * [documentation/wine.man] [include/options.h] [misc/main.c] [ole/ole2nls.c] [resources/sysres.c] [resources/sysres_Ca.rc] [resources/Makefile.in] Added language catalan. (Afegit l'idioma català).
288 lines
8.4 KiB
C
288 lines
8.4 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 "stddebug.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;
|
|
}
|
|
}
|
|
fprintf(stdnimp,"WinG: no joy.\n");
|
|
__WinGOK = False;
|
|
}
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateDC16 (WING.1001)
|
|
*/
|
|
HDC16 WINAPI WinGCreateDC16(void)
|
|
{
|
|
__initWinG();
|
|
|
|
if( __WinGOK > 0 )
|
|
return CreateCompatibleDC16(NULL);
|
|
return (HDC16)NULL;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGRecommendDIBFormat16 (WING.1002)
|
|
*/
|
|
BOOL16 WINAPI WinGRecommendDIBFormat16(BITMAPINFO *fmt)
|
|
{
|
|
fprintf(stdnimp,"WinGRecommendDIBFormat()\n");
|
|
|
|
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)
|
|
{
|
|
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_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)
|
|
{
|
|
fprintf(stdnimp,"WinGSetDIBColorTable: empty stub!\n");
|
|
return num;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGGetDIBColorTable16 (WING.1005)
|
|
*/
|
|
UINT16 WINAPI WinGGetDIBColorTable16(HDC16 winDC, UINT16 start,
|
|
UINT16 numentry, RGBQUAD* colors)
|
|
{
|
|
fprintf(stdnimp,"WinGGetDIBColorTable: empty stub!\n");
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateHalfTonePalette16 (WING.1007)
|
|
*/
|
|
HPALETTE16 WINAPI WinGCreateHalfTonePalette16(void)
|
|
{
|
|
fprintf(stdnimp,"WinGCreateHalfTonePalette: empty stub!\n");
|
|
return 0;
|
|
}
|
|
|
|
/***********************************************************************
|
|
* WinGCreateHalfToneBrush16 (WING.1008)
|
|
*/
|
|
HPALETTE16 WINAPI WinGCreateHalfToneBrush16(HDC16 winDC, COLORREF col,
|
|
WING_DITHER_TYPE type)
|
|
{
|
|
fprintf(stdnimp,"WinGCreateHalfToneBrush: 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);
|
|
/* fprintf(stdnimp,"WinGStretchBlt16: empty stub!\n");*/
|
|
/* return 0; */
|
|
}
|
|
|
|
/***********************************************************************
|
|
* 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;
|
|
}
|
|
|