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

Timestamp:

Jan 28, 2000, 11:24:58 PM (26 years ago)

Author:

sandervl

Message:

Wrong return values for GetDIBits & SetDIBitsToDevice

File:

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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.33 2000-01-26 23:48:02 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.34 2000-01-28 22:24:57 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <codepage.h>
 #include "oslibgpi.h"
+#include "oslibgdi.h"
 
 static ULONG QueryPaletteSize(BITMAPINFOHEADER *pBHdr)
@@ -689 +690 @@
 //******************************************************************************
 //******************************************************************************
-HDC WIN32API CreateDCA( LPCSTR arg1, LPCSTR arg2, LPCSTR arg3, const DEVMODEA * arg4)
-{
-    dprintf(("GDI32: CreateDCA"));
-    return O32_CreateDC(arg1, arg2, arg3, arg4);
+HDC WIN32API CreateDCA(LPCSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszOutput, const DEVMODEA *lpInitData)
+{
+ HDC hdc;
+
+    hdc = O32_CreateDC(lpszDriver, lpszDevice, lpszOutput, lpInitData);
+    dprintf(("GDI32: CreateDCA %s %s %s %x returned %x", lpszDriver, lpszDevice, lpszOutput, lpInitData, hdc));
+    return hdc;
 }
 //******************************************************************************
@@ -1029 +1033 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SetROP2( HDC arg1, int  arg2)
-{
-    dprintf(("GDI32: SetROP2"));
-    return O32_SetROP2(arg1, arg2);
+int WIN32API SetROP2( HDC hdc, int rop2)
+{
+    dprintf(("GDI32: SetROP2 %x %x", hdc, rop2));
+    return O32_SetROP2(hdc, rop2);
 }
 //******************************************************************************
@@ -1256 +1260 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetDIBits( HDC arg1, HBITMAP arg2, UINT arg3, UINT arg4, void * arg5, PBITMAPINFO arg6, UINT  arg7)
-{
-    dprintf(("GDI32: GetDIBits"));
-    return O32_GetDIBits(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+int WIN32API GetDIBits(HDC hdc, HBITMAP hBitmap, UINT uStartScan, UINT cScanLines, 
+                       void *lpvBits, PBITMAPINFO lpbi, UINT uUsage)
+{
+ int rc;
+
+    rc = O32_GetDIBits(hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+    dprintf(("GDI32: GetDIBits %x %x %d %d %x %x %d returned %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage, rc));
+    //SvL: Wrong Open32 return value
+    return (rc == TRUE) ? cScanLines : 0;
 }
 //******************************************************************************
@@ -1943 +1952 @@
 //******************************************************************************
 //******************************************************************************
-INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse)
-{
-    INT result, imgsize, palsize;
+INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, 
+                               DWORD cy, INT xSrc, INT ySrc, 
+                               UINT startscan, UINT lines, LPCVOID bits, 
+                               const BITMAPINFO *info, UINT coloruse)
+{
+    INT result, imgsize, palsize, height, width;
     char *ptr;
 
-    dprintf(("GDI32: SetDIBitsToDevice hdc:%X xDest:%d yDest:%d, cx:%d, cy:%d, xSrc:%d, ySrc:%d, startscan:%d, lines:%d, bits:%X, info%X, coloruse:%d",
-                 hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (LPVOID) bits, (PBITMAPINFO)info, coloruse));
+    SetLastError(0);
+    if(info == NULL) {
+        goto invalid_parameter;
+    }
+    height = info->bmiHeader.biHeight;
+    width  = info->bmiHeader.biWidth;
+
+    if (height < 0) height = -height;
+    if (!lines || (startscan >= height)) {
+        goto invalid_parameter;
+    }
+    if (startscan + lines > height) lines = height - startscan;
+
+    if (ySrc < startscan) ySrc = startscan;
+    else if (ySrc >= startscan + lines) goto invalid_parameter;
+
+    if (xSrc >= width) goto invalid_parameter;
+
+    if (ySrc + cy >= startscan + lines) cy = startscan + lines - ySrc;
+
+    if (xSrc + cx >= width) cx = width - xSrc;
+
+    if (!cx || !cy) goto invalid_parameter;
 
     // EB: ->>> Crazy. Nobody seen this Open32 bug ?
@@ -1966 +1999 @@
     // EB: <<<-
 
-    result = O32_SetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (PBITMAPINFO)info, coloruse);
+//    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);
+//    }
+//    else {
+        result = O32_SetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (PBITMAPINFO)info, coloruse);
+        //SvL: Wrong Open32 return value
+        result = (result == TRUE) ? lines : 0;
+//    }
+
+    dprintf(("GDI32: SetDIBitsToDevice hdc:%X xDest:%d yDest:%d, cx:%d, cy:%d, xSrc:%d, ySrc:%d, startscan:%d, lines:%d, bits:%X, info%X, coloruse:%d returned %d",
+                 hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (LPVOID) bits, (PBITMAPINFO)info, coloruse, result));
     return result;
+
+invalid_parameter:
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return 0;
 }
 //******************************************************************************