Index: trunk/src/gdi32/blit.cpp
===================================================================
--- trunk/src/gdi32/blit.cpp	(revision 9427)
+++ trunk/src/gdi32/blit.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: blit.cpp,v 1.40 2002-10-28 12:21:51 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.41 2002-11-26 10:53:06 sandervl Exp $ */
 
 /*
@@ -47,5 +47,4 @@
             rc  = dsect->BitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
                                 nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
-            dprintf(("GDI32: StretchBlt returned %d", rc));
             return rc;
         }
@@ -330,75 +329,4 @@
     }
     return rc;
-
-//SvL: Breaks startup bitmap of Acrobat Reader 4.05
-#if 0
-    else
-    if(info->bmiHeader.biBitCount == 8 && info->bmiHeader.biCompression == 0 && !(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE)) {
-        INT rc = 0;
-        // convert 8bit to 24bit
-
-        BITMAPINFO newInfo;
-        newInfo.bmiHeader = info->bmiHeader;
-        newInfo.bmiHeader.biBitCount = 24;
-        long lLineByte24 = ((newInfo.bmiHeader.biWidth * 24 + 31) / 32) * 4;
-        long lLineByte8  = ((newInfo.bmiHeader.biWidth *  8 + 31) / 32) * 4;
-        long lHeight   = newInfo.bmiHeader.biHeight;
-        if(lHeight < 0) lHeight = -lHeight;
-
-        char *newBits = (char *)malloc( lLineByte24 * lHeight );
-        if(newBits) {
-            //
-            // Get Palette Entries
-            //
-            PALETTEENTRY aEntries[256];
-            LOGPALETTE *pLog = (LOGPALETTE *)malloc( sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 256 );
-            pLog->palVersion = 0x300;
-            pLog->palNumEntries = 256;
-
-            HPALETTE hPaletteDummy = CreatePalette( pLog );
-            free( pLog );
-            HPALETTE hPalette = SelectPalette( hdc, hPaletteDummy, FALSE );
-            GetPaletteEntries( hPalette, 0, 255, aEntries  );
-            SelectPalette( hdc, hPalette, FALSE );
-            DeleteObject( hPaletteDummy );
-
-            //
-            // convert 8bit to 24bit
-            //
-            if(newInfo.bmiHeader.biHeight > 0) {
-                unsigned char *pbSrc = (unsigned char *)bits;
-                unsigned char *pbDst = (unsigned char *)newBits;
-                for(int y = 0; y < lHeight; y++) {
-                    for(int x = 0; x < newInfo.bmiHeader.biWidth; x++) {
-                        PALETTEENTRY src = aEntries[pbSrc[x]];
-                        pbDst[x * 3 + 0] = src.peBlue;
-                        pbDst[x * 3 + 1] = src.peGreen;
-                        pbDst[x * 3 + 2] = src.peRed;
-                    }
-                    pbDst += lLineByte24;
-                    pbSrc += lLineByte8;
-                }
-            } else {
-                // upside down
-                newInfo.bmiHeader.biHeight = -info->bmiHeader.biHeight;
-                unsigned char *pbSrc = (unsigned char *)bits + lLineByte8 * (lHeight - 1);
-                unsigned char *pbDst = (unsigned char *)newBits;
-                for(int y = 0; y < lHeight; y++) {
-                    for(int x = 0; x < newInfo.bmiHeader.biWidth; x++) {
-                        PALETTEENTRY src = aEntries[pbSrc[x]];
-                        pbDst[x * 3 + 0] = src.peBlue;
-                        pbDst[x * 3 + 1] = src.peGreen;
-                        pbDst[x * 3 + 2] = src.peRed;
-                    }
-                    pbDst += lLineByte24;
-                    pbSrc -= lLineByte8;
-                }
-            }
-            rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, DIB_RGB_COLORS );
-            free( newBits );
-        }
-        return rc;
-    } 
-#endif
 }
 //******************************************************************************
@@ -427,6 +355,4 @@
   	    }
     }
-
-    dprintf(("GDI32: PatBlt hdc %x (%d,%d) (%d,%d) returned %d\n",hdc, nXLeft,nYLeft,nWidth,nHeight,rc));
     return(rc);
 }
@@ -435,5 +361,4 @@
 BOOL WIN32API MaskBlt( HDC arg1, int arg2, int arg3, int arg4, int arg5, HDC   arg6, int arg7, int arg8, HBITMAP arg9, int arg10, int arg11, DWORD  arg12)
 {
-    dprintf(("GDI32: MaskBlt"));
     return O32_MaskBlt(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 }
@@ -541,4 +466,6 @@
                                      xSrc, ySrc)/sizeof(WORD);
         newbits = (WORD *) HeapAlloc(GetProcessHeap(), 0, imgsize);
+//bugbug (too much)
+//bugbug
         if(CPUFeatures & CPUID_MMX) {
              RGB555to565MMX(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
@@ -548,5 +475,5 @@
         bits = newbits;
     }
-    //SvL: Ignore BI_BITFIELDS type (SetDIBitsToDevice fails otherwise)
+    //SvL: Ignore BI_BITFIELDS type (StretchDIBits fails otherwise)
     if(info->bmiHeader.biCompression == BI_BITFIELDS) {
         ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
@@ -629,6 +556,4 @@
 int WIN32API SetStretchBltMode( HDC arg1, int  arg2)
 {
-  dprintf(("GDI32: SetStretchBltMode 0x%08X, 0x%08X\n",arg1, arg2));
-
     if(DIBSection::getSection() != NULL)
     {
@@ -645,5 +570,4 @@
 int WIN32API GetStretchBltMode( HDC arg1)
 {
-    dprintf(("GDI32: GetStretchBltMode"));
     return O32_GetStretchBltMode(arg1);
 }
Index: trunk/src/gdi32/dbglocal.cpp
===================================================================
--- trunk/src/gdi32/dbglocal.cpp	(revision 9427)
+++ trunk/src/gdi32/dbglocal.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: dbglocal.cpp,v 1.8 2002-07-15 10:02:28 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.9 2002-11-26 10:53:07 sandervl Exp $ */
 
 /*
@@ -41,5 +41,7 @@
 "objhandle",
 "transform",
-"printer"
+"printer",
+"icm",
+"trace"
 };
 //******************************************************************************
Index: trunk/src/gdi32/dbglocal.h
===================================================================
--- trunk/src/gdi32/dbglocal.h	(revision 9427)
+++ trunk/src/gdi32/dbglocal.h	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: dbglocal.h,v 1.7 2001-07-20 15:35:57 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.8 2002-11-26 10:53:07 sandervl Exp $ */
 
 /*
@@ -40,5 +40,7 @@
 #define DBG_transform       18
 #define DBG_printer         19
-#define DBG_MAXFILES        20
+#define DBG_icm             20
+#define DBG_trace           21
+#define DBG_MAXFILES        22
 
 extern USHORT DbgEnabledGDI32[DBG_MAXFILES];
Index: trunk/src/gdi32/dbgwrap.cpp
===================================================================
--- trunk/src/gdi32/dbgwrap.cpp	(revision 9429)
+++ trunk/src/gdi32/dbgwrap.cpp	(revision 9429)
@@ -0,0 +1,421 @@
+#include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
+
+#include <os2win.h>
+#include <winreg.h>
+#include <winnt.h>
+#include <wincon.h>
+#include <winthunk.h>
+#include <winuser.h>
+#include <ddeml.h>
+#include <dde.h>
+#include <winnls.h>
+#include <ntddk.h>
+#include <heapstring.h>
+
+#define DBG_LOCALLOG    DBG_trace
+#include <dbglocal.h>
+
+#define DBGWRAP_MODULE "GDI32"
+#include <dbgwrap.h>
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_text
+
+DEBUGWRAP32(ExtTextOutA)
+DEBUGWRAP32(ExtTextOutW)
+DEBUGWRAP12(PolyTextOutA)
+DEBUGWRAP12(PolyTextOutW)
+DEBUGWRAP20(TextOutA)
+DEBUGWRAP20(TextOutW)
+DEBUGWRAP28(GetTextExtentExPointA)
+DEBUGWRAP28(GetTextExtentExPointW)
+DEBUGWRAP16(GetTextExtentPoint32A)
+DEBUGWRAP16(GetTextExtentPoint32W)
+DEBUGWRAP16(GetTextExtentPointA)
+DEBUGWRAP16(GetTextExtentPointW)
+
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_blit
+
+
+DEBUGWRAP36(BitBlt)
+DEBUGWRAP44(StretchBlt)
+DEBUGWRAP52(StretchDIBits)
+DEBUGWRAP48(MaskBlt)
+DEBUGWRAP24(PatBlt)
+DEBUGWRAP40(PlgBlt)
+DEBUGWRAP4(GetStretchBltMode)
+DEBUGWRAP8(SetStretchBltMode)
+DEBUGWRAP48(SetDIBitsToDevice)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_font
+
+DEBUGWRAP12(GetTextFaceA)
+DEBUGWRAP12(GetTextFaceW)
+DEBUGWRAP56(CreateFontA)
+DEBUGWRAP12(TranslateCharsetInfo)
+DEBUGWRAP4(CreateFontIndirectA)
+DEBUGWRAP4(CreateFontIndirectW)
+DEBUGWRAP56(CreateFontW)
+DEBUGWRAP16(CreateScalableFontResourceA)
+DEBUGWRAP16(CreateScalableFontResourceW)
+DEBUGWRAP4(AddFontResourceA)
+DEBUGWRAP4(AddFontResourceW)
+DEBUGWRAP16(EnumFontFamiliesA)
+DEBUGWRAP20(EnumFontFamiliesExA)
+DEBUGWRAP20(EnumFontFamiliesExW)
+DEBUGWRAP16(EnumFontFamiliesW)
+DEBUGWRAP16(EnumFontsA)
+DEBUGWRAP16(EnumFontsW)
+DEBUGWRAP20(GetFontData)
+DEBUGWRAP4(GetFontLanguageInfo)
+//;    GetFontResourceInfo        = _GetFontResourceInfo@??     @259
+DEBUGWRAP28(GetGlyphOutlineA)
+DEBUGWRAP28(GetGlyphOutlineW)
+DEBUGWRAP4(RemoveFontResourceA)
+DEBUGWRAP4(RemoveFontResourceW)
+//;    SetFontEnumeration         = _SetFontEnumeration@??      @385
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_region
+
+DEBUGWRAP20(IntersectClipRect)
+DEBUGWRAP8(GetRgnBox)
+//;    GetRandomRgn               = _GetRandomRgn@??            @290
+NODEF_DEBUGWRAP8(GetMetaRgn)
+DEBUGWRAP8(GetClipRgn)
+DEBUGWRAP20(FrameRgn)
+DEBUGWRAP12(FillRgn)
+DEBUGWRAP12(ExtSelectClipRgn)
+DEBUGWRAP8(EqualRgn)
+DEBUGWRAP16(CreatePolyPolygonRgn)
+DEBUGWRAP12(CreatePolygonRgn)
+DEBUGWRAP16(CreateRectRgn)
+DEBUGWRAP4(CreateRectRgnIndirect)
+DEBUGWRAP24(CreateRoundRectRgn)
+DEBUGWRAP16(CombineRgn)
+DEBUGWRAP16(CreateEllipticRgn)
+DEBUGWRAP4(CreateEllipticRgnIndirect)
+DEBUGWRAP8(PaintRgn)
+DEBUGWRAP12(ExtCreateRegion)
+DEBUGWRAP12(GetRegionData)
+DEBUGWRAP4(PathToRegion)
+DEBUGWRAP12(PtInRegion)
+DEBUGWRAP8(RectInRegion)
+DEBUGWRAP20(SetRectRgn)
+DEBUGWRAP8(InvertRgn)
+DEBUGWRAP12(OffsetClipRgn)
+DEBUGWRAP12(OffsetRgn)
+DEBUGWRAP8(SelectClipRgn)
+DEBUGWRAP4(SetMetaRgn)
+DEBUGWRAP8(GetClipBox)
+
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_printer
+
+
+DEBUGWRAP8(SetAbortProc)
+DEBUGWRAP4(AbortDoc)
+DEBUGWRAP8(StartDocA)
+DEBUGWRAP8(StartDocW)
+DEBUGWRAP4(StartPage)
+DEBUGWRAP4(EndDoc)
+DEBUGWRAP4(EndPage)
+
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_palette
+
+DEBUGWRAP16(AnimatePalette)
+DEBUGWRAP4(CreateHalftonePalette)
+DEBUGWRAP4(CreatePalette)
+DEBUGWRAP8(GetNearestPaletteIndex)
+DEBUGWRAP16(GetPaletteEntries)
+DEBUGWRAP16(GetSystemPaletteEntries)
+DEBUGWRAP4(GetSystemPaletteUse)
+DEBUGWRAP8(SetSystemPaletteUse)
+DEBUGWRAP4(RealizePalette)
+DEBUGWRAP8(ResizePalette)
+DEBUGWRAP12(SelectPalette)
+DEBUGWRAP16(SetPaletteEntries)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_icm
+
+DEBUGWRAP12(EnumICMProfilesA)
+DEBUGWRAP12(EnumICMProfilesW)
+NODEF_DEBUGWRAP12(GetICMProfileA)
+NODEF_DEBUGWRAP12(GetICMProfileW)
+DEBUGWRAP8(SetICMMode)
+NODEF_DEBUGWRAP8(SetICMProfileA)
+NODEF_DEBUGWRAP8(SetICMProfileW)
+NODEF_DEBUGWRAP16(UpdateICMRegKeyA)
+NODEF_DEBUGWRAP16(UpdateICMRegKeyW)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_metafile
+
+DEBUGWRAP4(CloseMetaFile)
+DEBUGWRAP8(CopyEnhMetaFileA)
+DEBUGWRAP8(CopyEnhMetaFileW)
+DEBUGWRAP8(CopyMetaFileA)
+DEBUGWRAP8(CopyMetaFileW)
+DEBUGWRAP4(CloseEnhMetaFile)
+DEBUGWRAP16(CreateEnhMetaFileA)
+DEBUGWRAP16(CreateEnhMetaFileW)
+DEBUGWRAP4(CreateMetaFileA)
+DEBUGWRAP4(CreateMetaFileW)
+DEBUGWRAP4(DeleteEnhMetaFile)
+DEBUGWRAP4(DeleteMetaFile)
+DEBUGWRAP20(EnumEnhMetaFile)
+DEBUGWRAP16(EnumMetaFile)
+DEBUGWRAP4(GetEnhMetaFileA)
+DEBUGWRAP12(GetEnhMetaFileBits)
+DEBUGWRAP12(GetEnhMetaFileDescriptionA)
+DEBUGWRAP12(GetEnhMetaFileDescriptionW)
+DEBUGWRAP12(GetEnhMetaFileHeader)
+DEBUGWRAP12(GetEnhMetaFilePaletteEntries)
+DEBUGWRAP4(GetEnhMetaFileW)
+DEBUGWRAP4(GetMetaFileA)
+DEBUGWRAP12(GetMetaFileBitsEx)
+DEBUGWRAP4(GetMetaFileW)
+NODEF_DEBUGWRAP20(GetWinMetaFileBits)
+DEBUGWRAP12(PlayEnhMetaFile)
+DEBUGWRAP16(PlayEnhMetaFileRecord)
+DEBUGWRAP8(PlayMetaFile)
+DEBUGWRAP16(PlayMetaFileRecord)
+DEBUGWRAP8(SetEnhMetaFileBits)
+DEBUGWRAP8(SetMetaFileBitsEx)
+DEBUGWRAP16(SetWinMetaFileBits)
+
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_objhandle
+
+DEBUGWRAP4(UnrealizeObject)
+DEBUGWRAP4(DeleteObject)
+DEBUGWRAP16(EnumObjects)
+DEBUGWRAP8(GetCurrentObject)
+DEBUGWRAP12(GetObjectA)
+DEBUGWRAP_LVL2_4(GetObjectType)
+DEBUGWRAP12(GetObjectW)
+DEBUGWRAP4(GetStockObject)
+DEBUGWRAP_LVL2_8(SelectObject)
+NODEF_DEBUGWRAP8(SetObjectOwner)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_dibitmap
+
+DEBUGWRAP20(CreateBitmap)
+DEBUGWRAP4(CreateBitmapIndirect)
+DEBUGWRAP12(CreateCompatibleBitmap)
+DEBUGWRAP24(CreateDIBitmap)
+DEBUGWRAP12(CreateDiscardableBitmap)
+DEBUGWRAP12(GetBitmapBits)
+DEBUGWRAP8(GetBitmapDimensionEx)
+DEBUGWRAP12(SetBitmapBits)
+DEBUGWRAP16(SetBitmapDimensionEx)
+DEBUGWRAP24(CreateDIBSection)
+DEBUGWRAP16(GetDIBColorTable)
+DEBUGWRAP28(GetDIBits)
+DEBUGWRAP16(SetDIBColorTable)
+DEBUGWRAP28(SetDIBits)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_line
+
+
+DEBUGWRAP24(LineDDA)
+DEBUGWRAP12(LineTo)
+DEBUGWRAP16(MoveToEx)
+DEBUGWRAP16(PolyPolyline)
+DEBUGWRAP12(Polyline)
+DEBUGWRAP12(PolylineTo)
+
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_transform
+
+DEBUGWRAP4(GetGraphicsMode)
+DEBUGWRAP8(SetWorldTransform)
+DEBUGWRAP16(SetViewportExtEx)
+DEBUGWRAP16(SetViewportOrgEx)
+DEBUGWRAP16(SetWindowExtEx)
+DEBUGWRAP16(SetWindowOrgEx)
+DEBUGWRAP8(GetViewportExtEx)
+DEBUGWRAP8(GetViewportOrgEx)
+DEBUGWRAP8(GetWindowExtEx)
+DEBUGWRAP8(GetWindowOrgEx)
+DEBUGWRAP8(GetWorldTransform)
+DEBUGWRAP8(SetMapMode)
+DEBUGWRAP8(SetGraphicsMode)
+DEBUGWRAP4(GetMapMode)
+DEBUGWRAP12(CombineTransform)
+DEBUGWRAP12(ModifyWorldTransform)
+DEBUGWRAP16(OffsetViewportOrgEx)
+DEBUGWRAP16(OffsetWindowOrgEx)
+
+
+#undef DBG_LOCALLOG
+#define DBG_LOCALLOG    DBG_gdi32
+
+
+DEBUGWRAP4(AbortPath)
+DEBUGWRAP24(AngleArc)
+DEBUGWRAP36(Arc)
+DEBUGWRAP36(ArcTo)
+DEBUGWRAP4(BeginPath)
+NODEF_DEBUGWRAP4(CancelDC)
+NODEF_DEBUGWRAP16(CheckColorsInGamut)
+DEBUGWRAP8(ChoosePixelFormat)
+DEBUGWRAP36(Chord)
+DEBUGWRAP4(CloseFigure)
+NODEF_DEBUGWRAP12(ColorMatchToTarget)
+DEBUGWRAP4(CreateBrushIndirect)
+DEBUGWRAP4(CreateColorSpaceA)
+DEBUGWRAP4(CreateColorSpaceW)
+DEBUGWRAP4(CreateCompatibleDC)
+DEBUGWRAP16(CreateDCA)
+DEBUGWRAP16(CreateDCW)
+DEBUGWRAP8(CreateDIBPatternBrush)
+DEBUGWRAP8(CreateDIBPatternBrushPt)
+DEBUGWRAP8(CreateHatchBrush)
+DEBUGWRAP16(CreateICA)
+DEBUGWRAP16(CreateICW)
+DEBUGWRAP4(CreatePatternBrush)
+DEBUGWRAP12(CreatePen)
+DEBUGWRAP4(CreatePenIndirect)
+DEBUGWRAP4(CreateSolidBrush)
+DEBUGWRAP12(DPtoLP)
+DEBUGWRAP4(DeleteColorSpace)
+DEBUGWRAP4(DeleteDC)
+DEBUGWRAP16(DescribePixelFormat)
+//;    DeviceCapabilitiesEx       = _DeviceCapabilitiesEx@??    @177
+//;    DeviceCapabilitiesExA      = _DeviceCapabilitiesExA@??   @178
+//;    DeviceCapabilitiesExW      = _DeviceCapabilitiesExW@??   @179
+DEBUGWRAP16(DrawEscape)
+DEBUGWRAP20(Ellipse)
+DEBUGWRAP4(EndPath)
+DEBUGWRAP20(Escape)
+DEBUGWRAP20(ExcludeClipRect)
+DEBUGWRAP20(ExtCreatePen)
+DEBUGWRAP24(ExtEscape)
+DEBUGWRAP20(ExtFloodFill)
+DEBUGWRAP4(FillPath)
+DEBUGWRAP16(FixBrushOrgEx)
+DEBUGWRAP4(FlattenPath)
+DEBUGWRAP16(FloodFill)
+DEBUGWRAP12(GdiComment)
+DEBUGWRAP0(GdiFlush)
+NODEF_DEBUGWRAP0(GdiGetBatchLimit)
+//;    GdiPlayDCScript            = _GdiPlayDCScript@??         @215
+//;    GdiPlayJournal             = _GdiPlayJournal@??          @216
+//;    GdiPlayScript              = _GdiPlayScript@??           @217
+NODEF_DEBUGWRAP4(GdiSetBatchLimit)
+DEBUGWRAP4(GetArcDirection)
+DEBUGWRAP8(GetAspectRatioFilterEx)
+DEBUGWRAP4(GetBkColor)
+DEBUGWRAP4(GetBkMode)
+DEBUGWRAP12(GetBoundsRect)
+DEBUGWRAP8(GetBrushOrgEx)
+DEBUGWRAP16(GetCharABCWidthsA)
+DEBUGWRAP16(GetCharABCWidthsFloatA)
+DEBUGWRAP16(GetCharABCWidthsFloatW)
+DEBUGWRAP16(GetCharABCWidthsW)
+DEBUGWRAP16(GetCharWidth32A)
+DEBUGWRAP16(GetCharWidth32W)
+DEBUGWRAP16(GetCharWidthFloatA)
+DEBUGWRAP16(GetCharWidthFloatW)
+DEBUGWRAP24(GetCharacterPlacementA)
+DEBUGWRAP24(GetCharacterPlacementW)
+DEBUGWRAP8(GetColorAdjustment)
+NODEF_DEBUGWRAP4(GetColorSpace)
+DEBUGWRAP8(GetCurrentPositionEx)
+DEBUGWRAP8(GetDCOrgEx)
+DEBUGWRAP8(GetDeviceCaps)
+NODEF_DEBUGWRAP8(GetDeviceGammaRamp)
+DEBUGWRAP12(GetKerningPairsA)
+DEBUGWRAP12(GetKerningPairsW)
+NODEF_DEBUGWRAP12(GetLogColorSpaceA)
+NODEF_DEBUGWRAP12(GetLogColorSpaceW)
+DEBUGWRAP8(GetMiterLimit)
+DEBUGWRAP8(GetNearestColor)
+DEBUGWRAP12(GetOutlineTextMetricsA)
+DEBUGWRAP12(GetOutlineTextMetricsW)
+DEBUGWRAP16(GetPath)
+DEBUGWRAP_LVL2_12(GetPixel)
+DEBUGWRAP4(GetPixelFormat)
+DEBUGWRAP4(GetPolyFillMode)
+DEBUGWRAP4(GetROP2)
+DEBUGWRAP8(GetRasterizerCaps)
+
+
+DEBUGWRAP4(GetTextAlign)
+DEBUGWRAP4(GetTextCharacterExtra)
+DEBUGWRAP4(GetTextCharset)
+DEBUGWRAP12(GetTextCharsetInfo)
+DEBUGWRAP4(GetTextColor)
+DEBUGWRAP8(GetTextMetricsA)
+DEBUGWRAP8(GetTextMetricsW)
+DEBUGWRAP12(LPtoDP)
+DEBUGWRAP36(Pie)
+DEBUGWRAP12(PolyBezier)
+DEBUGWRAP12(PolyBezierTo)
+DEBUGWRAP16(PolyDraw)
+DEBUGWRAP16(PolyPolygon)
+DEBUGWRAP12(Polygon)
+DEBUGWRAP12(PtVisible)
+DEBUGWRAP8(RectVisible)
+DEBUGWRAP20(Rectangle)
+DEBUGWRAP8(ResetDCA)
+DEBUGWRAP8(ResetDCW)
+DEBUGWRAP8(RestoreDC)
+DEBUGWRAP28(RoundRect)
+DEBUGWRAP4(SaveDC)
+DEBUGWRAP24(ScaleViewportExtEx)
+DEBUGWRAP24(ScaleWindowExtEx)
+DEBUGWRAP8(SelectClipPath)
+DEBUGWRAP8(SetArcDirection)
+DEBUGWRAP8(SetBkColor)
+DEBUGWRAP8(SetBkMode)
+DEBUGWRAP12(SetBoundsRect)
+DEBUGWRAP16(SetBrushOrgEx)
+DEBUGWRAP8(SetColorAdjustment)
+DEBUGWRAP8(SetColorSpace)
+DEBUGWRAP8(SetDeviceGammaRamp)
+DEBUGWRAP8(SetMapperFlags)
+DEBUGWRAP12(SetMiterLimit)
+DEBUGWRAP_LVL2_16(SetPixel)
+DEBUGWRAP12(SetPixelFormat)
+DEBUGWRAP_LVL2_16(SetPixelV)
+DEBUGWRAP8(SetPolyFillMode)
+DEBUGWRAP8(SetROP2)
+
+
+
+DEBUGWRAP8(SetTextAlign)
+DEBUGWRAP8(SetTextCharacterExtra)
+DEBUGWRAP8(SetTextColor)
+DEBUGWRAP12(SetTextJustification)
+DEBUGWRAP4(StrokeAndFillPath)
+DEBUGWRAP4(StrokePath)
+DEBUGWRAP4(SwapBuffers)
+DEBUGWRAP4(UpdateColors)
+DEBUGWRAP4(WidenPath)
Index: trunk/src/gdi32/dibitmap.cpp
===================================================================
--- trunk/src/gdi32/dibitmap.cpp	(revision 9427)
+++ trunk/src/gdi32/dibitmap.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: dibitmap.cpp,v 1.34 2002-10-28 13:24:44 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.35 2002-11-26 10:53:07 sandervl Exp $ */
 
 /*
@@ -159,5 +159,4 @@
 
     hBitmap = O32_CreateCompatibleBitmap(hdc, nWidth, nHeight);
-    dprintf(("GDI32: CreateCompatibleBitmap %x (%d,%d) returned %x", hdc, nWidth, nHeight, hBitmap));
     if(hBitmap) {
         STATS_CreateCompatibleBitmap(hBitmap,hdc, nWidth, nHeight);
@@ -186,7 +185,5 @@
 
     hBitmap = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x", nWidth, nHeight, cBitsPerPel, hBitmap));
     if(hBitmap) STATS_CreateBitmap(hBitmap,nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-
     return(hBitmap);
 }
@@ -200,6 +197,4 @@
     hBitmap = O32_CreateBitmapIndirect(pBitmap);
     if(hBitmap) STATS_CreateBitmapIndirect(hBitmap, pBitmap);
-
-    dprintf(("GDI32: CreateBitmapIndirect returned %x", hBitmap));
     return hBitmap;
 }
@@ -374,10 +369,21 @@
 {
     int nrlines;
+    pDCData pHps;  
+    HDC hdcMem;
 
     dprintf(("GDI32: GetDIBits %x %x %d %d %x %x (biBitCount %d) %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, lpbi->bmiHeader.biBitCount, uUsage));
 
     //SvL: WGSS screws up the DC if it's a memory DC
-    //     TODO: Fix in WGSS
-    HDC hdcMem = CreateCompatibleDC(0);
+    //     TODO: Fix in WGSS (tries to select another bitmap in the DC which fails)
+    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+    if(!pHps)
+    {
+        SetLastError(ERROR_INVALID_HANDLE);
+        return 0;
+    }
+    if(pHps->isMemoryPS) {
+          hdcMem = CreateCompatibleDC(0);
+    }
+    else  hdcMem = hdc;
 
     if(lpbi->bmiHeader.biHeight < 0) {
@@ -394,5 +400,6 @@
     }
 
-    DeleteDC(hdcMem);
+    if(pHps->isMemoryPS)
+        DeleteDC(hdcMem);
 
     if(lpvBits) {
@@ -447,5 +454,4 @@
        nrlines = cScanLines;
     }
-    dprintf(("GDI32: GetDIBits returned %d", nrlines));
     return nrlines;
 }
Index: trunk/src/gdi32/font.cpp
===================================================================
--- trunk/src/gdi32/font.cpp	(revision 9427)
+++ trunk/src/gdi32/font.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: font.cpp,v 1.26 2002-07-15 10:02:28 sandervl Exp $ */
+/* $Id: font.cpp,v 1.27 2002-11-26 10:53:08 sandervl Exp $ */
 
 /*
@@ -147,18 +147,18 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG14(HFONT,  CreateFontA, int,    nHeight,
-                                    int,    nWidth,
-                                    int,    nEscapement,
-                                    int,    nOrientation,
-                                    int,    fnWeight,
-                                    DWORD,  fdwItalic,
-                                    DWORD,  fdwUnderline,
-                                    DWORD,  fdwStrikeOut,
-                                    DWORD,  fdwCharSet,
-                                    DWORD,  fdwOutputPrecision,
-                                    DWORD,  fdwClipPrecision,
-                                    DWORD,  fdwQuality,
-                                    DWORD,  fdwPitchAndFamily,
-                                    LPCSTR, lpszFace)
+HFONT WIN32API CreateFontA(int  nHeight,
+                           int    nWidth,
+                           int    nEscapement,
+                           int    nOrientation,
+                           int    fnWeight,
+                           DWORD  fdwItalic,
+                           DWORD  fdwUnderline,
+                           DWORD  fdwStrikeOut,
+                           DWORD  fdwCharSet,
+                           DWORD  fdwOutputPrecision,
+                           DWORD  fdwClipPrecision,
+                           DWORD  fdwQuality,
+                           DWORD  fdwPitchAndFamily,
+                           LPCSTR lpszFace)
 {
   CHAR  lpstrFaceNew[LF_FACESIZE];
@@ -201,19 +201,18 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG14(HFONT,  CreateFontW,
-               int,    nHeight,
-               int,    nWidth,
-               int,    nEscapement,
-               int,    nOrientation,
-               int,    fnWeight,
-               DWORD,  fdwItalic,
-               DWORD,  fdwUnderline,
-               DWORD,  fdwStrikeOut,
-               DWORD,  fdwCharSet,
-               DWORD,  fdwOutputPrecision,
-               DWORD,  fdwClipPrecision,
-               DWORD,  fdwQuality,
-               DWORD,  fdwPitchAndFamily,
-               LPCWSTR,lpszFace)
+HFONT WIN32API CreateFontW(int     nHeight,
+                           int     nWidth,
+                           int     nEscapement,
+                           int     nOrientation,
+                           int     fnWeight,
+                           DWORD   fdwItalic,
+                           DWORD   fdwUnderline,
+                           DWORD   fdwStrikeOut,
+                           DWORD   fdwCharSet,
+                           DWORD   fdwOutputPrecision,
+                           DWORD   fdwClipPrecision,
+                           DWORD   fdwQuality,
+                           DWORD   fdwPitchAndFamily,
+                           LPCWSTR lpszFace)
 {
   char *astring;
@@ -249,5 +248,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(HFONT,CreateFontIndirectA,const LOGFONTA*, lplf)
+HFONT WIN32API CreateFontIndirectA(const LOGFONTA* lplf)
 {
   HFONT    hFont;
@@ -284,5 +283,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(HFONT, CreateFontIndirectW,const LOGFONTW *, lplf)
+HFONT WIN32API CreateFontIndirectW(const LOGFONTW * lplf)
 {
   LOGFONTA afont;
@@ -433,9 +432,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(int, EnumFontsA,
-              HDC, hdc, 
-              LPCSTR, arg2, 
-              FONTENUMPROCA, arg3, 
-              LPARAM,  arg4)
+int WIN32API EnumFontsA(HDC hdc, 
+                        LPCSTR arg2, 
+                        FONTENUMPROCA arg3, 
+                        LPARAM  arg4)
 {
   //@@@PH shouldn't this rather be O32_EnumFonts ?
@@ -444,9 +442,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(int, EnumFontsW,
-              HDC, hdc, 
-              LPCWSTR, arg2,
-              FONTENUMPROCW, arg3,
-              LPARAM,  arg4)
+int WIN32API EnumFontsW(HDC hdc, 
+                        LPCWSTR arg2,
+                        FONTENUMPROCW arg3,
+                        LPARAM  arg4)
 {
   //@@@PH shouldn't this rather be O32_EnumFonts ?
@@ -455,9 +452,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(int, EnumFontFamiliesA,
-              HDC, hdc,
-              LPCSTR, lpszFontFamily,
-              FONTENUMPROCA, arg3,
-              LPARAM, arg4)
+int WIN32API EnumFontFamiliesA(HDC hdc,
+                               LPCSTR lpszFontFamily,
+                               FONTENUMPROCA arg3,
+                               LPARAM arg4)
 {
   ENUMUSERDATA enumData;
@@ -478,9 +474,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION4(int, EnumFontFamiliesW,
-              HDC, hdc,
-              LPCWSTR, lpszFontFamilyW,
-              FONTENUMPROCW, arg3,
-              LPARAM, arg4)
+int WIN32API EnumFontFamiliesW(HDC hdc,
+                               LPCWSTR lpszFontFamilyW,
+                               FONTENUMPROCW arg3,
+                               LPARAM arg4)
 {
   CHAR         lpstrFamilyNew[LF_FACESIZE] = "";
@@ -503,10 +498,9 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION5(INT, EnumFontFamiliesExA,
-              HDC, hdc, 
-              LPLOGFONTA, arg2, 
-              FONTENUMPROCEXA, arg3, 
-              LPARAM, arg4, 
-              DWORD, dwFlags)
+INT WIN32API EnumFontFamiliesExA(HDC hdc, 
+                                 LPLOGFONTA arg2, 
+                                 FONTENUMPROCEXA arg3, 
+                                 LPARAM arg4, 
+                                 DWORD dwFlags)
 {
   ENUMUSERDATA enumData;
@@ -525,10 +519,9 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION5(INT, EnumFontFamiliesExW,
-              HDC, hdc, 
-              LPLOGFONTW, arg2,
-              FONTENUMPROCEXW, arg3,
-              LPARAM, arg4, 
-              DWORD, dwFlags)
+INT WIN32API EnumFontFamiliesExW(HDC hdc, 
+                                 LPLOGFONTW arg2,
+                                 FONTENUMPROCEXW arg3,
+                                 LPARAM arg4, 
+                                 DWORD dwFlags)
 {
   ENUMUSERDATA enumData;
@@ -549,10 +542,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION5(DWORD, GetFontData,
-              HDC, hdc,
-              DWORD, dwTable,
-              DWORD, dwOffset,
-              LPVOID, lpvBuffer,
-              DWORD, dbData)
+DWORD WIN32API GetFontData(HDC hdc, DWORD dwTable,
+                           DWORD dwOffset,
+                           LPVOID lpvBuffer,
+                           DWORD dbData)
 {
   dprintf(("GDI32: GetFontData, not implemented (GDI_ERROR)\n"));
@@ -563,6 +554,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(int, AddFontResourceA,
-              LPCSTR, szFont)
+int WIN32API AddFontResourceA(LPCSTR szFont)
 {
     HINSTANCE hInstance;
@@ -579,6 +569,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(int, AddFontResourceW,
-              LPCWSTR, szFont)
+int WIN32API AddFontResourceW(LPCWSTR szFont)
 {
  char *astring = UnicodeToAsciiString((LPWSTR)szFont);
@@ -593,6 +582,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, RemoveFontResourceA,
-              LPCSTR, arg1)
+BOOL WIN32API RemoveFontResourceA(LPCSTR arg1)
 {
     dprintf(("GDI32: RemoveFontResourceA %s\n", arg1));
@@ -601,6 +589,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, RemoveFontResourceW,
-              LPCWSTR, szFont)
+BOOL WIN32API RemoveFontResourceW(LPCWSTR szFont)
 {
  char *astring = UnicodeToAsciiString((LPWSTR)szFont);
@@ -628,9 +615,8 @@
  *****************************************************************************/
 
-ODINFUNCTION4(BOOL, CreateScalableFontResourceA,
-              DWORD, fdwHidden,
-              LPCSTR, lpszFontRes,
-              LPCSTR, lpszFontFile,
-              LPCSTR, lpszCurrentPath)
+BOOL WIN32API CreateScalableFontResourceA(DWORD fdwHidden,
+                                          LPCSTR lpszFontRes,
+                                          LPCSTR lpszFontFile,
+                                          LPCSTR lpszCurrentPath)
 {
   dprintf(("GDI32: CreateScalableFontResourceA not implemented.\n"));
@@ -656,9 +642,8 @@
  *****************************************************************************/
 
-ODINFUNCTION4(BOOL, CreateScalableFontResourceW,
-              DWORD, fdwHidden,
-              LPCWSTR, lpszFontRes,
-              LPCWSTR, lpszFontFile,
-              LPCWSTR, lpszCurrentPath)
+BOOL WIN32API CreateScalableFontResourceW(DWORD fdwHidden,
+                                          LPCWSTR lpszFontRes,
+                                          LPCWSTR lpszFontFile,
+                                          LPCWSTR lpszCurrentPath)
 {
   dprintf(("GDI32: CreateScalableFontResourceW not implemented.\n"));
@@ -683,6 +668,5 @@
  *****************************************************************************/
 
-ODINFUNCTION1(DWORD, GetFontLanguageInfo,
-              HDC, hdc)
+DWORD WIN32API GetFontLanguageInfo(HDC hdc)
 {
   dprintf(("GDI32: GetFontLanguageInfo(%08xh) not implemented.\n",
@@ -714,8 +698,6 @@
  * DWORD flags  determines interpretation of lpSrc
  */
-ODINFUNCTION3(BOOL, TranslateCharsetInfo,
-              LPDWORD, lpSrc,
-              LPCHARSETINFO, lpCs,
-              DWORD, flags)
+BOOL WIN32API TranslateCharsetInfo(LPDWORD lpSrc, LPCHARSETINFO lpCs,
+                                   DWORD flags)
 {
     int index = 0;
Index: trunk/src/gdi32/gdi32.cpp
===================================================================
--- trunk/src/gdi32/gdi32.cpp	(revision 9427)
+++ trunk/src/gdi32/gdi32.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: gdi32.cpp,v 1.84 2002-11-04 13:30:36 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.85 2002-11-26 10:53:08 sandervl Exp $ */
 
 /*
@@ -39,5 +39,4 @@
 COLORREF WIN32API SetBkColor(HDC hdc, COLORREF crColor)
 {
-  dprintf(("GDI32: SetBkColor %x to %x", hdc, crColor));
   return(O32_SetBkColor(hdc, crColor));
 }
@@ -46,9 +45,5 @@
 COLORREF WIN32API SetTextColor(HDC hdc, COLORREF crColor)
 {
- COLORREF clr;
-
-  dprintf(("GDI32: SetTextColor %x to %x", hdc, crColor));
-  clr = O32_SetTextColor(hdc, crColor);
-  return(clr);
+  return O32_SetTextColor(hdc, crColor);
 }
 //******************************************************************************
@@ -77,10 +72,9 @@
                 break;
     }
-    dprintf(("GDI32: GetStockObject %d returned %X\n", arg1, obj));
     return(obj);
 }
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(HPEN, CreatePen, int, fnPenStyle, int, nWidth, COLORREF, crColor)
+HPEN WIN32API CreatePen(int fnPenStyle, int nWidth, COLORREF crColor)
 {
  HPEN hPen;
@@ -100,5 +94,4 @@
  HPEN hPen;
 
-    dprintf(("GDI32: CreatePenIndirect %x", lplgpn));
     hPen = O32_CreatePenIndirect(lplgpn);
     if(hPen) STATS_CreatePenIndirect(hPen, lplgpn);
@@ -113,5 +106,4 @@
 
     hPen = O32_ExtCreatePen(dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
-    dprintf(("GDI32: ExtCreatePen %x %x %x %x %x returned %x", dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle, hPen));
     if(hPen) STATS_ExtCreatePen(hPen, dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
     return hPen;
@@ -125,11 +117,9 @@
     hBrush = O32_CreatePatternBrush(hBitmap);
     if(hBrush) STATS_CreatePatternBrush(hBrush, hBitmap);
-
-    dprintf(("GDI32: CreatePatternBrush from bitmap %X returned %X\n", hBitmap, hBrush));
     return(hBrush);
 }
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(HBRUSH, CreateSolidBrush, COLORREF, color)
+HBRUSH WIN32API CreateSolidBrush(COLORREF color)
 {
     HBRUSH hBrush;
@@ -143,5 +133,5 @@
 HBRUSH WIN32API CreateBrushIndirect( const LOGBRUSH *pLogBrush)
 {
- HBRUSH hBrush;
+    HBRUSH hBrush;
 
     hBrush = O32_CreateBrushIndirect((LPLOGBRUSH)pLogBrush);
@@ -156,5 +146,4 @@
  HBRUSH hBrush;
  
-    dprintf(("GDI32: CreateHatchBrush %x %x", fnStyle, clrref));
     hBrush = O32_CreateHatchBrush(fnStyle, clrref);
     if(hBrush) STATS_CreateHatchBrush(hBrush, fnStyle, clrref);
@@ -167,5 +156,4 @@
  HBRUSH hBrush;
 
-    dprintf(("GDI32: CreateDIBPatternBrushPt %x %x", buffer, usage));
     hBrush = O32_CreateDIBPatternBrushPt(buffer, usage);
     if(hBrush) STATS_CreateDIBPatternBrushPt(hBrush, buffer, usage);
@@ -234,10 +222,10 @@
     //PF Open32 seems not to move coordinates to 0,0 in newHdc
     MoveToEx(newHdc, 0, 0 , NULL);
-    dprintf(("CreateCompatibleDC %X returned %x", hdc, newHdc));
+
     return newHdc;
 }
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(BOOL, DeleteDC, HDC, hdc)
+BOOL WIN32API DeleteDC(HDC hdc)
 {
   pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -270,5 +258,4 @@
 BOOL WIN32API StrokeAndFillPath(HDC hdc)
 {
-    dprintf(("GDI32: StrokeAndFillPath %x", hdc));
     return O32_StrokeAndFillPath(hdc);
 }
@@ -277,5 +264,4 @@
 BOOL WIN32API StrokePath(HDC hdc)
 {
-    dprintf(("GDI32: StrokePath %x", hdc));
     return O32_StrokePath(hdc);
 }
@@ -284,5 +270,4 @@
 int WIN32API SetBkMode( HDC hdc, int mode)
 {
-    dprintf(("GDI32: SetBkMode %x %d (old %d)", hdc, mode, O32_GetBkMode(hdc)));
     return O32_SetBkMode(hdc, mode);
 }
@@ -291,9 +276,5 @@
 COLORREF WIN32API GetPixel( HDC hdc, int x, int y)
 {
- COLORREF color;
-
-    color = O32_GetPixel(hdc, x, y);
-    dprintf2(("GDI32: GetPixel %x (%d,%d) -> %x", hdc, x, y, color));
-    return color;
+    return O32_GetPixel(hdc, x, y);
 }
 //******************************************************************************
@@ -301,5 +282,4 @@
 COLORREF WIN32API SetPixel( HDC hdc, int x, int y, COLORREF color)
 {
-    dprintf2(("GDI32: SetPixel %x (%d,%d) %x", hdc, x, y, color));
     return O32_SetPixel(hdc, x, y, color);
 }
@@ -312,5 +292,4 @@
  COLORREF rc;
 
-////    dprintf(("GDI32: SetPixelV\n"));
     rc = O32_SetPixel(arg1, arg2, arg3, arg4);
     if(rc == GDI_ERROR) // || rc == COLOR_INVALID)
@@ -326,5 +305,4 @@
         return FALSE;
     }
-    dprintf(("GDI32: GetDCOrgEx %x (%d,%d)", hdc, lpPoint));
     return O32_GetDCOrgEx(hdc, lpPoint);
 }
@@ -333,5 +311,4 @@
 BOOL WIN32API AbortPath(HDC hdc)
 {
-    dprintf(("GDI32: AbortPath %x", hdc));
     return O32_AbortPath(hdc);
 }
@@ -340,5 +317,4 @@
 BOOL WIN32API AngleArc( HDC arg1, int arg2, int arg3, DWORD arg4, float  arg5, float  arg6)
 {
-    dprintf(("GDI32: AngleArc"));
     return O32_AngleArc(arg1, arg2, arg3, arg4, arg5, arg6);
 }
@@ -347,5 +323,4 @@
 BOOL WIN32API Arc( HDC arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int  arg9)
 {
-    dprintf(("GDI32: Arc"));
     return O32_Arc(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 }
@@ -354,5 +329,4 @@
 BOOL WIN32API ArcTo( HDC arg1, int arg2, int arg3, int arg4, int arg5, int  arg6, int  arg7, int  arg8, int  arg9)
 {
-    dprintf(("GDI32: ArcTo"));
     return O32_ArcTo(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 }
@@ -361,5 +335,4 @@
 BOOL WIN32API BeginPath(HDC hdc)
 {
-    dprintf(("GDI32: BeginPath $x", hdc));
     return O32_BeginPath(hdc);
 }
@@ -368,5 +341,4 @@
 BOOL WIN32API Chord( HDC arg1, int arg2, int arg3, int arg4, int arg5, int  arg6, int  arg7, int  arg8, int  arg9)
 {
-    dprintf(("GDI32: Chord"));
     return O32_Chord(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 }
@@ -375,5 +347,4 @@
 BOOL WIN32API CloseFigure(HDC hdc)
 {
-    dprintf(("GDI32: CloseFigure %x", hdc));
     return O32_CloseFigure(hdc);
 }
@@ -423,6 +394,4 @@
     HDC   rc;
     DEVMODEA devmode;
-
-    dprintf(("GDI32: CreateDCW"));
 
     if(arg4)
@@ -486,5 +455,4 @@
  HDC          hdc;
 
-    dprintf(("GDI32: CreateICA"));
     //SvL: Open32 tests for "DISPLAY"
     if(lpszDriver && !strcmp(lpszDriver, "display")) {
@@ -516,6 +484,4 @@
     HDC   rc;
     DEVMODEA devmode;
-
-    dprintf(("GDI32: CreateICW"));
 
     if(arg4)
@@ -583,10 +549,9 @@
 BOOL WIN32API EndPath( HDC hdc)
 {
-    dprintf(("GDI32: EndPath %x", hdc));
     return O32_EndPath(hdc);
 }
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION5(BOOL, Rectangle, HDC, hdc, int, left, int, top, int, right, int, bottom)
+BOOL WIN32API Rectangle(HDC hdc, int left, int top, int right, int bottom)
 {
     return O32_Rectangle(hdc, left, top, right, bottom);
@@ -594,4 +559,5 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef DEBUG
 VOID dumpROP2(INT rop2)
 {
@@ -660,4 +626,8 @@
       break;
 
+    case R2_NOTXORPEN:
+      name = "R2_NOTXORPEN";
+      break;
+
     default:
       name = "unknown mode!!!";
@@ -667,9 +637,9 @@
   dprintf(("  ROP2 mode = %s",name));
 }
+#endif
 //******************************************************************************
 //******************************************************************************
 int WIN32API SetROP2( HDC hdc, int rop2)
 {
-    dprintf(("GDI32: SetROP2 %x %x", hdc, rop2));
     #ifdef DEBUG
     dumpROP2(rop2);
@@ -695,5 +665,4 @@
 BOOL WIN32API ExtFloodFill( HDC arg1, int arg2, int arg3, COLORREF arg4, UINT  arg5)
 {
-    dprintf(("GDI32: ExtFloodFill"));
     return O32_ExtFloodFill(arg1, arg2, arg3, arg4, arg5);
 }
@@ -702,5 +671,4 @@
 BOOL WIN32API FillPath( HDC arg1)
 {
-    dprintf(("GDI32: FillPath"));
     return O32_FillPath(arg1);
 }
@@ -709,5 +677,4 @@
 BOOL WIN32API FlattenPath( HDC arg1)
 {
-    dprintf(("GDI32: FlattenPath"));
     return O32_FlattenPath(arg1);
 }
@@ -716,5 +683,4 @@
 BOOL WIN32API FloodFill(HDC arg1, int arg2, int arg3, COLORREF  arg4)
 {
-    dprintf(("GDI32: FloodFill"));
     return O32_FloodFill(arg1, arg2, arg3, arg4);
 }
@@ -723,5 +689,4 @@
 int WIN32API GetArcDirection( HDC arg1)
 {
-    dprintf(("GDI32: GetArcDirection"));
     return O32_GetArcDirection(arg1);
 }
@@ -730,5 +695,4 @@
 BOOL WIN32API GetAspectRatioFilterEx( HDC arg1, PSIZE  arg2)
 {
-    dprintf(("GDI32: GetAspectRatioFilterEx"));
     return O32_GetAspectRatioFilterEx(arg1, arg2);
 }
@@ -737,9 +701,5 @@
 COLORREF WIN32API GetBkColor(HDC hdc)
 {
- COLORREF color;
-
-    color = O32_GetBkColor(hdc);
-    dprintf(("GDI32: GetBkColor %x returned %x", hdc, color));
-    return color;
+    return O32_GetBkColor(hdc);
 }
 //******************************************************************************
@@ -747,9 +707,5 @@
 int WIN32API GetBkMode(HDC hdc)
 {
- int bkmode;
-
-    bkmode = O32_GetBkMode(hdc);
-    dprintf(("GDI32: GetBkMode %x returned %d", hdc, bkmode));
-    return bkmode;
+    return O32_GetBkMode(hdc);
 }
 //******************************************************************************
@@ -757,5 +713,4 @@
 UINT WIN32API GetBoundsRect( HDC arg1, PRECT arg2, UINT  arg3)
 {
-    dprintf(("GDI32: GetBoundsRect"));
     return O32_GetBoundsRect(arg1, arg2, arg3);
 }
@@ -764,5 +719,4 @@
 BOOL WIN32API GetBrushOrgEx( HDC arg1, PPOINT  arg2)
 {
-    dprintf(("GDI32: GetBrushOrgEx"));
     return O32_GetBrushOrgEx(arg1, arg2);
 }
@@ -771,5 +725,4 @@
 BOOL WIN32API GetCharABCWidthsA( HDC arg1, UINT arg2, UINT arg3, LPABC arg4)
 {
-    dprintf(("GDI32: GetCharABCWidthsA"));
     return O32_GetCharABCWidths(arg1, arg2, arg3, arg4);
 }
@@ -817,5 +770,4 @@
  BOOL rc;
 
-    dprintf(("GDI32: GetCurrentPositionEx %x", hdc));
     rc = O32_GetCurrentPositionEx(hdc, lpPoint);
     dprintf(("GDI32: GetCurrentPositionEx returned %d (%d,%d)", rc, lpPoint->x, lpPoint->y));
@@ -840,5 +792,4 @@
 DWORD WIN32API GetKerningPairsA( HDC arg1, DWORD arg2, LPKERNINGPAIR  arg3)
 {
-    dprintf(("GDI32: GetKerningPairsA"));
     return O32_GetKerningPairs(arg1, arg2, arg3);
 }
@@ -847,5 +798,5 @@
 DWORD WIN32API GetKerningPairsW( HDC arg1, DWORD arg2, LPKERNINGPAIR  arg3)
 {
-    dprintf(("GDI32: GetKerningPairsW"));
+    dprintf(("GDI32: GetKerningPairsW; might not work"));
     // NOTE: This will not work as is (needs UNICODE support)
     return O32_GetKerningPairs(arg1, arg2, arg3);
@@ -855,5 +806,4 @@
 BOOL WIN32API GetMiterLimit( HDC arg1, float * arg2)
 {
-    dprintf(("GDI32: GetMiterLimit"));
     return O32_GetMiterLimit(arg1, arg2);
 }
@@ -862,5 +812,4 @@
 COLORREF WIN32API GetNearestColor( HDC arg1, COLORREF  arg2)
 {
-    dprintf(("GDI32: GetNearestColor\n"));
     return O32_GetNearestColor(arg1, arg2);
 }
@@ -869,5 +818,4 @@
 INT WIN32API GetPath( HDC hdc, PPOINT arg2, PBYTE arg3, int  arg4)
 {
-    dprintf(("GDI32: GetPath %x", hdc));
     return O32_GetPath(hdc, arg2, arg3, arg4);
 }
@@ -876,5 +824,4 @@
 int WIN32API GetPolyFillMode( HDC hdc)
 {
-    dprintf(("GDI32: GetPolyFillMode", hdc));
     return O32_GetPolyFillMode(hdc);
 }
@@ -883,5 +830,4 @@
 int WIN32API GetROP2( HDC hdc)
 {
-    dprintf(("GDI32: GetROP2 %x", hdc));
     return O32_GetROP2(hdc);
 }
@@ -890,5 +836,4 @@
 BOOL WIN32API GetRasterizerCaps(LPRASTERIZER_STATUS arg1, UINT  arg2)
 {
-    dprintf(("GDI32: GetRasterizerCaps"));
     return O32_GetRasterizerCaps(arg1, arg2);
 }
@@ -897,5 +842,4 @@
 UINT WIN32API GetTextAlign( HDC hdc)
 {
-    dprintf(("GDI32: GetTextAlign %x", hdc));
     return O32_GetTextAlign(hdc);
 }
@@ -904,5 +848,4 @@
 int WIN32API GetTextCharacterExtra( HDC hdc)
 {
-    dprintf(("GDI32: GetTextCharacterExtra", hdc));
     return O32_GetTextCharacterExtra(hdc);
 }
@@ -911,9 +854,5 @@
 COLORREF WIN32API GetTextColor( HDC hdc)
 {
-    COLORREF color;
-
-    color = O32_GetTextColor(hdc);
-    dprintf(("GDI32: GetTextColor %x -> %x", hdc, color));
-    return color;
+    return O32_GetTextColor(hdc);
 }
 //******************************************************************************
@@ -936,5 +875,4 @@
 BOOL WIN32API PolyBezier( HDC arg1, const POINT * arg2, DWORD  arg3)
 {
-    dprintf(("GDI32: PolyBezier"));
     return O32_PolyBezier(arg1, arg2, (int)arg3);
 }
@@ -943,5 +881,4 @@
 BOOL WIN32API PolyBezierTo( HDC arg1, const POINT * arg2, DWORD  arg3)
 {
-    dprintf(("GDI32: PolyBezierTo"));
     return O32_PolyBezierTo(arg1, arg2, arg3);
 }
@@ -950,5 +887,4 @@
 BOOL WIN32API PolyDraw( HDC arg1, const POINT * arg2, const BYTE * arg3, DWORD  arg4)
 {
-    dprintf(("GDI32: PolyDraw"));
     return O32_PolyDraw(arg1, arg2, arg3, arg4);
 }
@@ -957,5 +893,4 @@
 BOOL WIN32API PolyPolygon( HDC arg1, const POINT * arg2, const INT * arg3, UINT  arg4)
 {
-    dprintf(("GDI32: PolyPolygon"));
     return O32_PolyPolygon(arg1, arg2, arg3, arg4);
 }
@@ -964,6 +899,4 @@
 BOOL WIN32API PolyPolyline( HDC hdc, const POINT * lppt, const DWORD * lpdwPolyPoints, DWORD cCount)
 {
-    dprintf(("GDI32: PolyPolyline %x %x %x %d", hdc, lppt, lpdwPolyPoints, cCount));
-
     return O32_PolyPolyline(hdc,lppt,lpdwPolyPoints,cCount);
 }
@@ -972,5 +905,4 @@
 BOOL WIN32API Polygon( HDC hdc, const POINT *lpPoints, int count)
 {
-    dprintf(("GDI32: Polygon %x %x %d", hdc, lpPoints, count));
     return O32_Polygon(hdc, lpPoints, count);
 }
@@ -997,5 +929,4 @@
 HDC WIN32API ResetDCA( HDC arg1, const DEVMODEA *  arg2)
 {
-    dprintf(("GDI32: ResetDCA\n"));
     return (HDC)O32_ResetDC(arg1, arg2);
 }
@@ -1004,5 +935,6 @@
 HDC WIN32API ResetDCW( HDC arg1, const DEVMODEW *  arg2)
 {
-    dprintf(("GDI32: ResetDCW\n"));
+    dprintf(("GDI32: ResetDCW: not properly implemented"));
+    DebugInt3();
     // NOTE: This will not work as is (needs UNICODE support)
     return (HDC)O32_ResetDC(arg1, (const DEVMODEA *)arg2);
@@ -1013,6 +945,4 @@
 {
  BOOL ret;
-
-    dprintf(("GDI32: RestoreDC %x %d", hdc, id));
 
     ret = O32_RestoreDC(hdc, id);
@@ -1026,5 +956,4 @@
 BOOL WIN32API RoundRect( HDC arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int  arg7)
 {
-    dprintf(("GDI32: RoundRect"));
     return O32_RoundRect(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
@@ -1035,5 +964,4 @@
  int id;
 
-    dprintf(("GDI32: SaveDC %x", hdc));
     id = O32_SaveDC(hdc);
     if(id == 0) {
@@ -1047,5 +975,4 @@
 int WIN32API SetArcDirection( HDC arg1, int  arg2)
 {
-    dprintf(("GDI32: SetArcDirection"));
     return O32_SetArcDirection(arg1, arg2);
 }
@@ -1054,5 +981,4 @@
 UINT WIN32API SetBoundsRect( HDC arg1, const RECT * arg2, UINT arg3)
 {
-    dprintf(("GDI32: SetBoundsRect"));
     return O32_SetBoundsRect(arg1, arg2, arg3);
 }
@@ -1061,13 +987,9 @@
 BOOL WIN32API SetBrushOrgEx( HDC arg1, int arg2, int arg3, PPOINT  arg4)
 {
- BOOL rc;
-
-    rc = O32_SetBrushOrgEx(arg1, arg2, arg3, arg4);
-    dprintf(("GDI32: SetBrushOrgEx returned %d\n", rc));
-    return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTION2(DWORD, SetMapperFlags, HDC, hdc, DWORD, dwFlag)
+    return O32_SetBrushOrgEx(arg1, arg2, arg3, arg4);
+}
+//******************************************************************************
+//******************************************************************************
+DWORD WIN32API SetMapperFlags(HDC hdc, DWORD dwFlag)
 {
     return O32_SetMapperFlags(hdc, dwFlag);
@@ -1075,5 +997,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(BOOL, SetMiterLimit, HDC, hdc, float, eNewLimit, float* ,peOldLimit)
+BOOL WIN32API SetMiterLimit(HDC hdc, float eNewLimit, float* peOldLimit)
 {
     return O32_SetMiterLimit(hdc, eNewLimit, peOldLimit);
@@ -1081,5 +1003,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(int, SetPolyFillMode, HDC, hdc, int, iPolyFillMode)
+int WIN32API SetPolyFillMode(HDC hdc, int iPolyFillMode)
 {
     return O32_SetPolyFillMode(hdc, iPolyFillMode);
@@ -1087,5 +1009,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(UINT, SetTextAlign, HDC, hdc, UINT, fMode)
+UINT WIN32API SetTextAlign(HDC hdc, UINT fMode)
 {
     return O32_SetTextAlign(hdc, fMode);
@@ -1093,5 +1015,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(int, SetTextCharacterExtra, HDC, hdc, int, nCharExtra)
+int WIN32API SetTextCharacterExtra(HDC hdc, int nCharExtra)
 {
     return O32_SetTextCharacterExtra(hdc, nCharExtra);
@@ -1099,5 +1021,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION3(BOOL, SetTextJustification, HDC, hdc, int, nBreakExtra, int, nBreakCount)
+BOOL WIN32API SetTextJustification(HDC hdc, int nBreakExtra, int nBreakCount)
 {
     return O32_SetTextJustification(hdc, nBreakExtra, nBreakCount);
@@ -1107,5 +1029,4 @@
 BOOL WIN32API WidenPath( HDC hdc)
 {
-    dprintf(("GDI32: WidenPath %x", hdc));
     return O32_WidenPath(hdc);
 }
@@ -1136,5 +1057,4 @@
 BOOL WIN32API UpdateColors(HDC hdc)
 {
-  dprintf(("GDI32: UpdateColors\n"));
   return InvalidateRect(WindowFromDC(hdc), NULL, FALSE);
 }
@@ -1321,5 +1241,4 @@
   return (FALSE);
 }
-
 
 /*****************************************************************************
Index: trunk/src/gdi32/gdi32dbg.def
===================================================================
--- trunk/src/gdi32/gdi32dbg.def	(revision 9429)
+++ trunk/src/gdi32/gdi32dbg.def	(revision 9429)
@@ -0,0 +1,375 @@
+; $Id: gdi32dbg.def,v 1.1 2002-11-26 10:53:09 sandervl Exp $
+
+;Created by BLAST for IBM's compiler
+LIBRARY GDI32 INITINSTANCE
+DATA MULTIPLE NONSHARED
+
+IMPORTS
+    _GpiQueryTabbedTextExtent  = PMGPI.658
+    _GpiTabbedCharStringAt     = PMGPI.659
+;;;; Present in WGSS50
+;;;;    _GpiQueryDCData            = PMGPI.665
+    _PaxStrokeAndFillPath      = PMGPI.712
+    _GpiEnableYInversion       = PMGPI.723
+    _GpiQueryYInversion        = PMGPI.726
+    WinDrawTabbedText          = PMMERGE.5432
+
+EXPORTS
+    _GDI_CallDevInstall16@20                                 @100
+    _GDI_CallExtDeviceModePropSheet16@16                     @101
+    _GDI_CallExtDeviceMode16@28                              @102
+    _GDI_CallAdvancedSetupDialog16@16                        @103
+    _GDI_CallDeviceCapabilities16@20                         @104
+
+    AbortDoc                   = _DbgAbortDoc@4                 @105
+    AbortPath                  = _DbgAbortPath@4                @106
+    AddFontResourceA           = _DbgAddFontResourceA@4         @107
+    AddFontResourceW           = _DbgAddFontResourceW@4         @108
+    AngleArc                   = _DbgAngleArc@24                @109
+    AnimatePalette             = _DbgAnimatePalette@16          @110
+    Arc                        = _DbgArc@36                     @111
+    ArcTo                      = _DbgArcTo@36                   @112
+    BeginPath                  = _DbgBeginPath@4                @113
+    BitBlt                     = _DbgBitBlt@36                  @114
+;    ByeByeGDI                  = _DbgByeByeGDI@??               @115
+    CancelDC                   = _DbgCancelDC@4                 @116
+    CheckColorsInGamut         = _DbgCheckColorsInGamut@16      @117
+    ChoosePixelFormat          = _DbgChoosePixelFormat@8        @118
+    Chord                      = _DbgChord@36                   @119
+    CloseEnhMetaFile           = _DbgCloseEnhMetaFile@4         @120
+    CloseFigure                = _DbgCloseFigure@4              @121
+    CloseMetaFile              = _DbgCloseMetaFile@4            @122
+    ColorMatchToTarget         = _DbgColorMatchToTarget@12      @123
+    CombineRgn                 = _DbgCombineRgn@16              @124
+    CombineTransform           = _DbgCombineTransform@12        @125
+    CopyEnhMetaFileA           = _DbgCopyEnhMetaFileA@8         @126
+    CopyEnhMetaFileW           = _DbgCopyEnhMetaFileW@8         @127
+    CopyMetaFileA              = _DbgCopyMetaFileA@8            @128
+    CopyMetaFileW              = _DbgCopyMetaFileW@8            @129
+    CreateBitmap               = _DbgCreateBitmap@20            @130
+    CreateBitmapIndirect       = _DbgCreateBitmapIndirect@4     @131
+    CreateBrushIndirect        = _DbgCreateBrushIndirect@4      @132
+    CreateColorSpaceA          = _DbgCreateColorSpaceA@4        @133
+    CreateColorSpaceW          = _DbgCreateColorSpaceW@4        @134
+    CreateCompatibleBitmap     = _DbgCreateCompatibleBitmap@12  @135
+    CreateCompatibleDC         = _DbgCreateCompatibleDC@4       @136
+    CreateDCA                  = _DbgCreateDCA@16               @137
+    CreateDCW                  = _DbgCreateDCW@16               @138
+    CreateDIBPatternBrush      = _DbgCreateDIBPatternBrush@8    @139
+    CreateDIBPatternBrushPt    = _DbgCreateDIBPatternBrushPt@8  @140
+    CreateDIBSection           = _DbgCreateDIBSection@24        @141
+    CreateDIBitmap             = _DbgCreateDIBitmap@24          @142
+    CreateDiscardableBitmap    = _DbgCreateDiscardableBitmap@12 @143
+    CreateEllipticRgn          = _DbgCreateEllipticRgn@16       @144
+    CreateEllipticRgnIndirect  = _DbgCreateEllipticRgnIndirect@4 @145
+    CreateEnhMetaFileA         = _DbgCreateEnhMetaFileA@16      @146
+    CreateEnhMetaFileW         = _DbgCreateEnhMetaFileW@16      @147
+    CreateFontA                = _DbgCreateFontA@56             @148
+    CreateFontIndirectA        = _DbgCreateFontIndirectA@4      @149
+    CreateFontIndirectW        = _DbgCreateFontIndirectW@4      @150
+    CreateFontW                = _DbgCreateFontW@56             @151
+    CreateHalftonePalette      = _DbgCreateHalftonePalette@4    @152
+    CreateHatchBrush           = _DbgCreateHatchBrush@8         @153
+    CreateICA                  = _DbgCreateICA@16               @154
+    CreateICW                  = _DbgCreateICW@16               @155
+    CreateMetaFileA            = _DbgCreateMetaFileA@4          @156
+    CreateMetaFileW            = _DbgCreateMetaFileW@4          @157
+    CreatePalette              = _DbgCreatePalette@4            @158
+    CreatePatternBrush         = _DbgCreatePatternBrush@4       @159
+    CreatePen                  = _DbgCreatePen@12               @160
+    CreatePenIndirect          = _DbgCreatePenIndirect@4        @161
+    CreatePolyPolygonRgn       = _DbgCreatePolyPolygonRgn@16    @162
+    CreatePolygonRgn           = _DbgCreatePolygonRgn@12        @163
+    CreateRectRgn              = _DbgCreateRectRgn@16           @164
+    CreateRectRgnIndirect      = _DbgCreateRectRgnIndirect@4    @165
+    CreateRoundRectRgn         = _DbgCreateRoundRectRgn@24      @166
+    CreateScalableFontResourceA  = _DbgCreateScalableFontResourceA@16 @167
+    CreateScalableFontResourceW  = _DbgCreateScalableFontResourceW@16 @168
+    CreateSolidBrush           = _DbgCreateSolidBrush@4         @169
+    DPtoLP                     = _DbgDPtoLP@12                  @170
+    DeleteColorSpace           = _DbgDeleteColorSpace@4         @171
+    DeleteDC                   = _DbgDeleteDC@4                 @172
+    DeleteEnhMetaFile          = _DbgDeleteEnhMetaFile@4        @173
+    DeleteMetaFile             = _DbgDeleteMetaFile@4           @174
+    DeleteObject               = _DbgDeleteObject@4             @175
+    DescribePixelFormat        = _DbgDescribePixelFormat@16     @176
+;    DeviceCapabilitiesEx       = _DbgDeviceCapabilitiesEx@??    @177
+;    DeviceCapabilitiesExA      = _DbgDeviceCapabilitiesExA@??   @178
+;    DeviceCapabilitiesExW      = _DbgDeviceCapabilitiesExW@??   @179
+    DrawEscape                 = _DbgDrawEscape@16              @180
+    Ellipse                    = _DbgEllipse@20                 @181
+    EndDoc                     = _DbgEndDoc@4                   @182
+    EndPage                    = _DbgEndPage@4                  @183
+    EndPath                    = _DbgEndPath@4                  @184
+    EnumEnhMetaFile            = _DbgEnumEnhMetaFile@20         @185
+    EnumFontFamiliesA          = _DbgEnumFontFamiliesA@16       @186
+    EnumFontFamiliesExA        = _DbgEnumFontFamiliesExA@20     @187
+    EnumFontFamiliesExW        = _DbgEnumFontFamiliesExW@20     @188
+    EnumFontFamiliesW          = _DbgEnumFontFamiliesW@16       @189
+    EnumFontsA                 = _DbgEnumFontsA@16              @190
+    EnumFontsW                 = _DbgEnumFontsW@16              @191
+    EnumICMProfilesA           = _DbgEnumICMProfilesA@12        @192
+    EnumICMProfilesW           = _DbgEnumICMProfilesW@12        @193
+    EnumMetaFile               = _DbgEnumMetaFile@16            @194
+    EnumObjects                = _DbgEnumObjects@16             @195
+    EqualRgn                   = _DbgEqualRgn@8                 @196
+    Escape                     = _DbgEscape@20                  @197
+    ExcludeClipRect            = _DbgExcludeClipRect@20         @198
+    ExtCreatePen               = _DbgExtCreatePen@20            @199
+    ExtCreateRegion            = _DbgExtCreateRegion@12         @200
+    ExtEscape                  = _DbgExtEscape@24               @201
+    ExtFloodFill               = _DbgExtFloodFill@20            @202
+    ExtSelectClipRgn           = _DbgExtSelectClipRgn@12        @203
+    ExtTextOutA                = _DbgExtTextOutA@32             @204
+    ExtTextOutW                = _DbgExtTextOutW@32             @205
+    FillPath                   = _DbgFillPath@4                 @206
+    FillRgn                    = _DbgFillRgn@12                 @207
+    FixBrushOrgEx              = _DbgFixBrushOrgEx@16           @208
+    FlattenPath                = _DbgFlattenPath@4              @209
+    FloodFill                  = _DbgFloodFill@16               @210
+    FrameRgn                   = _DbgFrameRgn@20                @211
+    GdiComment                 = _DbgGdiComment@12              @212
+    GdiFlush                   = _DbgGdiFlush@0                 @213
+    GdiGetBatchLimit           = _DbgGdiGetBatchLimit@0         @214
+;    GdiPlayDCScript            = _DbgGdiPlayDCScript@??         @215
+;    GdiPlayJournal             = _DbgGdiPlayJournal@??          @216
+;    GdiPlayScript              = _DbgGdiPlayScript@??           @217
+    GdiSetBatchLimit           = _DbgGdiSetBatchLimit@4         @218
+    GetArcDirection            = _DbgGetArcDirection@4          @219
+    GetAspectRatioFilterEx     = _DbgGetAspectRatioFilterEx@8   @220
+    GetBitmapBits              = _DbgGetBitmapBits@12           @221
+    GetBitmapDimensionEx       = _DbgGetBitmapDimensionEx@8     @222
+    GetBkColor                 = _DbgGetBkColor@4               @223
+    GetBkMode                  = _DbgGetBkMode@4                @224
+    GetBoundsRect              = _DbgGetBoundsRect@12           @225
+    GetBrushOrgEx              = _DbgGetBrushOrgEx@8            @226
+    GetCharABCWidthsA          = _DbgGetCharABCWidthsA@16       @227
+    GetCharABCWidthsFloatA     = _DbgGetCharABCWidthsFloatA@16  @228
+    GetCharABCWidthsFloatW     = _DbgGetCharABCWidthsFloatW@16 @229
+    GetCharABCWidthsW          = _DbgGetCharABCWidthsW@16       @230
+    GetCharWidth32A            = _DbgGetCharWidth32A@16         @231
+    GetCharWidth32W            = _DbgGetCharWidth32W@16         @232
+    GetCharWidthA              = _DbgGetCharWidth32A@16         @233
+    GetCharWidthFloatA         = _DbgGetCharWidthFloatA@16      @234
+    GetCharWidthFloatW         = _DbgGetCharWidthFloatW@16      @235
+    GetCharWidthW              = _DbgGetCharWidth32W@16         @236
+    GetCharacterPlacementA     = _DbgGetCharacterPlacementA@24  @237
+    GetCharacterPlacementW     = _DbgGetCharacterPlacementW@24  @238
+    GetClipBox                 = _DbgGetClipBox@8               @239
+    GetClipRgn                 = _DbgGetClipRgn@8               @240
+    GetColorAdjustment         = _DbgGetColorAdjustment@8       @241
+    GetColorSpace              = _DbgGetColorSpace@4            @242
+    GetCurrentObject           = _DbgGetCurrentObject@8         @243
+    GetCurrentPositionEx       = _DbgGetCurrentPositionEx@8     @244
+    GetDCOrgEx                 = _DbgGetDCOrgEx@8               @245
+    GetDIBColorTable           = _DbgGetDIBColorTable@16        @246
+    GetDIBits                  = _DbgGetDIBits@28               @247
+    GetDeviceCaps              = _DbgGetDeviceCaps@8            @248
+    GetDeviceGammaRamp         = _DbgGetDeviceGammaRamp@8       @249
+    GetEnhMetaFileA            = _DbgGetEnhMetaFileA@4          @250
+    GetEnhMetaFileBits         = _DbgGetEnhMetaFileBits@12       @251
+    GetEnhMetaFileDescriptionA  = _DbgGetEnhMetaFileDescriptionA@12 @252
+    GetEnhMetaFileDescriptionW  = _DbgGetEnhMetaFileDescriptionW@12 @253
+    GetEnhMetaFileHeader       = _DbgGetEnhMetaFileHeader@12    @254
+    GetEnhMetaFilePaletteEntries  = _DbgGetEnhMetaFilePaletteEntries@12 @255
+    GetEnhMetaFileW            = _DbgGetEnhMetaFileW@4          @256
+    GetFontData                = _DbgGetFontData@20             @257
+    GetFontLanguageInfo        = _DbgGetFontLanguageInfo@4      @258
+;    GetFontResourceInfo        = _DbgGetFontResourceInfo@??     @259
+    GetGlyphOutline            = _DbgGetGlyphOutlineA@28        @260
+    GetGlyphOutlineA           = _DbgGetGlyphOutlineA@28        @261
+    GetGlyphOutlineW           = _DbgGetGlyphOutlineW@28        @262
+    GetGraphicsMode            = _DbgGetGraphicsMode@4          @263
+    GetICMProfileA             = _DbgGetICMProfileA@12          @264
+    GetICMProfileW             = _DbgGetICMProfileW@12          @265
+    GetKerningPairs            = _DbgGetKerningPairsA@12        @266
+    GetKerningPairsA           = _DbgGetKerningPairsA@12        @267
+    GetKerningPairsW           = _DbgGetKerningPairsW@12        @268
+    GetLogColorSpaceA          = _DbgGetLogColorSpaceA@12       @269
+    GetLogColorSpaceW          = _DbgGetLogColorSpaceW@12       @270
+    GetMapMode                 = _DbgGetMapMode@4               @271
+    GetMetaFileA               = _DbgGetMetaFileA@4             @272
+    GetMetaFileBitsEx          = _DbgGetMetaFileBitsEx@12       @273
+    GetMetaFileW               = _DbgGetMetaFileW@4             @274
+    GetMetaRgn                 = _DbgGetMetaRgn@8               @275
+    GetMiterLimit              = _DbgGetMiterLimit@8            @276
+    GetNearestColor            = _DbgGetNearestColor@8          @277
+    GetNearestPaletteIndex     = _DbgGetNearestPaletteIndex@8   @278
+    GetObjectA                 = _DbgGetObjectA@12              @279
+    GetObjectType              = _DbgGetObjectType@4            @280
+    GetObjectW                 = _DbgGetObjectW@12              @281
+    GetOutlineTextMetricsA     = _DbgGetOutlineTextMetricsA@12  @282
+    GetOutlineTextMetricsW     = _DbgGetOutlineTextMetricsW@12  @283
+    GetPaletteEntries          = _DbgGetPaletteEntries@16       @284
+    GetPath                    = _DbgGetPath@16                 @285
+    GetPixel                   = _DbgGetPixel@12                @286
+    GetPixelFormat             = _DbgGetPixelFormat@4           @287
+    GetPolyFillMode            = _DbgGetPolyFillMode@4          @288
+    GetROP2                    = _DbgGetROP2@4                  @289
+;    GetRandomRgn               = _DbgGetRandomRgn@??            @290
+    GetRasterizerCaps          = _DbgGetRasterizerCaps@8        @291
+    GetRegionData              = _DbgGetRegionData@12           @292
+    GetRgnBox                  = _DbgGetRgnBox@8                @293
+    GetStockObject             = _DbgGetStockObject@4           @294
+    GetStretchBltMode          = _DbgGetStretchBltMode@4        @295
+    GetSystemPaletteEntries    = _DbgGetSystemPaletteEntries@16 @296
+    GetSystemPaletteUse        = _DbgGetSystemPaletteUse@4      @297
+    GetTextAlign               = _DbgGetTextAlign@4             @298
+    GetTextCharacterExtra      = _DbgGetTextCharacterExtra@4    @299
+    GetTextCharset             = _DbgGetTextCharset@4           @300
+    GetTextCharsetInfo         = _DbgGetTextCharsetInfo@12      @301
+    GetTextColor               = _DbgGetTextColor@4             @302
+    GetTextExtentExPointA      = _DbgGetTextExtentExPointA@28   @303
+    GetTextExtentExPointW      = _DbgGetTextExtentExPointW@28   @304
+    GetTextExtentPoint32A      = _DbgGetTextExtentPoint32A@16   @305
+    GetTextExtentPoint32W      = _DbgGetTextExtentPoint32W@16   @306
+    GetTextExtentPointA        = _DbgGetTextExtentPointA@16     @307
+    GetTextExtentPointW        = _DbgGetTextExtentPointW@16     @308
+    GetTextFaceA               = _DbgGetTextFaceA@12            @309
+    GetTextFaceW               = _DbgGetTextFaceW@12            @310
+    GetTextMetricsA            = _DbgGetTextMetricsA@8          @311
+    GetTextMetricsW            = _DbgGetTextMetricsW@8          @312
+    GetViewportExtEx           = _DbgGetViewportExtEx@8         @313
+    GetViewportOrgEx           = _DbgGetViewportOrgEx@8         @314
+    GetWinMetaFileBits         = _DbgGetWinMetaFileBits@20      @315
+    GetWindowExtEx             = _DbgGetWindowExtEx@8           @316
+    GetWindowOrgEx             = _DbgGetWindowOrgEx@8          @317
+    GetWorldTransform          = _DbgGetWorldTransform@8        @318
+    IntersectClipRect          = _DbgIntersectClipRect@20       @319
+    InvertRgn                  = _DbgInvertRgn@8                @320
+    LPtoDP                     = _DbgLPtoDP@12                  @321
+    LineDDA                    = _DbgLineDDA@24                 @322
+    LineTo                     = _DbgLineTo@12                  @323
+    MaskBlt                    = _DbgMaskBlt@48                 @324
+    ModifyWorldTransform       = _DbgModifyWorldTransform@12    @325
+    MoveToEx                   = _DbgMoveToEx@16                @326
+    OffsetClipRgn              = _DbgOffsetClipRgn@12           @327
+    OffsetRgn                  = _DbgOffsetRgn@12               @328
+    OffsetViewportOrgEx        = _DbgOffsetViewportOrgEx@16     @329
+    OffsetWindowOrgEx          = _DbgOffsetWindowOrgEx@16       @330
+    PaintRgn                   = _DbgPaintRgn@8                 @331
+    PatBlt                     = _DbgPatBlt@24                  @332
+    PathToRegion               = _DbgPathToRegion@4             @333
+    Pie                        = _DbgPie@36                     @334
+    PlayEnhMetaFile            = _DbgPlayEnhMetaFile@12         @335
+    PlayEnhMetaFileRecord      = _DbgPlayEnhMetaFileRecord@16   @336
+    PlayMetaFile               = _DbgPlayMetaFile@8             @337
+    PlayMetaFileRecord         = _DbgPlayMetaFileRecord@16      @338
+    PlgBlt                     = _DbgPlgBlt@40                  @339
+    PolyBezier                 = _DbgPolyBezier@12              @340
+    PolyBezierTo               = _DbgPolyBezierTo@12            @341
+    PolyDraw                   = _DbgPolyDraw@16                @342
+    PolyPolygon                = _DbgPolyPolygon@16             @343
+    PolyPolyline               = _DbgPolyPolyline@16            @344
+    PolyTextOutA               = _DbgPolyTextOutA@12            @345
+    PolyTextOutW               = _DbgPolyTextOutW@12            @346
+    Polygon                    = _DbgPolygon@12                 @347
+    Polyline                   = _DbgPolyline@12                @348
+    PolylineTo                 = _DbgPolylineTo@12              @349
+    PtInRegion                 = _DbgPtInRegion@12              @350
+    PtVisible                  = _DbgPtVisible@12               @351
+    RealizePalette             = _DbgRealizePalette@4           @352
+    RectInRegion               = _DbgRectInRegion@8             @353
+    RectVisible                = _DbgRectVisible@8              @354
+    Rectangle                  = _DbgRectangle@20               @355
+    RemoveFontResourceA        = _DbgRemoveFontResourceA@4      @356
+    RemoveFontResourceW        = _DbgRemoveFontResourceW@4      @357
+    ResetDCA                   = _DbgResetDCA@8                 @358
+    ResetDCW                   = _DbgResetDCW@8                 @359
+    ResizePalette              = _DbgResizePalette@8            @360
+    RestoreDC                  = _DbgRestoreDC@8                @361
+    RoundRect                  = _DbgRoundRect@28               @362
+    SaveDC                     = _DbgSaveDC@4                   @363
+    ScaleViewportExtEx         = _DbgScaleViewportExtEx@24      @364
+    ScaleWindowExtEx           = _DbgScaleWindowExtEx@24        @365
+    SelectClipPath             = _DbgSelectClipPath@8           @366
+    SelectClipRgn              = _DbgSelectClipRgn@8            @367
+    SelectObject               = _DbgSelectObject@8             @368
+    SelectPalette              = _DbgSelectPalette@12           @369
+    SetAbortProc               = _DbgSetAbortProc@8             @370
+    SetArcDirection            = _DbgSetArcDirection@8          @371
+    SetBitmapBits              = _DbgSetBitmapBits@12           @372
+    SetBitmapDimensionEx       = _DbgSetBitmapDimensionEx@16    @373
+    SetBkColor                 = _DbgSetBkColor@8               @374
+    SetBkMode                  = _DbgSetBkMode@8                @375
+    SetBoundsRect              = _DbgSetBoundsRect@12           @376
+    SetBrushOrgEx              = _DbgSetBrushOrgEx@16           @377
+    SetColorAdjustment         = _DbgSetColorAdjustment@8       @378
+    SetColorSpace              = _DbgSetColorSpace@8            @379
+    SetDIBColorTable           = _DbgSetDIBColorTable@16        @380
+    SetDIBits                  = _DbgSetDIBits@28               @381
+    SetDIBitsToDevice          = _DbgSetDIBitsToDevice@48       @382
+    SetDeviceGammaRamp         = _DbgSetDeviceGammaRamp@8       @383
+    SetEnhMetaFileBits         = _DbgSetEnhMetaFileBits@8       @384
+;    SetFontEnumeration         = _DbgSetFontEnumeration@??      @385
+    SetGraphicsMode            = _DbgSetGraphicsMode@8          @386
+    SetICMMode                 = _DbgSetICMMode@8               @387
+    SetICMProfileA             = _DbgSetICMProfileA@8           @388
+    SetICMProfileW             = _DbgSetICMProfileW@8           @389
+    SetMapMode                 = _DbgSetMapMode@8               @390
+    SetMapperFlags             = _DbgSetMapperFlags@8           @391
+    SetMetaFileBitsEx          = _DbgSetMetaFileBitsEx@8        @392
+    SetMetaRgn                 = _DbgSetMetaRgn@4               @393
+    SetMiterLimit              = _DbgSetMiterLimit@12           @394
+    SetObjectOwner             = _DbgSetObjectOwner@8           @395
+    SetPaletteEntries          = _DbgSetPaletteEntries@16       @396
+    SetPixel                   = _DbgSetPixel@16                @397
+    SetPixelFormat             = _DbgSetPixelFormat@12          @398
+    SetPixelV                  = _DbgSetPixelV@16               @399
+    SetPolyFillMode            = _DbgSetPolyFillMode@8          @400
+    SetROP2                    = _DbgSetROP2@8                  @401
+    SetRectRgn                 = _DbgSetRectRgn@20              @402
+    SetStretchBltMode          = _DbgSetStretchBltMode@8        @403
+    SetSystemPaletteUse        = _DbgSetSystemPaletteUse@8      @404
+    SetTextAlign               = _DbgSetTextAlign@8             @405
+    SetTextCharacterExtra      = _DbgSetTextCharacterExtra@8    @406
+    SetTextColor               = _DbgSetTextColor@8             @407
+    SetTextJustification       = _DbgSetTextJustification@12    @408
+    SetViewportExtEx           = _DbgSetViewportExtEx@16        @409
+    SetViewportOrgEx           = _DbgSetViewportOrgEx@16        @410
+    SetWinMetaFileBits         = _DbgSetWinMetaFileBits@16      @411
+    SetWindowExtEx             = _DbgSetWindowExtEx@16          @412
+    SetWindowOrgEx             = _DbgSetWindowOrgEx@16          @413
+    SetWorldTransform          = _DbgSetWorldTransform@8        @414
+    StartDocA                  = _DbgStartDocA@8                @415
+    StartDocW                  = _DbgStartDocW@8                @416
+    StartPage                  = _DbgStartPage@4                @417
+    StretchBlt                 = _DbgStretchBlt@44              @418
+    StretchDIBits              = _DbgStretchDIBits@52           @419
+    StrokeAndFillPath          = _DbgStrokeAndFillPath@4        @420
+    StrokePath                 = _DbgStrokePath@4               @421
+    SwapBuffers                = _DbgSwapBuffers@4              @422
+    TextOutA                   = _DbgTextOutA@20                @423
+    TextOutW                   = _DbgTextOutW@20                @424
+    TranslateCharsetInfo       = _DbgTranslateCharsetInfo@12    @425
+    UnrealizeObject            = _DbgUnrealizeObject@4          @426
+    UpdateColors               = _DbgUpdateColors@4             @427
+    UpdateICMRegKey            = _DbgUpdateICMRegKeyA@16         @428
+    UpdateICMRegKeyA           = _DbgUpdateICMRegKeyA@16        @429
+    UpdateICMRegKeyW           = _DbgUpdateICMRegKeyW@16        @430
+    WidenPath                  = _DbgWidenPath@4               @431
+;    gdiPlaySpoolStream         = _DbggdiPlaySpoolStream@??      @432
+;    pfnRealizePalette          = _DbgpfnRealizePalette@??       @433
+;    pfnSelectPalette           = _DbgpfnSelectPalette@??        @434
+
+
+;
+; Internal functions. (starts at 1200)
+;
+    _ObjAllocateHandle@12                                       @1201 NONAME
+    _ObjDeleteHandle@8                                          @1202 NONAME
+    _ObjQueryHandleData@8                                       @1203 NONAME
+    _ObjQueryHandleType@4                                       @1204 NONAME
+    _ObjSetHandleFlag@12                                        @1205 NONAME
+    _ObjSetHandleData@12                                        @1206 NONAME
+    _ObjQueryHandleFlags@4                                      @1207 NONAME
+
+;
+; Function exported to USER32
+;
+    _setWinDeviceRegionFromPMDeviceRegion@16                    @1211 NONAME
+
+    _UnselectGDIObjects@4                                       @1212 NONAME
+    
+    OSLibGpiSetCp__FUlT1                                        @1213 NONAME
+    _ConvertRGB555to565@12                                      @1214 NONAME
Index: trunk/src/gdi32/gdistats.cpp
===================================================================
--- trunk/src/gdi32/gdistats.cpp	(revision 9427)
+++ trunk/src/gdi32/gdistats.cpp	(revision 9429)
@@ -40,5 +40,5 @@
 {
     for(int i=0;i<STATS_MAX_OBJECTS;i++) {
-        if(pdwObjects[i] == hObject) {
+        if(LOWORD(pdwObjects[i]) == LOWORD(hObject)) {
             pdwObjects[i] = 0;
             break;
Index: trunk/src/gdi32/icm.cpp
===================================================================
--- trunk/src/gdi32/icm.cpp	(revision 9427)
+++ trunk/src/gdi32/icm.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: icm.cpp,v 1.2 2001-09-09 12:24:13 sandervl Exp $ */
+/* $Id: icm.cpp,v 1.3 2002-11-26 10:53:09 sandervl Exp $ */
 
 /*
@@ -24,5 +24,5 @@
 #include <winuser32.h>
 
-#define DBG_LOCALLOG    DBG_gdi32
+#define DBG_LOCALLOG    DBG_icm
 #include "dbglocal.h"
 
Index: trunk/src/gdi32/line.cpp
===================================================================
--- trunk/src/gdi32/line.cpp	(revision 9427)
+++ trunk/src/gdi32/line.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: line.cpp,v 1.12 2001-11-16 16:27:54 sandervl Exp $ */
+/* $Id: line.cpp,v 1.13 2002-11-26 10:53:10 sandervl Exp $ */
 /*
  * Line API's
@@ -170,5 +170,4 @@
   POINTLOS2 startPt,endPt;
 
-  dprintf(("GDI32: LineDDA\n"));
 #if 0 //CB: the Open32 function is ok -> to check
   startPt.x = nXStart;
@@ -190,6 +189,4 @@
   pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
 
-  dprintf(("GDI32: Polyline %x %x %d", hdc, lppt, cPoints));
-
   if (!pHps)
   {
@@ -226,6 +223,4 @@
 {
   pDCData pHps = (pDCData)OSLibGpiQueryDCData(hdc);
-
-  dprintf(("GDI32: PolylineTo"));
 
   if (!pHps)
Index: trunk/src/gdi32/makefile
===================================================================
--- trunk/src/gdi32/makefile	(revision 9427)
+++ trunk/src/gdi32/makefile	(revision 9429)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.41 2001-12-15 18:50:27 sandervl Exp $
+# $Id: makefile,v 1.42 2002-11-26 10:53:10 sandervl Exp $
 
 #
@@ -7,4 +7,9 @@
 #
 
+
+!if "$(DEBUG)" == "1"
+DEFFILE    = gdi32dbg.def
+ORGDEFFILE = gdi32.def
+!endif
 
 #
@@ -53,4 +58,7 @@
 $(OBJDIR)\gdistats.obj \
 $(OBJDIR)\dbglocal.obj \
+!ifdef DEBUG
+$(OBJDIR)\dbgwrap.obj \
+!endif
 $(OBJDIR)\gdi32rsrc.obj
 
Index: trunk/src/gdi32/objhandle.cpp
===================================================================
--- trunk/src/gdi32/objhandle.cpp	(revision 9427)
+++ trunk/src/gdi32/objhandle.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: objhandle.cpp,v 1.30 2002-11-18 15:45:31 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.31 2002-11-26 10:53:10 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -249,7 +249,5 @@
 {
     int rc;
-
-    dprintf(("GDI32: GetObject %X %X %X\n", hObject, size, lpBuffer));
-    
+   
     if(lpBuffer == NULL)
     { //return required size if buffer pointer == NULL
@@ -309,6 +307,4 @@
     int ret, objtype;
 
-    dprintf(("GDI32: GetObjectW %X, %d %X", hObject, size, lpBuffer));
-
     objtype = GetObjectType(hObject);
 
@@ -415,6 +411,4 @@
         }
     }
-    dprintf2(("GDI32: SelectObject %x %x returned %x", hdc, hObj, rc));
-
     return(rc);
 }
@@ -494,5 +488,4 @@
     DWORD objflags;
 
-    dprintf(("GDI32: DeleteObject %x", hObj));
 //hack alert
     if(HIWORD(hObj) == 0x100) 
@@ -536,5 +529,4 @@
 HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
 {
-    dprintf(("GDI32: GetCurrentObject %x %x", hdc, arg2));
     return (HANDLE)O32_GetCurrentObject(hdc, arg2);
 }
@@ -551,5 +543,4 @@
 BOOL WIN32API UnrealizeObject( HGDIOBJ hObject)
 {
-    dprintf(("GDI32: UnrealizeObject %x", hObject));
     return O32_UnrealizeObject(hObject);
 }
Index: trunk/src/gdi32/opengl.cpp
===================================================================
--- trunk/src/gdi32/opengl.cpp	(revision 9427)
+++ trunk/src/gdi32/opengl.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: opengl.cpp,v 1.8 2000-02-16 14:18:11 sandervl Exp $ */
+/* $Id: opengl.cpp,v 1.9 2002-11-26 10:53:11 sandervl Exp $ */
 
 /*
@@ -119,6 +119,5 @@
  *****************************************************************************/
 
-ODINFUNCTION2(int,ChoosePixelFormat,HDC,                         hdc,
-                                    CONST PIXELFORMATDESCRIPTOR*,pformat)
+int WIN32API ChoosePixelFormat(HDC hdc, CONST PIXELFORMATDESCRIPTOR* pformat)
 {
   if (glChoosePixelFormat == NULL)
@@ -129,8 +128,6 @@
 }
 
-ODINFUNCTION4(int,DescribePixelFormat,HDC,hdc,
-                                      int,iFormat,
-                                      UINT,nBytes,
-                                      LPPIXELFORMATDESCRIPTOR,pformat)
+int WIN32API DescribePixelFormat(HDC hdc, int iFormat, UINT nBytes,
+                                      LPPIXELFORMATDESCRIPTOR pformat)
 {
   if (glDescribePixelFormat == NULL)
@@ -141,5 +138,5 @@
 }
 
-ODINFUNCTION1(int,GetPixelFormat,HDC,hdc)
+int WIN32API GetPixelFormat(HDC hdc)
 {
   if (glGetPixelFormat == NULL)
@@ -162,7 +159,6 @@
  *****************************************************************************/
 
-ODINFUNCTION3(BOOL,SetPixelFormat,HDC,                          hdc,
-                                  int,                          whatever,
-                                  CONST PIXELFORMATDESCRIPTOR*, pformat)
+BOOL WIN32API SetPixelFormat(HDC hdc, int whatever,
+                             CONST PIXELFORMATDESCRIPTOR *pformat)
 {
   if (glSetPixelFormat == NULL)
@@ -186,5 +182,5 @@
  *****************************************************************************/
 
-ODINFUNCTION1(BOOL,SwapBuffers,HDC,hdc)
+BOOL WIN32API SwapBuffers(HDC hdc)
 {
   if (glSwapBuffers == NULL)
Index: trunk/src/gdi32/region.cpp
===================================================================
--- trunk/src/gdi32/region.cpp	(revision 9427)
+++ trunk/src/gdi32/region.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: region.cpp,v 1.29 2002-11-05 14:33:32 sandervl Exp $ */
+/* $Id: region.cpp,v 1.30 2002-11-26 10:53:12 sandervl Exp $ */
 
 /*
@@ -13,8 +13,4 @@
  *
  */
-
-// Note: profiling currently not supported for this file
-#undef PROFILE
-#include <odinwrap.h>
 
 #define  INCL_GPI
@@ -38,8 +34,4 @@
 #define DBG_LOCALLOG    DBG_region
 #include "dbglocal.h"
-
-
-ODINDEBUGCHANNEL(GDI32-REGION)
-
 
 typedef enum
@@ -377,5 +369,5 @@
 int WIN32API GetRgnBox( HRGN hrgn, PRECT pRect);
 //******************************************************************************
-ODINFUNCTIONNODBG2(int, SelectClipRgn, HDC, hdc, HRGN, hrgn)
+int WIN32API SelectClipRgn(HDC hdc, HRGN hrgn)
 {
  LONG lComplexity = RGN_NULL;
@@ -394,5 +386,4 @@
     }
 
-    dprintf(("SelectClipRgn: %x %x", hdc, hrgn));
     if(hrgn)
     {
@@ -447,8 +438,8 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(int, ExtSelectClipRgn, HDC, hdc, HRGN, hrgn, int, mode)
+int WIN32API ExtSelectClipRgn(HDC hdc, HRGN hrgn, int mode)
 {
 #ifdef DEBUG
- HRGN hrgn1 = hrgn;
+   HRGN hrgn1 = hrgn;
 #endif
 
@@ -497,5 +488,4 @@
    }
 
-   dprintf(("ExtSelectRgn %x %x %d", hdc, hrgn1, mode));
    //TODO: metafile recording
    if(hrgn)
@@ -559,5 +549,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(int, GetClipBox, HDC, hdc, PRECT, lpRect)
+int WIN32API GetClipBox(HDC hdc, PRECT lpRect)
 {
  pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -628,5 +618,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(int, GetClipRgn, HDC, hdc, HRGN, hrgn)
+int WIN32API GetClipRgn(HDC hdc, HRGN hrgn)
 {
    pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -635,5 +625,5 @@
    HRGN       hrgnClip = NULL, hrgnTemp;
 #ifdef DEBUG
-   HRGN       hrgn1 = hrgn;
+   HRGN hrgn1 = hrgn;
 #endif
 
@@ -666,5 +656,4 @@
     else lComplexity = RGN_NULL;
 
-    dprintf(("GetClipRgn %x %x returned %d", hdc, hrgn1, lComplexity != RGN_NULL));
     SetLastError(ERROR_SUCCESS_W);
     if(lComplexity == RGN_NULL)
@@ -674,5 +663,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG5(int, ExcludeClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
+int WIN32API ExcludeClipRect(HDC  hdc, int  left, int  top, int  right, int bottom)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -716,5 +705,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG5(int, IntersectClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
+int WIN32API IntersectClipRect(HDC hdc, int left, int top, int right, int bottom)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -755,9 +744,9 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(int, OffsetClipRgn, HDC, hdc, int, nXOffset, int, nYOffset )
-{
-   BOOL      success;
-   pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
-   LONG      lComplexity;
+int WIN32API OffsetClipRgn(HDC  hdc, int  nXOffset, int  nYOffset )
+{
+   BOOL    success;
+   pDCData pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+   LONG    lComplexity;
 
    if(!pHps) {
@@ -784,5 +773,6 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG4(HRGN, CreatePolyPolygonRgn, const POINT * , lppt, const int *, pPolyCount, int,  nCount, int, fnPolyFillMode)
+HRGN WIN32API CreatePolyPolygonRgn(const POINT *lppt, const int *pPolyCount, 
+                                   int  nCount, int fnPolyFillMode)
 {
  LONG  flMode;
@@ -845,5 +835,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG4(HRGN, CreateRectRgn, int, left, int, top, int, right, int, bottom)
+HRGN WIN32API CreateRectRgn(int  left, int  top, int  right, int  bottom)
 {
  HRGN   hrgn;
@@ -870,5 +860,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(HRGN, CreateRectRgnIndirect, const RECT *, lprc)
+HRGN WIN32API CreateRectRgnIndirect( const RECT * lprc)
 {
    return CreateRectRgn(lprc->left, lprc->top, lprc->right, lprc->bottom);
@@ -876,5 +866,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG6(HRGN, CreateRoundRectRgn, int, left, int, top, int, right, int, bottom, int, nWidthEllipse, int, nHeightEllipse)
+HRGN WIN32API CreateRoundRectRgn(int  left, int  top, int  right, int  bottom, int  nWidthEllipse, int  nHeightEllipse)
 {
  HRGN   hrgn;
@@ -905,5 +895,6 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(HRGN, ExtCreateRegion, const XFORM_W *, pXform, DWORD, count, const RGNDATA *, pData)
+HRGN WIN32API ExtCreateRegion(const XFORM_W * pXform, DWORD count, 
+                              const RGNDATA * pData)
 {
    HRGN hrgn;
@@ -1016,5 +1007,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG4(HRGN, CreateEllipticRgn, int, left, int, top, int, right, int, bottom)
+HRGN WIN32API CreateEllipticRgn(int  left, int  top, int  right, int  bottom)
 {
  HRGN hrgn;
@@ -1039,5 +1030,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG1(HRGN, CreateEllipticRgnIndirect, const RECT *, pRect)
+HRGN WIN32API CreateEllipticRgnIndirect(const RECT *pRect)
 {
    return CreateEllipticRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);
@@ -1045,5 +1036,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(HRGN, CreatePolygonRgn, const POINT *, lppt, int, cPoints, int, fnPolyFillMode)
+HRGN WIN32API CreatePolygonRgn(const POINT * lppt, int  cPoints, int  fnPolyFillMode)
 {
     HRGN hrgn;
@@ -1089,5 +1080,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG4(int, CombineRgn, HRGN, hrgnDest, HRGN, hrgnSrc1, HRGN, hrgnSrc2, int, combineMode)
+int WIN32API CombineRgn(HRGN hrgnDest, HRGN hrgnSrc1, HRGN hrgnSrc2, int combineMode)
 {
     ULONG lComplexity;
@@ -1136,5 +1127,4 @@
         return ERROR_W;
     }
-    dprintf(("CombineRgn %x %x %x %d", hrgn1, hrgn2, hrgn3, mode));
     SetLastError(ERROR_SUCCESS_W);
     return lComplexity;
@@ -1142,5 +1132,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(BOOL, EqualRgn, HRGN, hrgn1, HRGN, hrgn2)
+BOOL WIN32API EqualRgn(HRGN  hrgn1, HRGN  hrgn2)
 {
    LONG lEquality;
@@ -1173,5 +1163,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG5(BOOL, SetRectRgn, HRGN, hrgn, int, left, int, top, int, right, int, bottom)
+BOOL WIN32API SetRectRgn(HRGN  hrgn, int  left, int  top, int  right, int  bottom)
 {
    BOOL    result = FALSE;
@@ -1197,5 +1187,5 @@
 //NOTE: depends on hps inversion
 //******************************************************************************
-ODINFUNCTIONNODBG3(ULONG, GetRegionData, HRGN, hrgn, ULONG, count, PRGNDATA, pData)
+ULONG WIN32API GetRegionData( HRGN  hrgn, ULONG count, PRGNDATA pData)
 {
 #ifdef DEBUG
@@ -1262,5 +1252,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(int, GetRgnBox, HRGN, hrgn, PRECT, pRect)
+int WIN32API GetRgnBox( HRGN  hrgn, PRECT pRect)
 {
    BOOL      success;
@@ -1299,5 +1289,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(BOOL, InvertRgn, HDC, hdc, HRGN, hrgn)
+BOOL WIN32API InvertRgn( HDC  hdc, HRGN  hrgn)
 {
 #ifdef DEBUG
@@ -1323,8 +1313,8 @@
     RECTL boundingRect;      // this gets a rectangle in world cordinates!
 
-    lComplexity = GpiQueryRegionBox(pHps->hps, pHps->hrgnHDC, &boundingRect);
+    lComplexity = GpiQueryRegionBox(pHps->hps, pHps->hrgnHDC,  &boundingRect);
     if(lComplexity != RGN_ERROR)
     {
-        lComplexity = GpiSetClipRegion(pHps->hps, pHps->hrgnHDC, &hrgnOld);
+        lComplexity = GpiSetClipRegion(pHps->hps, pHps->hrgnHDC,  &hrgnOld);
         if(lComplexity != RGN_ERROR)
         {
@@ -1350,5 +1340,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(int, OffsetRgn, HRGN, hrgn, int, xOffset, int, yOffset)
+int WIN32API OffsetRgn( HRGN  hrgn, int  xOffset, int  yOffset)
 {
    LONG   lComplexity;
@@ -1398,5 +1388,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG5(BOOL, FrameRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush, int, width, int, height)
+BOOL WIN32API FrameRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush, int width, int height)
 {
     HBRUSH hbrushRestore = 0;
@@ -1430,5 +1420,5 @@
 
     SIZEL  thickness = { width, height };
-    LONG   lHits = GpiFrameRegion(pHps->hps, pHps->hrgnHDC, &thickness);
+    LONG   lHits = GpiFrameRegion(pHps->hps, pHps->hrgnHDC,  &thickness);
 
     SetLastError(ERROR_SUCCESS_W);
@@ -1443,5 +1433,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(BOOL, FillRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush)
+BOOL WIN32API FillRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush)
 {
  BOOL   success;
@@ -1498,5 +1488,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(BOOL, PaintRgn, HDC, hdc, HRGN, hrgn)
+BOOL WIN32API PaintRgn( HDC  hdc, HRGN  hrgn)
 {
    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -1511,5 +1501,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(BOOL, PtInRegion, HRGN, hrgn, int, x, int, y)
+BOOL WIN32API PtInRegion( HRGN  hrgn, int  x, int  y)
 {
    BOOL      success;
@@ -1544,5 +1534,5 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG2(BOOL, RectInRegion, HRGN, hrgn, const RECT *, pRect)
+BOOL WIN32API RectInRegion( HRGN  hrgn, const RECT * pRect)
 {
    BOOL      success;
@@ -1589,5 +1579,5 @@
 //Returned region in device coordinates (undocumented behaviour)
 //******************************************************************************
-ODINFUNCTIONNODBG1(HRGN, PathToRegion, HDC, hdc)
+HRGN WIN32API PathToRegion( HDC  hdc)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -1632,5 +1622,5 @@
 //Needs wrapper as this file includes os2.h!!
 //******************************************************************************
-ODINFUNCTIONNODBG1(BOOL, OSLibDeleteRegion, HANDLE, hRegion)
+BOOL WIN32API OSLibDeleteRegion(HANDLE hRegion)
 {
     if(GpiDestroyRegion(hpsRegion, hRegion) == FALSE) {
@@ -1653,5 +1643,5 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG2(int, GetMetaRgn, HDC,  hdc, HRGN, hrgn)
+int WIN32API GetMetaRgn( HDC   hdc, HRGN  hrgn)
 {
   dprintf(("GDI32: GetMetaRgn(%08xh, %08xh) not implemented.\n",
@@ -1677,5 +1667,5 @@
  *****************************************************************************/
 
-ODINFUNCTIONNODBG1(BOOL, SetMetaRgn, HDC, hdc)
+BOOL WIN32API SetMetaRgn( HDC  hdc)
 {
   dprintf(("GDI32: SetMetaRgn(%08xh) not implemented.\n",
Index: trunk/src/gdi32/transform.cpp
===================================================================
--- trunk/src/gdi32/transform.cpp	(revision 9427)
+++ trunk/src/gdi32/transform.cpp	(revision 9429)
@@ -1,3 +1,3 @@
-/* $Id: transform.cpp,v 1.7 2001-09-10 11:02:41 sandervl Exp $ */
+/* $Id: transform.cpp,v 1.8 2002-11-26 10:53:12 sandervl Exp $ */
 
 /*
@@ -708,3 +708,2 @@
 //******************************************************************************
 //******************************************************************************
-
