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

Timestamp:

Dec 2, 1999, 2:37:04 PM (26 years ago)

Author:

achimha

Message:

changes from Markus

File:

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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.18 1999-12-01 23:30:08 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.19 1999-12-02 13:37:04 achimha Exp $ */
 
 /*
@@ -353 +353 @@
                             int nWidthSrc, int nHeightSrc, DWORD dwRop)
 {
-    dprintf(("GDI32: StretchBlt Dest: (%d, %d) size (%d, %d)\n", nXOriginDest, nYOriginDest, nWidthDest, nHeightDest));
-    dprintf(("GDI32: StretchBlt Src : (%d, %d) size (%d, %d)\n", nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc));
-    return O32_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
+  dprintf(("GDI32: StretchBlt Dest: (%d, %d) size (%d, %d)\n",
+           nXOriginDest, nYOriginDest, nWidthDest, nHeightDest));
+  dprintf(("GDI32: StretchBlt Src : (%d, %d) size (%d, %d)\n",
+           nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc));
+  if(DIBSection::getSection() != NULL)
+  {
+    DIBSection *dsect = DIBSection::findHDC(hdcSrc);
+    if(dsect)
+    {
+      dprintf((" Do stretched DIB Blt\n"));
+      return(dsect->BitBlt( hdcDest,
+                            nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
+                            nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc,
+                            dwRop));
+    }
+  }
+  return O32_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop);
 }
 //******************************************************************************
@@ -375 +389 @@
 int WIN32API SetStretchBltMode( HDC arg1, int  arg2)
 {
-    dprintf(("GDI32: SetStretchBltMode\n"));
-    return O32_SetStretchBltMode(arg1, arg2);
+  dprintf(("GDI32: SetStretchBltMode %X, %x\n",arg1, arg2));
+
+  if(DIBSection::getSection() != NULL)
+  {
+    DIBSection *dsect = DIBSection::findHDC(arg1);
+    if(dsect)
+    {
+      dprintf(("       - DC is DIBSection\n"));
+    }
+  }
+  return O32_SetStretchBltMode(arg1, arg2);
 }
 //******************************************************************************
@@ -529 +552 @@
         DIBSection *dsect = DIBSection::findHDC(hdcSrc);
         if(dsect) {
-                return(dsect->BitBlt(hdcDest, arg2, arg3, arg4, arg5, arg7, arg8, arg9));
+                return(dsect->BitBlt(hdcDest, arg2, arg3, arg4, arg5, arg7, arg8, arg4, arg5, arg9));
         }
     }
@@ -644 +667 @@
 HDC WIN32API CreateDCW( LPCWSTR arg1, LPCWSTR arg2, LPCWSTR arg3, const DEVMODEW * arg4)
 {
-    dprintf(("GDI32: CreateDCW STUB"));
-    // NOTE: This will not work as is (needs UNICODE support)
-//    return O32_CreateDC(arg1, arg2, arg3, arg4);
-    return 0;
+    char *astring1 = UnicodeToAsciiString((LPWSTR)arg1);
+    char *astring2 = UnicodeToAsciiString((LPWSTR)arg2);
+    char *astring3 = UnicodeToAsciiString((LPWSTR)arg3);
+    char *astring4 = UnicodeToAsciiString((LPWSTR)(arg4->dmDeviceName));
+    char *astring5 = UnicodeToAsciiString((LPWSTR)(arg4->dmFormName));
+
+    HDC   rc;
+    DEVMODEA devmode;
+
+    dprintf(("GDI32: CreateDCW"));
+
+    strcpy((char*)devmode.dmDeviceName, astring4);
+    strcpy((char*)devmode.dmFormName, astring5);
+
+    devmode.dmSpecVersion      = arg4->dmSpecVersion;
+    devmode.dmDriverVersion    = arg4->dmDriverVersion;
+    devmode.dmSize             = arg4->dmSize;
+    devmode.dmDriverExtra      = arg4->dmDriverExtra;
+    devmode.dmFields           = arg4->dmFields;
+    devmode.dmOrientation      = arg4->dmOrientation;
+    devmode.dmPaperSize        = arg4->dmPaperSize;
+    devmode.dmPaperLength      = arg4->dmPaperLength;
+    devmode.dmPaperWidth       = arg4->dmPaperWidth;
+    devmode.dmScale            = arg4->dmScale;
+    devmode.dmCopies           = arg4->dmCopies;
+    devmode.dmDefaultSource    = arg4->dmDefaultSource;
+    devmode.dmPrintQuality     = arg4->dmPrintQuality;
+    devmode.dmColor            = arg4->dmColor;
+    devmode.dmDuplex           = arg4->dmDuplex;
+    devmode.dmYResolution      = arg4->dmYResolution;
+    devmode.dmTTOption         = arg4->dmTTOption;
+    devmode.dmCollate          = arg4->dmCollate;
+    devmode.dmLogPixels        = arg4->dmLogPixels;
+    devmode.dmBitsPerPel       = arg4->dmBitsPerPel;
+    devmode.dmPelsWidth        = arg4->dmPelsWidth;
+    devmode.dmPelsHeight       = arg4->dmPelsHeight;
+    devmode.dmDisplayFlags     = arg4->dmDisplayFlags;
+    devmode.dmDisplayFrequency = arg4->dmDisplayFrequency;
+    devmode.dmICMMethod        = arg4->dmICMMethod;
+    devmode.dmICMIntent        = arg4->dmICMIntent;
+    devmode.dmMediaType        = arg4->dmMediaType;
+    devmode.dmDitherType       = arg4->dmDitherType;
+    devmode.dmReserved1        = arg4->dmReserved1;
+    devmode.dmReserved2        = arg4->dmReserved2;
+
+    rc = O32_CreateDC(astring1,astring2,astring3,&devmode);
+    FreeAsciiString(astring1);
+    FreeAsciiString(astring2);
+    FreeAsciiString(astring3);
+    FreeAsciiString(astring4);
+    FreeAsciiString(astring5);
+
+    return rc;
 }
 //******************************************************************************
@@ -1454 +1526 @@
     rc = O32_GetTextFace(arg1, arg2, astring);
     AsciiToUnicode(astring, arg3);
+    free(astring);
     return rc;
 }
@@ -2650 +2723 @@
  *             written for versions of Windows earlier than 3.0. For Win32-based
  *             applications, use the CreateDIBPatternBrushPt function.
- * Parameters: HGLOBAL hglbDIBPacked handle of device-independent bitmap
+ * Parameters: HGLOBAL hglbDIBPacked Identifies a global memory object containing
+ *             a packed DIB, which consists of a BITMAPINFO structure immediately
+ *             followed by an array of bytes defining the pixels of the bitmap.
  *             UINT    fuColorSpec   color table data
  * Variables :
  * Result    : TRUE / FALSE
  * Remark    :
- * Status    : UNTESTED STUB
+ * Status    : UNTESTED
  *
  * Author    : Patrick Haller [Mon, 1998/06/15 08:00]
+ *             Markus Montkowski [Wen, 1999/01/12 20:00]
  *****************************************************************************/
 
-HBRUSH WIN32API CreateDIBPatternBrush(HGLOBAL hglbDIBPacked,
-                                         UINT    fuColorSpec)
-{
-  dprintf(("GDI32: CreateDIBPatternBrush(%08xh, %08xh) not implemented.\n",
+HBRUSH WIN32API CreateDIBPatternBrush( HGLOBAL hglbDIBPacked,
+                                       UINT    fuColorSpec)
+{
+  LPVOID lpMem;
+  HBRUSH ret = 0;
+  dprintf(("GDI32: CreateDIBPatternBrush(%08xh, %08xh) \n",
            hglbDIBPacked,
            fuColorSpec));
 
-  return (0);
+  lpMem = GlobalLock(hglbDIBPacked);
+  if(NULL!=lpMem)
+  {
+
+    ret = CreateDIBPatternBrushPt( lpMem,
+                                   fuColorSpec);
+    GlobalUnlock(hglbDIBPacked);
+  }
+
+  return (ret);
 }