ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile the ttydrv dll with -DSTRICT.

Browse Source
This commit is contained in:
Michael Stefaniuc 2002-10-25 19:00:49 +00:00 committed by Alexandre Julliard
parent 1e3e87d430
commit 9f12ba5056
6 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ttydrv/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

8
dlls/ttydrv/bitmap.c
View File

@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
*/ */
LONG TTYDRV_GetBitmapBits(HBITMAP hbitmap, void *bits, LONG count) 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); memset(bits, 0, count);
return count; return count;
} }
@ -45,7 +45,7 @@ LONG TTYDRV_GetBitmapBits(HBITMAP hbitmap, void *bits, LONG count)
*/ */
LONG TTYDRV_SetBitmapBits(HBITMAP hbitmap, const void *bits, LONG count) 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; return count;
} }
@ -56,7 +56,7 @@ HBITMAP TTYDRV_BITMAP_CreateDIBSection(
TTYDRV_PDEVICE *physDev, BITMAPINFO *bmi, UINT usage, TTYDRV_PDEVICE *physDev, BITMAPINFO *bmi, UINT usage,
LPVOID *bits, HANDLE section, DWORD offset) 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); physDev->hdc, bmi, usage, bits, section, offset);
return (HBITMAP) NULL; return (HBITMAP) NULL;
@ -70,7 +70,7 @@ INT TTYDRV_DC_SetDIBitsToDevice(TTYDRV_PDEVICE *physDev, INT xDest, INT yDest, D
UINT startscan, UINT lines, LPCVOID bits, UINT startscan, UINT lines, LPCVOID bits,
const BITMAPINFO *info, UINT coloruse) 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); physDev->hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, bits, info, coloruse);
return 0; return 0;

4
dlls/ttydrv/dc.c
View File

@ -77,7 +77,7 @@ BOOL TTYDRV_DC_CreateDC(DC *dc, TTYDRV_PDEVICE **pdev, LPCSTR driver, LPCSTR dev
*/ */
BOOL TTYDRV_DC_DeleteDC(TTYDRV_PDEVICE *physDev) BOOL TTYDRV_DC_DeleteDC(TTYDRV_PDEVICE *physDev)
{ {
TRACE("(%x)\n", physDev->hdc); TRACE("(%p)\n", physDev->hdc);
HeapFree( GetProcessHeap(), 0, physDev ); HeapFree( GetProcessHeap(), 0, physDev );
return TRUE; return TRUE;
@ -161,7 +161,7 @@ INT TTYDRV_GetDeviceCaps( TTYDRV_PDEVICE *physDev, INT cap )
case BTLALIGNMENT: case BTLALIGNMENT:
return 0; return 0;
default: 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; return 0;
} }
} }

44
dlls/ttydrv/graphics.c
View File

@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
BOOL TTYDRV_DC_Arc(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, BOOL TTYDRV_DC_Arc(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend) 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); physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE; return TRUE;
} }
@ -44,7 +44,7 @@ BOOL TTYDRV_DC_Arc(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bo
BOOL TTYDRV_DC_Chord(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, BOOL TTYDRV_DC_Chord(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend) 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); physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE; return TRUE;
} }
@ -54,7 +54,7 @@ BOOL TTYDRV_DC_Chord(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT
*/ */
BOOL TTYDRV_DC_Ellipse(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) 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; return TRUE;
} }
@ -64,7 +64,7 @@ BOOL TTYDRV_DC_Ellipse(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, IN
BOOL TTYDRV_DC_ExtFloodFill(TTYDRV_PDEVICE *physDev, INT x, INT y, BOOL TTYDRV_DC_ExtFloodFill(TTYDRV_PDEVICE *physDev, INT x, INT y,
COLORREF color, UINT fillType) 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; return TRUE;
} }
@ -73,7 +73,7 @@ BOOL TTYDRV_DC_ExtFloodFill(TTYDRV_PDEVICE *physDev, INT x, INT y,
*/ */
COLORREF TTYDRV_DC_GetPixel(TTYDRV_PDEVICE *physDev, INT x, INT y) 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 */ return RGB(0,0,0); /* FIXME: Always returns black */
} }
@ -86,7 +86,7 @@ BOOL TTYDRV_DC_LineTo(TTYDRV_PDEVICE *physDev, INT x, INT y)
INT row1, col1, row2, col2; INT row1, col1, row2, col2;
POINT pt[2]; POINT pt[2];
TRACE("(%x, %d, %d)\n", physDev->hdc, x, y); TRACE("(%p, %d, %d)\n", physDev->hdc, x, y);
if(!physDev->window) if(!physDev->window)
return FALSE; return FALSE;
@ -136,7 +136,7 @@ BOOL TTYDRV_DC_LineTo(TTYDRV_PDEVICE *physDev, INT x, INT y)
*/ */
BOOL TTYDRV_DC_PaintRgn(TTYDRV_PDEVICE *physDev, HRGN hrgn) 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; return TRUE;
} }
@ -146,7 +146,7 @@ BOOL TTYDRV_DC_PaintRgn(TTYDRV_PDEVICE *physDev, HRGN hrgn)
BOOL TTYDRV_DC_Pie(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, BOOL TTYDRV_DC_Pie(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend) 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); physDev->hdc, left, top, right, bottom, xstart, ystart, xend, yend);
return TRUE; return TRUE;
} }
@ -156,7 +156,7 @@ BOOL TTYDRV_DC_Pie(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bo
*/ */
BOOL TTYDRV_DC_Polygon(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count) 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; return TRUE;
} }
@ -165,7 +165,7 @@ BOOL TTYDRV_DC_Polygon(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count)
*/ */
BOOL TTYDRV_DC_Polyline(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count) 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; return TRUE;
} }
@ -174,7 +174,7 @@ BOOL TTYDRV_DC_Polyline(TTYDRV_PDEVICE *physDev, const POINT* pt, INT count)
*/ */
BOOL TTYDRV_DC_PolyPolygon(TTYDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) 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; return TRUE;
} }
@ -183,7 +183,7 @@ BOOL TTYDRV_DC_PolyPolygon(TTYDRV_PDEVICE *physDev, const POINT* pt, const INT*
*/ */
BOOL TTYDRV_DC_PolyPolyline(TTYDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines) 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; return TRUE;
} }
@ -197,7 +197,7 @@ BOOL TTYDRV_DC_Rectangle(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right,
INT row1, col1, row2, col2; INT row1, col1, row2, col2;
RECT rect; 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) if(!physDev->window)
return FALSE; return FALSE;
@ -256,7 +256,7 @@ BOOL TTYDRV_DC_Rectangle(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right,
BOOL TTYDRV_DC_RoundRect(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, BOOL TTYDRV_DC_RoundRect(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height) 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); physDev->hdc, left, top, right, bottom, ell_width, ell_height);
return TRUE; return TRUE;
@ -271,7 +271,7 @@ COLORREF TTYDRV_DC_SetPixel(TTYDRV_PDEVICE *physDev, INT x, INT y, COLORREF colo
INT row, col; INT row, col;
POINT pt; 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) if(!physDev->window)
return FALSE; return FALSE;
@ -300,7 +300,7 @@ BOOL TTYDRV_DC_BitBlt(TTYDRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT width, INT height, TTYDRV_PDEVICE *physDevSrc, INT width, INT height, TTYDRV_PDEVICE *physDevSrc,
INT xSrc, INT ySrc, DWORD rop) 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 ); physDevDst->hdc, xDst, yDst, width, height, physDevSrc->hdc, xSrc, ySrc, rop );
return TRUE; return TRUE;
} }
@ -311,7 +311,7 @@ BOOL TTYDRV_DC_BitBlt(TTYDRV_PDEVICE *physDevDst, INT xDst, INT yDst,
BOOL TTYDRV_DC_PatBlt(TTYDRV_PDEVICE *physDev, INT left, INT top, BOOL TTYDRV_DC_PatBlt(TTYDRV_PDEVICE *physDev, INT left, INT top,
INT width, INT height, DWORD rop) 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; return TRUE;
} }
@ -323,7 +323,7 @@ BOOL TTYDRV_DC_StretchBlt(TTYDRV_PDEVICE *physDevDst, INT xDst, INT yDst,
TTYDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, TTYDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, DWORD rop) 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, physDevDst->hdc, xDst, yDst, widthDst, heightDst,
physDevSrc->hdc, xSrc, ySrc, widthSrc, heightSrc, rop ); physDevSrc->hdc, xSrc, ySrc, widthSrc, heightSrc, rop );
@ -344,7 +344,7 @@ BOOL TTYDRV_DC_ExtTextOut(TTYDRV_PDEVICE *physDev, INT x, INT y, UINT flags,
POINT pt; POINT pt;
UINT text_align = GetTextAlign( physDev->hdc ); 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); physDev->hdc, x, y, flags, lpRect, debugstr_wn(str, count), count, lpDx);
if(!physDev->window) if(!physDev->window)
@ -390,7 +390,7 @@ BOOL TTYDRV_DC_GetCharWidth(TTYDRV_PDEVICE *physDev, UINT firstChar, UINT lastCh
{ {
UINT c; 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++) { for(c=firstChar; c<=lastChar; c++) {
buffer[c-firstChar] = physDev->cellWidth; buffer[c-firstChar] = physDev->cellWidth;
@ -405,7 +405,7 @@ BOOL TTYDRV_DC_GetCharWidth(TTYDRV_PDEVICE *physDev, UINT firstChar, UINT lastCh
BOOL TTYDRV_DC_GetTextExtentPoint(TTYDRV_PDEVICE *physDev, LPCWSTR str, INT count, BOOL TTYDRV_DC_GetTextExtentPoint(TTYDRV_PDEVICE *physDev, LPCWSTR str, INT count,
LPSIZE size) 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->cx = count * physDev->cellWidth;
size->cy = physDev->cellHeight; size->cy = physDev->cellHeight;
@ -418,7 +418,7 @@ BOOL TTYDRV_DC_GetTextExtentPoint(TTYDRV_PDEVICE *physDev, LPCWSTR str, INT coun
*/ */
BOOL TTYDRV_DC_GetTextMetrics(TTYDRV_PDEVICE *physDev, LPTEXTMETRICW lptm) 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->tmHeight = physDev->cellHeight;
lptm->tmAscent = 0; lptm->tmAscent = 0;

4
dlls/ttydrv/objects.c
View File

@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
*/ */
HFONT TTYDRV_SelectFont(TTYDRV_PDEVICE *physDev, HFONT hfont) 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 */
} }

27
dlls/ttydrv/wnd.c
View File

@ -24,6 +24,7 @@
#include "ttydrv.h" #include "ttydrv.h"
#include "win.h" #include "win.h"
#include "winpos.h" #include "winpos.h"
#include "wownt32.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "hook.h" #include "hook.h"
@ -49,7 +50,7 @@ BOOL TTYDRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
WINDOW *window; WINDOW *window;
INT cellWidth=8, cellHeight=8; /* FIXME: Hardcoded */ INT cellWidth=8, cellHeight=8; /* FIXME: Hardcoded */
TRACE("(%x)\n", hwnd); TRACE("(%p)\n", hwnd);
/* Only create top-level windows */ /* Only create top-level windows */
if (!(wndPtr->dwStyle & WS_CHILD)) if (!(wndPtr->dwStyle & WS_CHILD))
@ -120,7 +121,7 @@ BOOL TTYDRV_DestroyWindow( HWND hwnd )
WND *wndPtr = WIN_GetPtr( hwnd ); WND *wndPtr = WIN_GetPtr( hwnd );
WINDOW *window = wndPtr->pDriverData; WINDOW *window = wndPtr->pDriverData;
TRACE("(%x)\n", hwnd); TRACE("(%p)\n", hwnd);
if (window && window != root_window) delwin(window); if (window && window != root_window) delwin(window);
wndPtr->pDriverData = NULL; wndPtr->pDriverData = NULL;
@ -383,9 +384,9 @@ BOOL TTYDRV_GetDC( HWND hwnd, HDC hdc, HRGN hrgn, DWORD flags )
org.y = wndPtr->rectClient.top; 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) if (flags & DCX_PARENTCLIP)
{ {
@ -418,7 +419,7 @@ BOOL TTYDRV_GetDC( HWND hwnd, HDC hdc, HRGN hrgn, DWORD flags )
hrgnVisible = DCE_GetVisRgn( hwnd, flags, 0, 0 ); hrgnVisible = DCE_GetVisRgn( hwnd, flags, 0, 0 );
OffsetRgn( hrgnVisible, org.x, org.y ); OffsetRgn( hrgnVisible, org.x, org.y );
} }
SelectVisRgn16( hdc, hrgnVisible ); SelectVisRgn16( HDC_16(hdc), HRGN_16(hrgnVisible) );
} }
/* apply additional region operation (if any) */ /* apply additional region operation (if any) */
@ -427,14 +428,14 @@ BOOL TTYDRV_GetDC( HWND hwnd, HDC hdc, HRGN hrgn, DWORD flags )
{ {
if( !hrgnVisible ) hrgnVisible = CreateRectRgn( 0, 0, 0, 0 ); 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 ); CombineRgn( hrgnVisible, hrgn, 0, RGN_COPY );
OffsetRgn( hrgnVisible, org.x, org.y ); 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 ); (flags & DCX_INTERSECTRGN) ? RGN_AND : RGN_DIFF );
SelectVisRgn16( hdc, hrgnVisible ); SelectVisRgn16(HDC_16(hdc), HRGN_16(hrgnVisible));
} }
if (hrgnVisible) DeleteObject( hrgnVisible ); if (hrgnVisible) DeleteObject( hrgnVisible );
@ -454,7 +455,7 @@ BOOL TTYDRV_SetWindowPos( WINDOWPOS *winpos )
BOOL retvalue; BOOL retvalue;
HWND hwndActive = GetForegroundWindow(); 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->hwnd, winpos->x, winpos->y,
winpos->x + winpos->cx, winpos->y + winpos->cy, winpos->flags); winpos->x + winpos->cx, winpos->y + winpos->cy, winpos->flags);
@ -670,8 +671,8 @@ static UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect )
UINT swpFlags = 0; UINT swpFlags = 0;
WINDOWPLACEMENT wpl; WINDOWPLACEMENT wpl;
TRACE("0x%04x %u\n", hwnd, cmd ); TRACE("%p %u\n", hwnd, cmd );
FIXME("(%x): stub\n", hwnd); FIXME("(%p): stub\n", hwnd);
wpl.length = sizeof(wpl); wpl.length = sizeof(wpl);
GetWindowPlacement( hwnd, &wpl ); GetWindowPlacement( hwnd, &wpl );
@ -700,7 +701,7 @@ BOOL TTYDRV_ShowWindow( HWND hwnd, INT cmd )
if (!wndPtr) return FALSE; if (!wndPtr) return FALSE;
hwnd = wndPtr->hwndSelf; /* make it a full handle */ 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; wasVisible = (wndPtr->dwStyle & WS_VISIBLE) != 0;