drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* smallprint.cc (__small_vsprintf): Handle NULL PWCHAR and 

PUNICODE_STRING arguments.
	(__small_vswprintf): Ditto.
This commit is contained in:
Corinna Vinschen 2009-03-23 15:48:16 +00:00
parent 1199a53979
commit 7d2e8c04f2
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2009-03-23 Corinna Vinschen <corinna@vinschen.de>
* smallprint.cc (__small_vsprintf): Handle NULL PWCHAR and
PUNICODE_STRING arguments.
(__small_vswprintf): Ditto.
2009-03-23 Corinna Vinschen <corinna@vinschen.de> 2009-03-23 Corinna Vinschen <corinna@vinschen.de>
* include/asm/byteorder.h (__constant_ntohs): Remove declaration. * include/asm/byteorder.h (__constant_ntohs): Remove declaration.

9
winsup/cygwin/smallprint.cc
View File

@ -188,11 +188,12 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
break; break;
case 'W': case 'W':
w = va_arg (ap, PWCHAR); w = va_arg (ap, PWCHAR);
RtlInitUnicodeString (&uw, w); RtlInitUnicodeString (us = &uw, w ?: L"(null)");
us = &uw;
goto wfillin; goto wfillin;
case 'S': case 'S':
us = va_arg (ap, PUNICODE_STRING); us = va_arg (ap, PUNICODE_STRING);
if (!us)
RtlInitUnicodeString (us = &uw, L"(null)");
wfillin: wfillin:
{ {
if (!sys_wcstombs (tmp, NT_MAX_PATH, us->Buffer, if (!sys_wcstombs (tmp, NT_MAX_PATH, us->Buffer,
@ -438,10 +439,12 @@ __small_vswprintf (PWCHAR dst, const WCHAR *fmt, va_list ap)
break; break;
case L'W': case L'W':
w = va_arg (ap, PWCHAR); w = va_arg (ap, PWCHAR);
RtlInitUnicodeString (us = &uw, w); RtlInitUnicodeString (us = &uw, w ?: L"(null)");
goto fillin; goto fillin;
case L'S': case L'S':
us = va_arg (ap, PUNICODE_STRING); us = va_arg (ap, PUNICODE_STRING);
if (!us)
RtlInitUnicodeString (us = &uw, L"(null)");
fillin: fillin:
if (us->Length / sizeof (WCHAR) < n) if (us->Length / sizeof (WCHAR) < n)
n = us->Length / sizeof (WCHAR); n = us->Length / sizeof (WCHAR);