From f76dac45b3511e31a0e93f4a84156eff3d71b015 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <weigand@informatik.uni-erlangen.de>
Date: Thu, 26 Nov 1998 14:51:57 +0000
Subject: [PATCH] Bugfix: Do *not* zero out output buffer in
 GetNumberFormat32[AW].

---
 ole/ole2nls.c | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index b25cad2f579..6b524e3a533 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -2981,19 +2981,10 @@ INT32 WINAPI GetNumberFormat32A(LCID locale, DWORD dwflags,
 			       LPCSTR lpvalue,   const NUMBERFMT32A * lpFormat,
 			       LPSTR lpNumberStr, int cchNumber)
 {
- int n;
-
  FIXME(file,"%s: stub, no reformating done\n",lpvalue);
 
- n = strlen(lpvalue);
- if (cchNumber) { 
-   strncpy(lpNumberStr,lpvalue,cchNumber);
-   if (cchNumber <= n) {
-     lpNumberStr[cchNumber-1] = 0;
-     n = cchNumber-1;
-   }
- }
- return n;
+ lstrcpyn32A( lpNumberStr, lpvalue, cchNumber );
+ return cchNumber? lstrlen32A( lpNumberStr ) : 0;
 }
 /**************************************************************************
  *              GetNumberFormat32W	(KERNEL32.xxx)
@@ -3002,19 +2993,10 @@ INT32 WINAPI GetNumberFormat32W(LCID locale, DWORD dwflags,
 			       LPCWSTR lpvalue,  const NUMBERFMT32W * lpFormat,
 			       LPWSTR lpNumberStr, int cchNumber)
 {
- int n;
-
  FIXME(file,"%s: stub, no reformating done\n",debugstr_w(lpvalue));
 
- n = lstrlen32W(lpvalue);
- if (cchNumber) { 
-   lstrcpyn32W(lpNumberStr,lpvalue,cchNumber);
-   if (cchNumber <= n) {
-     lpNumberStr[cchNumber-1] = 0;
-     n = cchNumber-1;
-   }
- }
- return n;
+ lstrcpyn32W( lpNumberStr, lpvalue, cchNumber );
+ return cchNumber? lstrlen32W( lpNumberStr ) : 0;
 }
 /******************************************************************************
  *		OLE2NLS_CheckLocale	[intern]