Changeset 5595 for trunk/src

Timestamp:

Apr 26, 2001, 7:01:08 PM (24 years ago)

Author:

sandervl

Message:

InternalTextOutW fix (breakpoint hit in debug build)

File:

• trunk/src/gdi32/text.cpp (modified) (4 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.17 2001-04-15 17:04:47 sandervl Exp $ */
+/* $Id: text.cpp,v 1.18 2001-04-26 17:01:08 sandervl Exp $ */
 
 /*
@@ -777 +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;
+  char *astring = NULL;
   BOOL  rc;
 
@@ -783 +783 @@
      astring = UnicodeToAsciiString((LPWSTR)lpszString);
   }
-  else {
+  else 
+  if(cbCount) {
      astring = (char *)HEAP_malloc(cbCount+1);
      UnicodeToAscii((LPWSTR)lpszString, astring);
@@ -789 +790 @@
   }
   rc = InternalTextOutA(hdc,X,Y,fuOptions,lprc,(LPCSTR)astring,cbCount,lpDx,IsExtTextOut);
-  FreeAsciiString(astring);
+  if(astring) {
+      FreeAsciiString(astring);
+  }
 
   return(rc);