[PATCH] Use the custom vsnprintf implementation for msvcrt.vsprintf too

Sam Dennis samuel.howard.dennis at gmail.com
Tue Nov 14 05:29:18 CST 2006


> > @ cdecl vprintf(str long) MSVCRT_vprintf
> > -@ cdecl vsprintf(ptr str ptr) ntdll.vsprintf
> > +@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
>
> Looks like your mailer munged the whitespace in the patch, which will
> prevent it from applying cleanly.

Having just checked a wine-patches archive, I can be fairly sure that
the problem demonstrated in your quote actually originates in your own
mail client as all leading whitespace is present there.  The last line
of context did get wrapped though, so I'll use attachments from now
on.
-------------- next part --------------
From 27d6f5dac5a6a819f63d908825e7bbcefa903063 Mon Sep 17 00:00:00 2001
From: Sam Dennis <samuel.howard.dennis at gmail.com>
Date: Mon, 13 Nov 2006 14:58:24 +0000
Subject: [PATCH] Use the custom vsnprintf implementation for msvcrt.vsprintf too
---
 dlls/msvcrt/msvcrt.spec |    2 +-
 dlls/msvcrt/wcs.c       |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index dc78679..eaf9312 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -738,7 +738,7 @@ # extern _pwctype
 @ cdecl vfprintf(ptr str long) MSVCRT_vfprintf
 @ cdecl vfwprintf(ptr wstr long) MSVCRT_vfwprintf
 @ cdecl vprintf(str long) MSVCRT_vprintf
-@ cdecl vsprintf(ptr str ptr) ntdll.vsprintf
+@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
 @ cdecl vswprintf(ptr wstr long) MSVCRT_vswprintf
 @ cdecl vwprintf(wstr long) MSVCRT_vwprintf
 @ cdecl wcscat(wstr wstr) ntdll.wcscat
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index a7a014d..ee2174e 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -735,6 +735,14 @@ int CDECL MSVCRT_vsnprintf( char *str, u
 }
 
 /*********************************************************************
+ *		vsprintf (MSVCRT.@)
+ */
+int CDECL MSVCRT_vsprintf( char *str, const char *format, va_list valist)
+{
+    return MSVCRT_vsnprintf(str, INT_MAX, format, valist);
+}
+
+/*********************************************************************
  *		_snprintf (MSVCRT.@)
  */
 int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
-- 
1.4.1.1


More information about the wine-patches mailing list