Changeset 8760 for trunk/src/gdi32/text.cpp

Timestamp:

Jun 25, 2002, 9:21:03 AM (23 years ago)

Author:

sandervl

Message:

logging updates

File:

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

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.29 2002-01-02 18:36:01 sandervl Exp $ */
+/* $Id: text.cpp,v 1.30 2002-06-25 07:21:03 sandervl Exp $ */
 
 /*
@@ -282 +282 @@
 BOOL WIN32API TextOutA(HDC hdc,int nXStart,int nYStart,LPCSTR lpszString,int cbString)
 {
-   dprintf(("GDI32: TextOutA %x (%d,%d) %d %*s", hdc, nXStart, nYStart, cbString, cbString, lpszString));
+   dprintf(("GDI32: TextOutA %x (%d,%d) %d %.*s", hdc, nXStart, nYStart, cbString, cbString, lpszString));
    return InternalTextOutA(hdc,nXStart,nYStart,0,NULL,lpszString,cbString,NULL,FALSE);
 }
@@ -289 +289 @@
 BOOL WIN32API TextOutW(HDC hdc,int nXStart,int nYStart,LPCWSTR lpszString,int cbString)
 {
-#ifdef DEBUG
-   //runtime lib ignores width specifier and also prints string until terminator is found
-   LPWSTR buggyrtl = (LPWSTR)malloc((cbString+1)*2);
-   memcpy(buggyrtl, lpszString, cbString*2);
-   buggyrtl[cbString] = 0;
-   dprintf(("GDI32: TextOutW %x (%d,%d) %d %ls", hdc, nXStart, nYStart, cbString, buggyrtl));
-   free(buggyrtl);
-#endif
+   dprintf(("GDI32: TextOutW %x (%d,%d) %d %.*ls", hdc, nXStart, nYStart, cbString, cbString, lpszString));
    return InternalTextOutW(hdc,nXStart,nYStart,0,NULL,lpszString,cbString,NULL,FALSE);
 }
@@ -337 +330 @@
 {
 #if 1
-   dprintf(("GDI32: GetTextExtentPointA %x %*s %d", hdc, cbString, lpsz, cbString));
+   dprintf(("GDI32: GetTextExtentPointA %x %.*s %d", hdc, cbString, lpsz, cbString));
 
    if(lpsz == NULL || cbString < 0 || lpsSize == NULL)
@@ -468 +461 @@
    }
 
-   dprintf(("GDI32: GetTextExtentPointW %x %x %d %x", hdc, lpString, cbString, lpSize));
+   dprintf(("GDI32: GetTextExtentPointW %x %.*ls %d %x", hdc, cbString, lpString, cbString, lpSize));
 
    astring = (char *)malloc((cbString+1)*sizeof(WCHAR));