Changeset 5817 for trunk/src

Timestamp:

May 28, 2001, 4:43:34 PM (24 years ago)

Author:

phaller

Message:

Fix for Ziff Davis Benchmarks

File:

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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.71 2001-05-28 09:17:54 phaller Exp $ */
+/* $Id: gdi32.cpp,v 1.72 2001-05-28 14:43:34 phaller Exp $ */
 
 /*
@@ -333 +333 @@
 HDC WIN32API CreateDCA(LPCSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszOutput, const DEVMODEA *lpInitData)
 {
- HDC hdc;
+    HDC hdc;
+
+    // 2001-05-28 PH
+    // Ziff Davis Benchmarks come in here with "display".
+    // Obviously, Windows does accept case-insensitive driver names,
+    // whereas Open32 doesn't.
+    if (*lpszDriver == 'd') // quick check
+    {
+        // then do a double-check and use the uppercase constant
+        // instead
+        if (stricmp(lpszDriver, "DISPLAY") == 0)
+            lpszDriver = "DISPLAY";
+    }
 
     hdc = O32_CreateDC(lpszDriver, lpszDevice, lpszOutput, lpInitData);
@@ -395 +407 @@
       devmode.dmReserved1        = arg4->dmReserved1;
       devmode.dmReserved2        = arg4->dmReserved2;
-      rc = O32_CreateDC(astring1,astring2,astring3,&devmode);
+      rc = CreateDCA(astring1,astring2,astring3,&devmode);
     }
     else
-      rc = O32_CreateDC(astring1,astring2,astring3, NULL);
+      rc = CreateDCA(astring1,astring2,astring3, NULL);
 
     FreeAsciiString(astring1);