From 5c7f9d04ce89a5e43107174aba6612a4d56219e2 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 19 Feb 2007 13:15:28 +0000
Subject: [PATCH] Minor fixes, thanks Ged

svn path=/trunk/; revision=25841
---
 reactos/base/applications/charmap/charmap.c      | 13 +++++--------
 reactos/base/applications/charmap/charmap.rbuild |  6 ++----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 0922b6381b6..abb707fdb3d 100644
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -216,10 +216,7 @@ DlgProc(HWND hDlg,
             switch(wParam)
             {
                 case ID_ABOUT:
-                    DialogBox(hInstance,
-                              MAKEINTRESOURCE(IDD_ABOUTBOX),
-                              hDlg,
-                              AboutDialogProc);
+                    ShowAboutDlg(hDlg);
                 break;
             }
         }
@@ -234,10 +231,10 @@ DlgProc(HWND hDlg,
 
 
 INT WINAPI
-WinMain(HINSTANCE hInst,
-        HINSTANCE hPrev,
-        LPSTR Cmd,
-        int iCmd)
+_tWinMain(HINSTANCE hInst,
+          HINSTANCE hPrev,
+          LPTSTR Cmd,
+          int iCmd)
 {
     INITCOMMONCONTROLSEX iccx;
     INT Ret = 1;
diff --git a/reactos/base/applications/charmap/charmap.rbuild b/reactos/base/applications/charmap/charmap.rbuild
index 9bf80926cdc..5a747dc7a3d 100644
--- a/reactos/base/applications/charmap/charmap.rbuild
+++ b/reactos/base/applications/charmap/charmap.rbuild
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-	<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe">
-	<include base="charmap">.</include>
-		<define name="UNICODE" />
-		<define name="_UNICODE" />
+	<module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
+		<include base="charmap">.</include>
 		<define name="__REACTOS__" />
 		<define name="__USE_W32API" />
 		<define name="_WIN32_IE">0x600</define>