From 90685fcf03ebb71083ccd613de677d2f47d7a2f6 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 4 Sep 2008 14:08:12 +0200
Subject: [PATCH] reg.exe: Get rid of remaining uses of Unicode macros.

---
 programs/reg/Makefile.in | 1 -
 programs/reg/reg.c       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in
index 3dc79feac86..17e8f81d164 100644
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = reg.exe
 APPMODE   = -mconsole -municode
 IMPORTS   = advapi32 user32 kernel32
-EXTRADEFS = -DUNICODE
 
 C_SRCS = reg.c
 
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 32b533f874b..043872c8d42 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -27,7 +27,7 @@ static int reg_printfW(const WCHAR *msg, ...)
     WCHAR msg_buffer[8192];
 
     va_start(va_args, msg);
-    wvsprintf(msg_buffer, msg, va_args);
+    wvsprintfW(msg_buffer, msg, va_args);
     va_end(va_args);
 
     wlen = lstrlenW(msg_buffer);
@@ -57,7 +57,7 @@ static int reg_message(int msg, ...)
     va_list va_args;
     WCHAR msg_buffer[8192];
 
-    LoadString(GetModuleHandle(NULL), msg, msg_buffer,
+    LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer,
         sizeof(msg_buffer)/sizeof(WCHAR));
     va_start(va_args, msg);
     reg_printfW(msg_buffer, va_args);