From 618eb75c49981dda7475fcb9374084a796dea67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Thu, 8 May 2008 18:26:15 +0000
Subject: [PATCH] Fix some various unicode problems

svn path=/trunk/; revision=33380
---
 reactos/base/applications/dxdiag/dxdiag.c     | 8 ++++----
 reactos/base/applications/sndvol32/sndvol32.c | 8 ++++----
 reactos/base/services/eventlog/eventlog.c     | 2 +-
 reactos/base/services/umpnpmgr/umpnpmgr.c     | 2 +-
 reactos/base/setup/vmwinst/vmwinst.c          | 4 ++--
 reactos/base/system/lsass/lsass.c             | 4 ++--
 reactos/base/system/regsvr32/regsvr32.c       | 4 ++--
 reactos/base/system/rundll32/rundll32.c       | 4 ++--
 reactos/boot/freeldr/fdebug/fdebug.c          | 8 ++++----
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/reactos/base/applications/dxdiag/dxdiag.c b/reactos/base/applications/dxdiag/dxdiag.c
index 5b2cd3d0e06..0e6330d3b0d 100644
--- a/reactos/base/applications/dxdiag/dxdiag.c
+++ b/reactos/base/applications/dxdiag/dxdiag.c
@@ -220,10 +220,10 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
     return 0;
 }
 
-int APIENTRY WinMain(HINSTANCE hInstance,
-                     HINSTANCE hPrevInstance,
-                     LPSTR     lpCmdLine,
-                     int       nCmdShow)
+int APIENTRY wWinMain(HINSTANCE hInstance,
+                      HINSTANCE hPrevInstance,
+                      LPWSTR     lpCmdLine,
+                      int       nCmdShow)
 {
 
     INITCOMMONCONTROLSEX InitControls;
diff --git a/reactos/base/applications/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c
index 4ece4a06f2e..52d3e099ed4 100644
--- a/reactos/base/applications/sndvol32/sndvol32.c
+++ b/reactos/base/applications/sndvol32/sndvol32.c
@@ -798,10 +798,10 @@ CreateApplicationWindow(VOID)
 }
 
 int WINAPI
-WinMain(HINSTANCE hInstance,
-        HINSTANCE hPrevInstance,
-        LPSTR lpszCmdLine,
-        int nCmdShow)
+_tWinMain(HINSTANCE hInstance,
+          HINSTANCE hPrevInstance,
+          LPTSTR lpszCmdLine,
+          int nCmdShow)
 {
     MSG Msg;
     int Ret = 1;
diff --git a/reactos/base/services/eventlog/eventlog.c b/reactos/base/services/eventlog/eventlog.c
index fc6489c5212..8582e9472ad 100644
--- a/reactos/base/services/eventlog/eventlog.c
+++ b/reactos/base/services/eventlog/eventlog.c
@@ -185,7 +185,7 @@ BOOL LoadLogFiles(HKEY eventlogKey)
     return TRUE;
 }
 
-INT main()
+INT wmain()
 {
     WCHAR LogPath[MAX_PATH];
     INT RetCode = 0;
diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index 8bc40719980..0a0962ce8ff 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -2191,7 +2191,7 @@ ServiceMain(DWORD argc, LPTSTR *argv)
 
 
 int
-main(int argc, char *argv[])
+wmain(int argc, WCHAR *argv[])
 {
     DWORD dwError;
 
diff --git a/reactos/base/setup/vmwinst/vmwinst.c b/reactos/base/setup/vmwinst/vmwinst.c
index 23c89b8b401..0269195eeba 100644
--- a/reactos/base/setup/vmwinst/vmwinst.c
+++ b/reactos/base/setup/vmwinst/vmwinst.c
@@ -1030,9 +1030,9 @@ CreateWizard(VOID)
 }
 
 int WINAPI
-WinMain(HINSTANCE hInstance,
+wWinMain(HINSTANCE hInstance,
 	HINSTANCE hPrevInstance,
-	LPSTR lpszCmdLine,
+	LPWSTR lpszCmdLine,
 	int nCmdShow)
 {
 
diff --git a/reactos/base/system/lsass/lsass.c b/reactos/base/system/lsass/lsass.c
index d5005c68096..50bb405d426 100644
--- a/reactos/base/system/lsass/lsass.c
+++ b/reactos/base/system/lsass/lsass.c
@@ -55,10 +55,10 @@ ServiceMain(
 }
 
 INT WINAPI
-WinMain(
+wWinMain(
 	IN HINSTANCE hInstance,
 	IN HINSTANCE hPrevInstance,
-	IN LPSTR lpCmdLine,
+	IN LPWSTR lpCmdLine,
 	IN INT nShowCmd)
 {
 	NTSTATUS Status = STATUS_SUCCESS;
diff --git a/reactos/base/system/regsvr32/regsvr32.c b/reactos/base/system/regsvr32/regsvr32.c
index 11d871e1a8c..581e3c04525 100644
--- a/reactos/base/system/regsvr32/regsvr32.c
+++ b/reactos/base/system/regsvr32/regsvr32.c
@@ -247,10 +247,10 @@ void DisplayMessage(BOOL bConsole, BOOL bSilent, LPCTSTR lpMessage, LPCTSTR lpTi
 		_tprintf(_T("%s: %s\n\n"),lpTitle,lpMessage);
 }
 
-int WINAPI WinMain(
+int WINAPI _tWinMain(
   HINSTANCE hInstance,
   HINSTANCE hPrevInstance,
-  LPSTR lpCmdLineA,
+  LPTSTR lpCmdLine,
   int nCmdShow
 )
 {
diff --git a/reactos/base/system/rundll32/rundll32.c b/reactos/base/system/rundll32/rundll32.c
index 74b103d2d3e..834c4f44c60 100644
--- a/reactos/base/system/rundll32/rundll32.c
+++ b/reactos/base/system/rundll32/rundll32.c
@@ -331,10 +331,10 @@ ATOM RegisterBlankClass(HINSTANCE hInstance, HINSTANCE hPrevInstance)
     return Ret;
 }
 
-int WINAPI WinMain(
+int WINAPI _tWinMain(
   HINSTANCE hInstance,
   HINSTANCE hPrevInstance,
-  LPSTR lpCmdLineA,
+  LPTSTR lpCmdLine,
   int nCmdShow
 )
 {
diff --git a/reactos/boot/freeldr/fdebug/fdebug.c b/reactos/boot/freeldr/fdebug/fdebug.c
index a07ffb8be35..47143f71c5c 100644
--- a/reactos/boot/freeldr/fdebug/fdebug.c
+++ b/reactos/boot/freeldr/fdebug/fdebug.c
@@ -39,10 +39,10 @@ VOID				EnableFileMenuItemByID(UINT Id, BOOL Enable);
 VOID				CheckLocalEchoMenuItem(BOOL Checked);
 VOID				Rs232Thread(VOID* Parameter);
 
-int APIENTRY WinMain(HINSTANCE hInstance,
-                     HINSTANCE hPrevInstance,
-                     LPSTR     lpCmdLine,
-                     int       nCmdShow)
+int APIENTRY _tWinMain(HINSTANCE hInstance,
+                       HINSTANCE hPrevInstance,
+                       LPTSTR     lpCmdLine,
+                       int       nCmdShow)
 {
  	// TODO: Place code here.
 	MSG msg;