ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Rename the load_message helper to reflect its sole handling of Unicode strings.

Browse Source
This commit is contained in:
Andrew Nguyen 2010-04-18 09:10:19 -05:00 committed by Alexandre Julliard
parent 43436f64d8
commit 12efa6135c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/kernel32/format_msg.c
View File

@ -72,9 +72,9 @@ static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 };
static const WCHAR FMTWSTR[] = { '%','s',0 }; static const WCHAR FMTWSTR[] = { '%','s',0 };
/********************************************************************** /**********************************************************************
* load_messageW (internal) * load_message (internal)
*/ */
static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) static LPWSTR load_message( HMODULE module, UINT id, WORD lang )
{ {
const MESSAGE_RESOURCE_ENTRY *mre; const MESSAGE_RESOURCE_ENTRY *mre;
WCHAR *buffer; WCHAR *buffer;
@ -426,9 +426,9 @@ DWORD WINAPI FormatMessageA(
} }
else { else {
if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)
from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId );
if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM))
from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
if (!from) return 0; if (!from) return 0;
} }
@ -514,11 +514,10 @@ DWORD WINAPI FormatMessageW(
strcpyW( from, lpSource ); strcpyW( from, lpSource );
} }
else { else {
from = NULL;
if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)
from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId );
if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM))
from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
if (!from) return 0; if (!from) return 0;
} }