Changeset 5472 for trunk/src/gdi32

Timestamp:

Apr 4, 2001, 11:05:50 AM (25 years ago)

Author:

sandervl

Message:

compile fix

Location:

trunk/src/gdi32

Files:

• metafile.cpp (modified) (2 diffs)
• objhandle.cpp (modified) (2 diffs)
• text.cpp (modified) (6 diffs)

trunk/src/gdi32/metafile.cpp

@@ -1 @@
-/* $Id: metafile.cpp,v 1.4 2001-02-01 18:01:52 sandervl Exp $ */
+/* $Id: metafile.cpp,v 1.5 2001-04-04 09:02:15 sandervl Exp $ */
 
 /*
@@ -14 +14 @@
 #include <stdarg.h>
 #include <string.h>
-#include "misc.h"
+#include <misc.h>
+#include <unicode.h>
 
 #define DBG_LOCALLOG    DBG_metafile

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.12 2001-03-27 20:47:53 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.13 2001-04-04 09:02:15 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -24 +24 @@
 #include "dibsect.h"
 #include "region.h"
+#include <unicode.h>
 
 #define DBG_LOCALLOG    DBG_objhandle

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.14 2000-11-16 16:34:49 sandervl Exp $ */
+/* $Id: text.cpp,v 1.15 2001-04-04 09:02:15 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include "oslibgpi.h"
 #include <dcdata.h>
+#include <unicode.h>
 
 #define DBG_LOCALLOG    DBG_text
@@ -450 +451 @@
 INT SYSTEM EXPORT InternalDrawTextExW(HDC hdc,LPCWSTR lpchText,INT cchText,LPRECT lprc,UINT dwDTFormat,LPDRAWTEXTPARAMS lpDTParams,BOOL isDrawTextEx)
 {
-  char *astring = (cchText == -1) ? UnicodeToAsciiString((LPWSTR)lpchText):UnicodeToAsciiStringN((LPWSTR)lpchText,cchText);
+  char *astring;
   INT  rc;
+
+  if(cchText == -1) {
+     UnicodeToAsciiString((LPWSTR)lpchText);
+  }
+  else {
+     astring = (char *)HEAP_malloc(cchText+1);
+     UnicodeToAscii((LPWSTR)lpchText, astring);
+     astring[cchText] = 0;
+  }
 
   dprintf(("InternalDrawTextExW %x %s %d %x", hdc, astring, cchText, dwDTFormat));
@@ -508 +518 @@
 DWORD SYSTEM EXPORT InternalGetTabbedTextExtentW(HDC hDC,LPCWSTR lpString,INT nCount,INT nTabPositions,LPINT lpnTabStopPositions)
 {
-  char *astring = (nCount == -1) ? UnicodeToAsciiString((LPWSTR)lpString):UnicodeToAsciiStringN((LPWSTR)lpString,nCount);
+  char *astring;
   DWORD rc;
+
+  if(nCount == -1) {
+     UnicodeToAsciiString((LPWSTR)lpString);
+  }
+  else {
+     astring = (char *)HEAP_malloc(nCount+1);
+     UnicodeToAscii((LPWSTR)lpString, astring);
+     astring[nCount] = 0;
+  }
 
   rc = InternalGetTabbedTextExtentA(hDC,astring,nCount,nTabPositions,lpnTabStopPositions);
@@ -587 +606 @@
 LONG SYSTEM EXPORT InternalTabbedTextOutW(HDC hdc,INT x,INT y,LPCWSTR lpString,INT nCount,INT nTabPositions,LPINT lpnTabStopPositions,INT nTabOrigin)
 {
-  char *astring = (nCount == -1) ? UnicodeToAsciiString((LPWSTR)lpString):UnicodeToAsciiStringN((LPWSTR)lpString,nCount);
+  char *astring;
   LONG rc;
+
+  if(nCount == -1) {
+     UnicodeToAsciiString((LPWSTR)lpString);
+  }
+  else {
+     astring = (char *)HEAP_malloc(nCount+1);
+     UnicodeToAscii((LPWSTR)lpString, astring);
+     astring[nCount] = 0;
+  }
 
   rc = InternalTabbedTextOutA(hdc,x,y,astring,nCount,nTabPositions,lpnTabStopPositions,nTabOrigin);
@@ -749 +777 @@
 BOOL InternalTextOutW(HDC hdc,int X,int Y,UINT fuOptions,CONST RECT *lprc,LPCWSTR lpszString,INT cbCount,CONST INT *lpDx,BOOL IsExtTextOut)
 {
-  char *astring = (cbCount == -1) ? UnicodeToAsciiString((LPWSTR)lpszString):UnicodeToAsciiStringN((LPWSTR)lpszString,cbCount);
+  char *astring;
   BOOL  rc;
 
+  if(cbCount == -1) {
+     UnicodeToAsciiString((LPWSTR)lpszString);
+  }
+  else {
+     astring = (char *)HEAP_malloc(cbCount+1);
+     UnicodeToAscii((LPWSTR)lpszString, astring);
+     astring[cbCount] = 0;
+  }
   rc = InternalTextOutA(hdc,X,Y,fuOptions,lprc,(LPCSTR)astring,cbCount,lpDx,IsExtTextOut);
   FreeAsciiString(astring);