Module: wine Branch: master Commit: 90685fcf03ebb71083ccd613de677d2f47d7a2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90685fcf03ebb71083ccd613de...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Sep 4 14:08:12 2008 +0200
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 3dc79fe..17e8f81 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 32b533f..043872c 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);