From fa0bed7eab17e18d8f2a6bd94f4b30017e74bf6b Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Mon, 11 Aug 2003 05:58:02 +0000
Subject: [PATCH] Clean up warning redefined RT_MESSAGETABLEW, and int w/o a
 cast at line 500.

svn path=/trunk/; revision=5523
---
 reactos/lib/kernel32/misc/errormsg.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/lib/kernel32/misc/errormsg.c b/reactos/lib/kernel32/misc/errormsg.c
index 302c0afe6c4..5ce86307fe4 100644
--- a/reactos/lib/kernel32/misc/errormsg.c
+++ b/reactos/lib/kernel32/misc/errormsg.c
@@ -1,4 +1,4 @@
-/* $Id: errormsg.c,v 1.7 2003/08/07 04:03:23 royce Exp $
+/* $Id: errormsg.c,v 1.8 2003/08/11 05:58:02 jimtabor Exp $
  *
  * reactos/lib/kernel32/misc/errormsg.c
  *
@@ -99,7 +99,7 @@ typedef struct tagMESSAGE_RESOURCE_DATA {
 //#define RT_RCDATAW         MAKEINTRESOURCEW(10)
 ////#define RT_RCDATA            WINELIB_NAME_AW(RT_RCDATA)
 //#define RT_MESSAGETABLEA   MAKEINTRESOURCEA(11)
-#define RT_MESSAGETABLEW   MAKEINTRESOURCEW(11)
+//#define RT_MESSAGETABLEW   MAKEINTRESOURCEW(11)
 ////#define RT_MESSAGETABLE       WINELIB_NAME_AW(RT_MESSAGETABLE)
 
 /* Messages...used by FormatMessage32* (KERNEL32.something)
@@ -497,7 +497,7 @@ DWORD WINAPI FormatMessageW(
     }
     from = NULL;
     if (dwFlags & FORMAT_MESSAGE_FROM_STRING) {
-        from = HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource);
+        from = (LPSTR)HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource);
     }
     else {
         bufsize = 0;