Changeset 2581 for trunk/src/gdi32/gdi32.cpp

Timestamp:

Jan 31, 2000, 11:30:08 PM (26 years ago)

Author:

sandervl

Message:

init dibsection bmp data to 0 during creation

File:

• trunk/src/gdi32/gdi32.cpp (modified) (9 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.35 2000-01-30 15:04:40 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.36 2000-01-31 22:30:08 sandervl Exp $ */
 
 /*
@@ -319 +319 @@
 
     OSLibGpiSetCp(newHdc, oldcp);
+    dprintf(("CreateCompatibleDC %X returned %x", hdc, newHdc));
     return newHdc;
 }
@@ -329 +330 @@
 {
 #if 1
-    dprintf(("GDI32: StretchDIBits"));
+    dprintf(("GDI32: StretchDIBits %x to (%d,%d) (%d,%d) from (%d,%d) (%d,%d), %x %x %x %x", hdc, xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, bits, info, wUsage, dwRop));
 
     if(wUsage == DIB_PAL_COLORS && info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
@@ -1246 +1247 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE WIN32API GetCurrentObject( HDC arg1, UINT arg2)
-{
-    dprintf(("GDI32: GetCurrentObject"));
-    return (HANDLE)O32_GetCurrentObject(arg1, arg2);
+HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
+{
+    dprintf(("GDI32: GetCurrentObject %x %x", hdc, arg2));
+    return (HANDLE)O32_GetCurrentObject(hdc, arg2);
 }
 //******************************************************************************
@@ -1515 +1516 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API GetTextExtentPoint32A( HDC arg1, LPCSTR arg2, int arg3, PSIZE  lpSize)
-{
-    dprintf(("GDI32: GetTextExtentPoint32A"));
+BOOL WIN32API GetTextExtentPoint32A( HDC hdc, LPCSTR lpsz, int cbString, PSIZE  lpSize)
+{
+ BOOL rc;
+
     lpSize->cx = lpSize->cy = 0;
-    return O32_GetTextExtentPoint32(arg1, arg2, arg3, lpSize);
+    rc = O32_GetTextExtentPoint32(hdc, lpsz, cbString, lpSize);
+    dprintf(("GDI32: GetTextExtentPoint32A %x %s %d returned %d (%d,%d)", hdc, lpsz, cbString, rc, lpSize->cx, lpSize->cy));
+    return rc;
 }
 //******************************************************************************
@@ -1896 +1900 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SelectClipRgn( HDC arg1, HRGN  arg2)
-{
-    dprintf(("GDI32: SelectClipRgn"));
-    return O32_SelectClipRgn(arg1, arg2);
+int WIN32API SelectClipRgn( HDC hdc, HRGN hRgn)
+{
+    dprintf(("GDI32: SelectClipRgn %x %x", hdc, hRgn));
+    return O32_SelectClipRgn(hdc, hRgn);
 }
 //******************************************************************************
@@ -2006 +2010 @@
 //    if(xDest == 0 && yDest == 0 && xSrc == 0 && ySrc == 0 && cx == width && cy == height) {
 //      result = OSLibSetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (WINBITMAPINFOHEADER*)info, coloruse);
+//      result = lines;
 //    }
 //    else {
@@ -2241 +2246 @@
   if(pbmi->bmiHeader.biWidth < 0)
   {
-    pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
-    fFlip = FLIP_HOR;
+        dprintf(("CreateDIBSection: width %d", pbmi->bmiHeader.biWidth));
+        pbmi->bmiHeader.biWidth = -pbmi->bmiHeader.biWidth;
+        fFlip = FLIP_HOR;
   }
   iHeight = pbmi->bmiHeader.biHeight;
   if(pbmi->bmiHeader.biHeight < 0)
   {
-    pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
-    fFlip |= FLIP_VERT;
+        dprintf(("CreateDIBSection: height %d", pbmi->bmiHeader.biHeight));
+        pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight;
+        fFlip |= FLIP_VERT;
   }
 
@@ -2288 +2295 @@
       pbmi->bmiHeader.biHeight = iHeight;
 
-      dprintf(("GDI32: return %08X\n",res));
       return(res);
     }