From b0468e7ffa654c5007453eab298a243cab5552d5 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Fri, 8 Oct 2004 20:20:15 +0000
Subject: [PATCH] call vswprintf@msvcrt in Wine's UNICODE version

svn path=/trunk/; revision=11233
---
 reactos/subsys/system/winefile/winefile.c | 24 +++++++++++++++++++----
 reactos/subsys/system/winefile/winefile.h | 18 ++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/reactos/subsys/system/winefile/winefile.c b/reactos/subsys/system/winefile/winefile.c
index 7012cd3a13e..0fa7f9ef39d 100644
--- a/reactos/subsys/system/winefile/winefile.c
+++ b/reactos/subsys/system/winefile/winefile.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <locale.h>
-#include <time.h>
-
-#define NONAMELESSUNION
 #include "winefile.h"
 
 #include "resource.h"
@@ -171,6 +167,26 @@ extern int call_stat(
 	unsigned long* plinks
 );
 
+/* call vswprintf() in msvcrt.dll */
+int swprintf(wchar_t* buffer, const wchar_t* fmt, ...)
+{
+	static int (__cdecl *vswprintf)(wchar_t*, const wchar_t*, va_list);
+
+	va_list ap;
+	int ret;
+
+	if (!vswprintf) {
+		HMODULE hmod = LoadLibraryA("msvcrt");
+		vswprintf = (int(__cdecl*)(wchar_t*,const wchar_t*,va_list)) GetProcAddress(hmod, "vswprintf");
+	}
+
+	va_start(ap, fmt);
+	ret = vswprintf(buffer, fmt, ap);
+	va_end(ap);
+
+	return 0;
+}
+
 #endif
 
 
diff --git a/reactos/subsys/system/winefile/winefile.h b/reactos/subsys/system/winefile/winefile.h
index 94a0984b086..cdc847f6c14 100644
--- a/reactos/subsys/system/winefile/winefile.h
+++ b/reactos/subsys/system/winefile/winefile.h
@@ -28,19 +28,23 @@
 #define NOIMAGE
 #define NOTAPE
 
-#ifdef UNICODE
-#define	_UNICODE
-#include <wchar.h>
-#endif
-#include <tchar.h>
-
+#define NONAMELESSUNION
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <commdlg.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <locale.h>
+#include <time.h>
+
+#ifdef UNICODE
+#define _UNICODE
+#include <wchar.h>
+#endif
+#include <tchar.h>
 
 #ifdef _MSC_VER
 #include <malloc.h>	/* for alloca() */
@@ -52,7 +56,7 @@
 #include <objbase.h>
 #include <shellapi.h>
 #include <shlobj.h>
-#endif
+#endif /* _NO_EXTENSIONS */
 
 #ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
 #define FILE_ATTRIBUTE_ENCRYPTED            0x00000040