[ros-diffs] [tkreuzer] 38204: TextOut functions take a character count, not a byte count. Rename cb to cch.

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sat Dec 20 15:19:43 2008
New Revision: 38204

URL: http://svn.reactos.org/svn/reactos?rev=38204&view=rev
Log:
TextOut functions take a character count, not a byte count. Rename cb to cch.

Modified:
    trunk/reactos/dll/win32/gdi32/objects/text.c

Modified: trunk/reactos/dll/win32/gdi32/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/text.c?rev=38204&r1=38203&r2=38204&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Sat Dec 20 15:19:43 2008
@@ -12,7 +12,7 @@
 	int  nXStart,
 	int  nYStart,
 	LPCSTR  lpString,
-	int  cbString)
+	int  cchString)
 {
         ANSI_STRING StringA;
         UNICODE_STRING StringU;
@@ -25,7 +25,7 @@
 	} else
 		StringU.Buffer = NULL;
 
-	ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cbString);
+	ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cchString);
 	RtlFreeUnicodeString(&StringU);
 	return ret;
 }
@@ -41,9 +41,9 @@
 	int  nXStart,
 	int  nYStart,
 	LPCWSTR  lpString,
-	int  cbString)
-{
-  return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cbString, NULL, 0);
+	int  cchString)
+{
+  return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0);
 }
 
 
@@ -143,7 +143,7 @@
 GetTextExtentPointA(
 	HDC		hdc,
 	LPCSTR		lpString,
-	int		cbString,
+	int		cchString,
 	LPSIZE		lpSize
 	)
 {
@@ -154,7 +154,7 @@
 	RtlInitAnsiString(&StringA, (LPSTR)lpString);
 	RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
 
-        ret = GetTextExtentPointW(hdc, StringU.Buffer, cbString, lpSize);
+        ret = GetTextExtentPointW(hdc, StringU.Buffer, cchString, lpSize);
 
 	RtlFreeUnicodeString(&StringU);
 
@@ -170,11 +170,11 @@
 GetTextExtentPointW(
 	HDC		hdc,
 	LPCWSTR		lpString,
-	int		cbString,
+	int		cchString,
 	LPSIZE		lpSize
 	)
 {
-  return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0);
+  return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0);
 }
 
 
@@ -184,13 +184,13 @@
 BOOL
 APIENTRY
 GetTextExtentExPointW(
-	HDC		hdc,
-	LPCWSTR		lpszStr,
-	int		cchString,
-	int		nMaxExtent,
-	LPINT		lpnFit,
-	LPINT		alpDx,
-	LPSIZE		lpSize
+	HDC     hdc,
+	LPCWSTR lpszStr,
+	int     cchString,
+	int     nMaxExtent,
+	LPINT   lpnFit,
+	LPINT   alpDx,
+	LPSIZE  lpSize
 	)
 {
   return NtGdiGetTextExtentExW (
@@ -240,7 +240,7 @@
 GetTextExtentPoint32A(
 	HDC		hdc,
 	LPCSTR		lpString,
-	int		cbString,
+	int		cchString,
 	LPSIZE		lpSize
 	)
 {
@@ -251,7 +251,7 @@
   RtlInitAnsiString(&StringA, (LPSTR)lpString);
   RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
 
-  ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cbString, lpSize);
+  ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cchString, lpSize);
 
   RtlFreeUnicodeString(&StringU);
 
@@ -267,11 +267,11 @@
 GetTextExtentPoint32W(
 	HDC		hdc,
 	LPCWSTR		lpString,
-	int		cbString,
+	int		cchString,
 	LPSIZE		lpSize
 	)
 {
-	return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0);
+	return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0);
 }
 
 /*
@@ -315,7 +315,7 @@
 	UINT		fuOptions,
 	CONST RECT	*lprc,
 	LPCSTR		lpString,
-	UINT		cbCount,
+	UINT		cchString,
 	CONST INT	*lpDx
 	)
 {
@@ -326,7 +326,7 @@
 	RtlInitAnsiString(&StringA, (LPSTR)lpString);
 	RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
 
-        ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cbCount, lpDx);
+        ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cchString, lpDx);
 
 	RtlFreeUnicodeString(&StringU);
 
@@ -346,11 +346,11 @@
 	UINT		fuOptions,
 	CONST RECT	*lprc,
 	LPCWSTR		lpString,
-	UINT		cbCount,
+	UINT		cchString,
 	CONST INT	*lpDx
 	)
 {
-  return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cbCount, (LPINT)lpDx, 0);
+  return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cchString, (LPINT)lpDx, 0);
 }