Changeset 2484 for trunk/src

Timestamp:

Jan 20, 2000, 10:39:36 PM (26 years ago)

Author:

sandervl

Message:

VT: Codepages changes for CreateCompatibleDC

Location:

trunk/src/gdi32

Files:

• gdi32.cpp (modified) (3 diffs)
• oslibgpi.cpp (modified) (2 diffs)
• oslibgpi.h (modified) (2 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.29 2000-01-07 17:37:53 cbratschi Exp $ */
+/* $Id: gdi32.cpp,v 1.30 2000-01-20 21:39:35 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include "unicode.h"
 #include "dibsect.h"
+#include <codepage.h>
+#include "oslibgpi.h"
 
 static ULONG QueryPaletteSize(BITMAPINFOHEADER *pBHdr)
@@ -306 +308 @@
 //******************************************************************************
 //******************************************************************************
-HDC WIN32API CreateCompatibleDC( HDC arg1)
-{
- HDC rc;
-
-    rc = O32_CreateCompatibleDC(arg1);
-    dprintf(("GDI32: CreateCompatibleDC %X returned %x", arg1, rc));
-    return rc;
+HDC WIN32API CreateCompatibleDC( HDC hdc)
+{
+ HDC newHdc;
+ ULONG oldcp;
+
+    newHdc = O32_CreateCompatibleDC(hdc);
+    oldcp = OSLibGpiQueryCp(hdc);
+    if (!oldcp) { /* If new DC is to be created */
+        oldcp = GetDisplayCodepage();
+        OSLibGpiSetCp(newHdc, oldcp);
+    }
+
+    return newHdc;
 }
 //******************************************************************************

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.2 1999-12-16 16:52:32 cbratschi Exp $ */
+/* $Id: oslibgpi.cpp,v 1.3 2000-01-20 21:39:36 sandervl Exp $ */
 
 /*
@@ -337 +337 @@
   return rc;
 }
+
+ULONG OSLibGpiQueryCp(HDC hdc)
+{
+  return GpiQueryCp(hdc);
+}
+
+BOOL OSLibGpiSetCp(HDC hdc, ULONG codepage)
+{
+  return GpiSetCp(hdc, codepage);
+}
+

trunk/src/gdi32/oslibgpi.h

@@ -1 @@
-/* $Id: oslibgpi.h,v 1.2 1999-12-16 16:52:33 cbratschi Exp $ */
+/* $Id: oslibgpi.h,v 1.3 2000-01-20 21:39:36 sandervl Exp $ */
 
 /*
@@ -163 +163 @@
 BOOL drawLinePoint(PVOID pHps,PPOINTLOS2 pt,LONG color);
 
+ULONG OSLibGpiQueryCp(HDC hdc);
+BOOL  OSLibGpiSetCp(HDC hdc, ULONG codepage);
+
 #endif