From 4f2a8ebce41d37cebb5b2cd879a37cabe1064c4e Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 2 Aug 2007 06:59:36 +0000
Subject: [PATCH] Fix compiling rostests

svn path=/trunk/; revision=28096
---
 reactos/base/shell/cmd/cmd.c      |  2 +-
 reactos/base/shell/cmd/cmd.h      |  1 +
 reactos/base/shell/cmd/cmd.rbuild | 23 +++++++++++++++++------
 reactos/base/shell/cmd/main.c     |  6 ++++++
 reactos/base/shell/cmd/precomp.h  |  4 ++++
 5 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 reactos/base/shell/cmd/main.c

diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c
index 4c5a870459f..cdaa3f51bdf 100644
--- a/reactos/base/shell/cmd/cmd.c
+++ b/reactos/base/shell/cmd/cmd.c
@@ -1836,7 +1836,7 @@ static VOID Cleanup (int argc, const TCHAR *argv[])
 /*
  * main function
  */
-int _tmain (int argc, const TCHAR *argv[])
+int cmd_main (int argc, const TCHAR *argv[])
 {
 	TCHAR startPath[MAX_PATH];
 	CONSOLE_SCREEN_BUFFER_INFO Info;
diff --git a/reactos/base/shell/cmd/cmd.h b/reactos/base/shell/cmd/cmd.h
index 04293d78f16..f21ca8c8b21 100644
--- a/reactos/base/shell/cmd/cmd.h
+++ b/reactos/base/shell/cmd/cmd.h
@@ -101,6 +101,7 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName );
 VOID AddBreakHandler (VOID);
 VOID RemoveBreakHandler (VOID);
 VOID DoCommand (LPTSTR line);
+int cmd_main (int argc, const TCHAR *argv[]);
 
 extern HANDLE CMD_ModuleHandle;
 
diff --git a/reactos/base/shell/cmd/cmd.rbuild b/reactos/base/shell/cmd/cmd.rbuild
index 2879a4691ad..02ccb1eb647 100644
--- a/reactos/base/shell/cmd/cmd.rbuild
+++ b/reactos/base/shell/cmd/cmd.rbuild
@@ -1,14 +1,12 @@
-<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes">
+<module name="cmd_base" type="objectlibrary">
 	<include base="ReactOS">include/reactos/wine</include>
-	<include base="cmd">.</include>
+	<include base="cmd_base">.</include>
 	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="_DEBUG_MEM" />
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>shell32</library>
-	<library>user32</library>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
 	<pch>precomp.h</pch>
 	<compilationunit name="unit.c">
 		<file>alias.c</file>
@@ -66,5 +64,18 @@
 		<file>where.c</file>
 		<file>window.c</file>
 	</compilationunit>
+</module>
+<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes">
+	<include base="ReactOS">include/reactos/wine</include>
+	<include base="cmd">.</include>
+	<define name="__USE_W32API" />
+	<define name="ANONYMOUSUNIONS" />
+	<define name="_WIN32_WINNT">0x0501</define>
+	<library>cmd_base</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<library>user32</library>
 	<file>cmd.rc</file>
+	<file>main.c</file>
 </module>
\ No newline at end of file
diff --git a/reactos/base/shell/cmd/main.c b/reactos/base/shell/cmd/main.c
new file mode 100644
index 00000000000..0320cce8128
--- /dev/null
+++ b/reactos/base/shell/cmd/main.c
@@ -0,0 +1,6 @@
+#include <precomp.h>
+
+int _tmain (int argc, const TCHAR *argv[])
+{
+    return cmd_main(argc, argv);
+}
diff --git a/reactos/base/shell/cmd/precomp.h b/reactos/base/shell/cmd/precomp.h
index 0c27a62d07e..b986fb63084 100644
--- a/reactos/base/shell/cmd/precomp.h
+++ b/reactos/base/shell/cmd/precomp.h
@@ -1,3 +1,6 @@
+#ifndef __CMD_PRECOMP_H
+#define __CMD_PRECOMP_H
+
 #ifdef _MSC_VER
 #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */
 #undef _CRT_SECURE_NO_DEPRECATE
@@ -32,3 +35,4 @@
 
 #include <reactos/resource.h>
 
+#endif /* __CMD_PRECOMP_H */