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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 12efa6135cf60e4739935697bf4791d0377b3d3d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=12efa6135cf60e4739935697bf...

Author: Andrew Nguyen <anguyen(a)codeweavers.com>
Date:   Sun Apr 18 09:10:19 2010 -0500

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

---

 dlls/kernel32/format_msg.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c
index a5426ae..4dbaf36 100644
--- a/dlls/kernel32/format_msg.c
+++ b/dlls/kernel32/format_msg.c
@@ -72,9 +72,9 @@ static const WCHAR PCNTFMTWSTR[] = { '%','%','%','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;
     WCHAR *buffer;
@@ -426,9 +426,9 @@ DWORD WINAPI FormatMessageA(
     }
     else {
         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))
-            from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId );
+            from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
         if (!from) return 0;
     }
 
@@ -514,11 +514,10 @@ DWORD WINAPI FormatMessageW(
         strcpyW( from, lpSource );
     }
     else {
-        from = NULL;
         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))
-            from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId );
+            from = load_message( kernel32_handle, dwMessageId, dwLanguageId );
         if (!from) return 0;
     }