Changeset 12935

Timestamp:

Jan 7, 2000, 6:37:53 PM (25 years ago)

Author:

cbratschi

Message:

fixed PatBlt

File:

• tags/trunk/src/gdi32/gdi32.cpp (modified) (5 diffs)

tags/trunk/src/gdi32/gdi32.cpp ¶

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.28 1999-12-30 18:51:48 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.29 2000-01-07 17:37:53 cbratschi Exp $ */
 
 /*
@@ -164 +164 @@
 
   if(size == 0 || lpBuffer == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
   }
 
   if(DIBSection::getSection() != NULL)
   {
-        DIBSection *dsect = DIBSection::find(hObject);
-        if(dsect)
-        {
-                rc = dsect->GetDIBSection(size, lpBuffer);
-                if(rc == 0) {
-                        SetLastError(ERROR_INVALID_PARAMETER);
-                        return 0;
-                }
-                SetLastError(ERROR_SUCCESS);
-                return rc;
-        }
+        DIBSection *dsect = DIBSection::find(hObject);
+        if(dsect)
+        {
+                rc = dsect->GetDIBSection(size, lpBuffer);
+                if(rc == 0) {
+                        SetLastError(ERROR_INVALID_PARAMETER);
+                        return 0;
+                }
+                SetLastError(ERROR_SUCCESS);
+                return rc;
+        }
   }
 
@@ -915 +915 @@
 {
     if(lpRect == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
     }
     dprintf(("GDI32: CreateRectRgnIndirect (%d,%d)(%d,%d)", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
@@ -923 +923 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, 
+HRGN WIN32API CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect,
                                  int nWidthEllipse, int nHeightEllipse)
 {
@@ -995 +995 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API PatBlt( HDC arg1, int arg2, int arg3, int arg4, int arg5, DWORD  arg6)
-{
- BOOL rc;
-
-  rc = O32_PatBlt(arg1, arg2, arg3, arg4, arg5, arg6);
-  dprintf(("GDI32: PatBlt (%d,%d) (%d,%d) returned %d\n", arg2, arg3, arg4, arg5, rc));
+BOOL WIN32API PatBlt(HDC hdc,int nXLeft,int nYLeft,int nWidth,int nHeight,DWORD dwRop)
+{
+  BOOL rc;
+
+  //CB: Open32 bug: negative width/height not supported!
+  if (nWidth < 0)
+  {
+    nXLeft += nWidth+1;
+    nWidth = -nWidth;
+  }
+  if (nHeight < 0)
+  {
+    nYLeft += nHeight+1;
+    nHeight = -nHeight;
+  }
+  rc = O32_PatBlt(hdc,nXLeft,nYLeft,nWidth,nHeight,dwRop);
+  dprintf(("GDI32: PatBlt (%d,%d) (%d,%d) returned %d\n",nXLeft,nYLeft,nWidth,nHeight,rc));
   return(rc);
 }