Hello, License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - compile the ttydrv dll with -DSTRICT bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: dlls/ttydrv/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/Makefile.in,v
retrieving revision 1.18
diff -u -r1.18 Makefile.in
--- dlls/ttydrv/Makefile.in 18 Oct 2002 23:46:28 -0000 1.18
+++ dlls/ttydrv/Makefile.in 24 Oct 2002 20:57:41 -0000
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/ttydrv/bitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/bitmap.c,v
retrieving revision 1.14
diff -u -r1.14 bitmap.c
--- dlls/ttydrv/bitmap.c 31 May 2002 18:43:23 -0000 1.14
+++ dlls/ttydrv/bitmap.c 24 Oct 2002 20:57:41 -0000
@@ -35,7 +35,7 @@
*/
LONG TTYDRV_GetBitmapBits(HBITMAP hbitmap, void *bits, LONG count)
{
- FIXME("(%x, %p, %ld): stub\n", hbitmap, bits, count);
+ FIXME("(%p, %p, %ld): stub\n", hbitmap, bits, count);
memset(bits, 0, count);
return count;
}
@@ -45,7 +45,7 @@
*/
LONG TTYDRV_SetBitmapBits(HBITMAP hbitmap, const void *bits, LONG count)
{
- FIXME("(%x, %p, %ld): stub\n", hbitmap, bits, count);
+ FIXME("(%p, %p, %ld): stub\n", hbitmap, bits, count);
return count;
}
@@ -56,7 +56,7 @@
TTYDRV_PDEVICE *physDev, BITMAPINFO *bmi, UINT usage,
LPVOID *bits, HANDLE section, DWORD offset)
{
- FIXME("(%x, %p, %u, %p, 0x%04x, %ld): stub\n",
+ FIXME("(%p, %p, %u, %p, %p, %ld): stub\n",
physDev->hdc, bmi, usage, bits, section, offset);
return (HBITMAP) NULL;
@@ -70,7 +70,7 @@
UINT startscan, UINT lines, LPCVOID bits,
const BITMAPINFO *info, UINT coloruse)
{
- FIXME("(%x, %d, %d, %ld, %ld, %d, %d, %u, %u, %p, %p, %u): stub\n",
+ FIXME("(%p, %d, %d, %ld, %ld, %d, %d, %u, %u, %p, %p, %u): stub\n",
physDev->hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, bits, info, coloruse);
return 0;
Index: dlls/ttydrv/dc.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/dc.c,v
retrieving revision 1.19
diff -u -r1.19 dc.c
--- dlls/ttydrv/dc.c 10 Jun 2002 22:52:47 -0000 1.19
+++ dlls/ttydrv/dc.c 24 Oct 2002 20:57:41 -0000
@@ -77,7 +77,7 @@
*/
BOOL TTYDRV_DC_DeleteDC(TTYDRV_PDEVICE *physDev)
{
- TRACE("(%x)\n", physDev->hdc);
+ TRACE("(%p)\n", physDev->hdc);
HeapFree( GetProcessHeap(), 0, physDev );
return TRUE;
@@ -161,7 +161,7 @@
case BTLALIGNMENT:
return 0;
default:
- FIXME("(%04x): unsupported capability %d, will return 0\n", physDev->hdc, cap );
+ FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap );
return 0;
}
}
Index: dlls/ttydrv/graphics.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/graphics.c,v
retrieving revision 1.10
diff -u -r1.10 graphics.c
--- dlls/ttydrv/graphics.c 10 Jun 2002 22:52:47 -0000 1.10
+++ dlls/ttydrv/graphics.c 24 Oct 2002 20:57:41 -0000
@@ -33,7 +33,7 @@
BOOL TTYDRV_DC_Arc(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend)
{
- FIXME("(%x, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE;
}
@@ -44,7 +44,7 @@
BOOL TTYDRV_DC_Chord(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend)
{
- FIXME("(%x, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE;
}
@@ -54,7 +54,7 @@
*/
BOOL TTYDRV_DC_Ellipse(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom)
{
- FIXME("(%x, %d, %d, %d, %d): stub\n", physDev->hdc, left, top, right, bottom);
+ FIXME("(%p, %d, %d, %d, %d): stub\n", physDev->hdc, left, top, right, bottom);
return TRUE;
}
@@ -64,7 +64,7 @@
BOOL TTYDRV_DC_ExtFloodFill(TTYDRV_PDEVICE *physDev, INT x, INT y,
COLORREF color, UINT fillType)
{
- FIXME("(%x, %d, %d, 0x%08lx, %u): stub\n", physDev->hdc, x, y, color, fillType);
+ FIXME("(%p, %d, %d, 0x%08lx, %u): stub\n", physDev->hdc, x, y, color, fillType);
return TRUE;
}
@@ -73,7 +73,7 @@
*/
COLORREF TTYDRV_DC_GetPixel(TTYDRV_PDEVICE *physDev, INT x, INT y)
{
- FIXME("(%x, %d, %d): stub\n", physDev->hdc, x, y);
+ FIXME("(%p, %d, %d): stub\n", physDev->hdc, x, y);
return RGB(0,0,0); /* FIXME: Always returns black */
}
@@ -86,7 +86,7 @@
INT row1, col1, row2, col2;
POINT pt[2];
- TRACE("(%x, %d, %d)\n", physDev->hdc, x, y);
+ TRACE("(%p, %d, %d)\n", physDev->hdc, x, y);
if(!physDev->window)
return FALSE;
@@ -136,7 +136,7 @@
*/
BOOL TTYDRV_DC_PaintRgn(TTYDRV_PDEVICE *physDev, HRGN hrgn)
{
- FIXME("(%x, 0x%04x): stub\n", physDev->hdc, hrgn);
+ FIXME("(%p, %p): stub\n", physDev->hdc, hrgn);
return TRUE;
}
@@ -146,7 +146,7 @@
BOOL TTYDRV_DC_Pie(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend)
{
- FIXME("(%x, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %d, %d, %d, %d): stub\n",
physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE;
}
@@ -156,7 +156,7 @@
*/
BOOL TTYDRV_DC_Polygon(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count)
{
- FIXME("(%x, %p, %d): stub\n", physDev->hdc, pt, count);
+ FIXME("(%p, %p, %d): stub\n", physDev->hdc, pt, count);
return TRUE;
}
@@ -165,7 +165,7 @@
*/
BOOL TTYDRV_DC_Polyline(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count)
{
- FIXME("(%x, %p, %d): stub\n", physDev->hdc, pt, count);
+ FIXME("(%p, %p, %d): stub\n", physDev->hdc, pt, count);
return TRUE;
}
@@ -174,7 +174,7 @@
*/
BOOL TTYDRV_DC_PolyPolygon(TTYDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons)
{
- FIXME("(%x, %p, %p, %u): stub\n", physDev->hdc, pt, counts, polygons);
+ FIXME("(%p, %p, %p, %u): stub\n", physDev->hdc, pt, counts, polygons);
return TRUE;
}
@@ -183,7 +183,7 @@
*/
BOOL TTYDRV_DC_PolyPolyline(TTYDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines)
{
- FIXME("(%x, %p, %p, %lu): stub\n", physDev->hdc, pt, counts, polylines);
+ FIXME("(%p, %p, %p, %lu): stub\n", physDev->hdc, pt, counts, polylines);
return TRUE;
}
@@ -197,7 +197,7 @@
INT row1, col1, row2, col2;
RECT rect;
- TRACE("(%x, %d, %d, %d, %d)\n", physDev->hdc, left, top, right, bottom);
+ TRACE("(%p, %d, %d, %d, %d)\n", physDev->hdc, left, top, right, bottom);
if(!physDev->window)
return FALSE;
@@ -256,7 +256,7 @@
BOOL TTYDRV_DC_RoundRect(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height)
{
- FIXME("(%x, %d, %d, %d, %d, %d, %d): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %d, %d): stub\n",
physDev->hdc, left, top, right, bottom, ell_width, ell_height);
return TRUE;
@@ -271,7 +271,7 @@
INT row, col;
POINT pt;
- TRACE("(%x, %d, %d, 0x%08lx)\n", physDev->hdc, x, y, color);
+ TRACE("(%p, %d, %d, 0x%08lx)\n", physDev->hdc, x, y, color);
if(!physDev->window)
return FALSE;
@@ -300,7 +300,7 @@
INT width, INT height, TTYDRV_PDEVICE *physDevSrc,
INT xSrc, INT ySrc, DWORD rop)
{
- FIXME("(%x, %d, %d, %d, %d, %x, %d, %d, %lu): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %p, %d, %d, %lu): stub\n",
physDevDst->hdc, xDst, yDst, width, height, physDevSrc->hdc, xSrc, ySrc, rop );
return TRUE;
}
@@ -311,7 +311,7 @@
BOOL TTYDRV_DC_PatBlt(TTYDRV_PDEVICE *physDev, INT left, INT top,
INT width, INT height, DWORD rop)
{
- FIXME("(%x, %d, %d, %d, %d, %lu): stub\n", physDev->hdc, left, top, width, height, rop );
+ FIXME("(%p, %d, %d, %d, %d, %lu): stub\n", physDev->hdc, left, top, width, height, rop );
return TRUE;
}
@@ -323,7 +323,7 @@
TTYDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, DWORD rop)
{
- FIXME("(%x, %d, %d, %d, %d, %x, %d, %d, %d, %d, %lu): stub\n",
+ FIXME("(%p, %d, %d, %d, %d, %p, %d, %d, %d, %d, %lu): stub\n",
physDevDst->hdc, xDst, yDst, widthDst, heightDst,
physDevSrc->hdc, xSrc, ySrc, widthSrc, heightSrc, rop );
@@ -344,7 +344,7 @@
POINT pt;
UINT text_align = GetTextAlign( physDev->hdc );
- TRACE("(%x, %d, %d, 0x%08x, %p, %s, %d, %p)\n",
+ TRACE("(%p, %d, %d, 0x%08x, %p, %s, %d, %p)\n",
physDev->hdc, x, y, flags, lpRect, debugstr_wn(str, count), count, lpDx);
if(!physDev->window)
@@ -390,7 +390,7 @@
{
UINT c;
- FIXME("(%x, %u, %u, %p): semistub\n", physDev->hdc, firstChar, lastChar, buffer);
+ FIXME("(%p, %u, %u, %p): semistub\n", physDev->hdc, firstChar, lastChar, buffer);
for(c=firstChar; c<=lastChar; c++) {
buffer[c-firstChar] = physDev->cellWidth;
@@ -405,7 +405,7 @@
BOOL TTYDRV_DC_GetTextExtentPoint(TTYDRV_PDEVICE *physDev, LPCWSTR str, INT count,
LPSIZE size)
{
- TRACE("(%x, %s, %d, %p)\n", physDev->hdc, debugstr_wn(str, count), count, size);
+ TRACE("(%p, %s, %d, %p)\n", physDev->hdc, debugstr_wn(str, count), count, size);
size->cx = count * physDev->cellWidth;
size->cy = physDev->cellHeight;
@@ -418,7 +418,7 @@
*/
BOOL TTYDRV_DC_GetTextMetrics(TTYDRV_PDEVICE *physDev, LPTEXTMETRICW lptm)
{
- TRACE("(%x, %p)\n", physDev->hdc, lptm);
+ TRACE("(%p, %p)\n", physDev->hdc, lptm);
lptm->tmHeight = physDev->cellHeight;
lptm->tmAscent = 0;
Index: dlls/ttydrv/objects.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/objects.c,v
retrieving revision 1.11
diff -u -r1.11 objects.c
--- dlls/ttydrv/objects.c 31 May 2002 18:43:23 -0000 1.11
+++ dlls/ttydrv/objects.c 24 Oct 2002 20:57:41 -0000
@@ -32,7 +32,7 @@
*/
HFONT TTYDRV_SelectFont(TTYDRV_PDEVICE *physDev, HFONT hfont)
{
- TRACE("(%x, 0x%04x)\n", physDev->hdc, hfont);
+ TRACE("(%p, %p)\n", physDev->hdc, hfont);
- return TRUE; /* Use device font */
+ return (HFONT)1; /* Use device font */
}
Index: dlls/ttydrv/wnd.c
===================================================================
RCS file: /home/wine/wine/dlls/ttydrv/wnd.c,v
retrieving revision 1.25
diff -u -r1.25 wnd.c
--- dlls/ttydrv/wnd.c 10 Jun 2002 22:52:47 -0000 1.25
+++ dlls/ttydrv/wnd.c 24 Oct 2002 20:57:43 -0000
@@ -24,6 +24,7 @@
#include "ttydrv.h"
#include "win.h"
#include "winpos.h"
+#include "wownt32.h"
#include "wine/debug.h"
#include "hook.h"
@@ -49,7 +50,7 @@
WINDOW *window;
INT cellWidth=8, cellHeight=8; /* FIXME: Hardcoded */
- TRACE("(%x)\n", hwnd);
+ TRACE("(%p)\n", hwnd);
/* Only create top-level windows */
if (!(wndPtr->dwStyle & WS_CHILD))
@@ -120,7 +121,7 @@
WND *wndPtr = WIN_GetPtr( hwnd );
WINDOW *window = wndPtr->pDriverData;
- TRACE("(%x)\n", hwnd);
+ TRACE("(%p)\n", hwnd);
if (window && window != root_window) delwin(window);
wndPtr->pDriverData = NULL;
@@ -383,9 +384,9 @@
org.y = wndPtr->rectClient.top;
}
- SetDCOrg16( hdc, org.x, org.y );
+ SetDCOrg16( HDC_16(hdc), org.x, org.y );
- if (SetHookFlags16( hdc, DCHF_VALIDATEVISRGN )) /* DC was dirty */
+ if (SetHookFlags16( HDC_16(hdc), DCHF_VALIDATEVISRGN )) /* DC was dirty */
{
if (flags & DCX_PARENTCLIP)
{
@@ -418,7 +419,7 @@
hrgnVisible = DCE_GetVisRgn( hwnd, flags, 0, 0 );
OffsetRgn( hrgnVisible, org.x, org.y );
}
- SelectVisRgn16( hdc, hrgnVisible );
+ SelectVisRgn16( HDC_16(hdc), HRGN_16(hrgnVisible) );
}
/* apply additional region operation (if any) */
@@ -427,14 +428,14 @@
{
if( !hrgnVisible ) hrgnVisible = CreateRectRgn( 0, 0, 0, 0 );
- TRACE("\tsaved VisRgn, clipRgn = %04x\n", hrgn);
+ TRACE("\tsaved VisRgn, clipRgn = %p\n", hrgn);
- SaveVisRgn16( hdc );
+ SaveVisRgn16( HDC_16(hdc) );
CombineRgn( hrgnVisible, hrgn, 0, RGN_COPY );
OffsetRgn( hrgnVisible, org.x, org.y );
- CombineRgn( hrgnVisible, InquireVisRgn16( hdc ), hrgnVisible,
+ CombineRgn( hrgnVisible, HRGN_32(InquireVisRgn16(HDC_16(hdc))), hrgnVisible,
(flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF );
- SelectVisRgn16( hdc, hrgnVisible );
+ SelectVisRgn16(HDC_16(hdc), HRGN_16(hrgnVisible));
}
if (hrgnVisible) DeleteObject( hrgnVisible );
@@ -454,7 +455,7 @@
BOOL retvalue;
HWND hwndActive = GetForegroundWindow();
- TRACE( "hwnd %04x, swp (%i,%i)-(%i,%i) flags %08x\n",
+ TRACE( "hwnd %p, swp (%i,%i)-(%i,%i) flags %08x\n",
winpos->hwnd, winpos->x, winpos->y,
winpos->x + winpos->cx, winpos->y + winpos->cy, winpos->flags);
@@ -670,8 +671,8 @@
UINT swpFlags = 0;
WINDOWPLACEMENT wpl;
- TRACE("0x%04x %u\n", hwnd, cmd );
- FIXME("(%x): stub\n", hwnd);
+ TRACE("%p %u\n", hwnd, cmd );
+ FIXME("(%p): stub\n", hwnd);
wpl.length = sizeof(wpl);
GetWindowPlacement( hwnd, &wpl );
@@ -700,7 +701,7 @@
if (!wndPtr) return FALSE;
hwnd = wndPtr->hwndSelf; /* make it a full handle */
- TRACE("hwnd=%04x, cmd=%d\n", hwnd, cmd);
+ TRACE("hwnd=%p, cmd=%d\n", hwnd, cmd);
wasVisible = (wndPtr->dwStyle & WS_VISIBLE) != 0;
Attachment:
pgp00078.pgp
Description: PGP signature
