[ros-diffs] [chorns] 16608: Prepare cmd for testing
chorns at svn.reactos.com
chorns at svn.reactos.com
Sun Jul 17 12:57:58 CEST 2005
Prepare cmd for testing
Modified: trunk/reactos/subsys/system/cmd/cmd.c
Modified: trunk/reactos/subsys/system/cmd/cmd.xml
Added: trunk/reactos/subsys/system/cmd/main.c
Added: trunk/reactos/subsys/system/cmd/tests/
Added: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml
Added: trunk/reactos/subsys/system/cmd/tests/setup.c
Added: trunk/reactos/subsys/system/cmd/tests/stubs.xml
_____
Modified: trunk/reactos/subsys/system/cmd/cmd.c
--- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-17 10:40:43 UTC
(rev 16607)
+++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-17 10:57:38 UTC
(rev 16608)
@@ -1528,9 +1528,9 @@
* main function
*/
#ifdef _UNICODE
-int main(void)
+int _main(void)
#else
-int main (int argc, char *argv[])
+int _main (int argc, char *argv[])
#endif
{
CONSOLE_SCREEN_BUFFER_INFO Info;
_____
Modified: trunk/reactos/subsys/system/cmd/cmd.xml
--- trunk/reactos/subsys/system/cmd/cmd.xml 2005-07-17 10:40:43 UTC
(rev 16607)
+++ trunk/reactos/subsys/system/cmd/cmd.xml 2005-07-17 10:57:38 UTC
(rev 16608)
@@ -1,10 +1,9 @@
-<module name="cmd" type="win32cui" installbase="system32"
installname="cmd.exe" usewrc="false">
+<module name="cmd_base" type="objectlibrary">
<include base="ReactOS">include/wine</include>
- <include base="cmd">.</include>
+ <include base="cmd_base">.</include>
<define name="__USE_W32API" />
<define name="ANONYMOUSUNIONS" />
<define name="_WIN32_WINNT">0x0501</define>
- <library>kernel32</library>
<pch>precomp.h</pch>
<file>alias.c</file>
<file>attrib.c</file>
@@ -59,5 +58,18 @@
<file>vol.c</file>
<file>where.c</file>
<file>window.c</file>
+</module>
+<module name="cmd" type="win32cui" installbase="system32"
installname="cmd.exe" usewrc="false">
+ <include base="ReactOS">include/wine</include>
+ <include base="cmd">.</include>
+ <define name="__USE_W32API" />
+ <define name="ANONYMOUSUNIONS" />
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>kernel32</library>
+ <library>cmd_base</library>
+ <file>main.c</file>
<file>cmd.rc</file>
</module>
+<directory name="tests">
+ <xi:include href="tests/cmd_test.xml" />
+</directory>
_____
Added: trunk/reactos/subsys/system/cmd/main.c
--- trunk/reactos/subsys/system/cmd/main.c 2005-07-17 10:40:43 UTC
(rev 16607)
+++ trunk/reactos/subsys/system/cmd/main.c 2005-07-17 10:57:38 UTC
(rev 16608)
@@ -0,0 +1,26 @@
+#include <precomp.h>
+#include "resource.h"
+
+#ifdef _UNICODE
+extern int _main (void);
+#else
+extern int _main (int argc, char *argv[]);
+#endif
+
+/*
+ * main function
+ */
+#ifdef _UNICODE
+int main(void)
+#else
+int main (int argc, char *argv[])
+#endif
+{
+#ifdef _UNICODE
+ return _main(void);
+#else
+ return _main(argc, argv);
+#endif
+}
+
+/* EOF */
Property changes on: trunk/reactos/subsys/system/cmd/main.c
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Added: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml
--- trunk/reactos/subsys/system/cmd/tests/cmd_test.xml 2005-07-17
10:40:43 UTC (rev 16607)
+++ trunk/reactos/subsys/system/cmd/tests/cmd_test.xml 2005-07-17
10:57:38 UTC (rev 16608)
@@ -0,0 +1,15 @@
+<module name="cmd_test" type="test">
+ <include base="rtshared">.</include>
+ <include base="ReactOS">include/wine</include>
+ <include base="cmd">.</include>
+ <define name="__USE_W32API" />
+ <define name="ANONYMOUSUNIONS" />
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>rtshared</library>
+ <library>regtests</library>
+ <library>cmd_base</library>
+ <library>pseh</library>
+ <library>ntdll</library>
+ <file>setup.c</file>
+ <xi:include href="stubs.xml" />
+</module>
Property changes on: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Added: trunk/reactos/subsys/system/cmd/tests/setup.c
--- trunk/reactos/subsys/system/cmd/tests/setup.c 2005-07-17
10:40:43 UTC (rev 16607)
+++ trunk/reactos/subsys/system/cmd/tests/setup.c 2005-07-17
10:57:38 UTC (rev 16608)
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2005 Casper S. Hornstrup
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <windows.h>
+#include "regtests.h"
+
+_SetupOnce()
+{
+}
Property changes on: trunk/reactos/subsys/system/cmd/tests/setup.c
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Added: trunk/reactos/subsys/system/cmd/tests/stubs.xml
--- trunk/reactos/subsys/system/cmd/tests/stubs.xml 2005-07-17
10:40:43 UTC (rev 16607)
+++ trunk/reactos/subsys/system/cmd/tests/stubs.xml 2005-07-17
10:57:38 UTC (rev 16608)
@@ -0,0 +1,84 @@
+<component name="kernel32.dll">
+ <symbol>FindFirstFileA at 8</symbol>
+ <symbol>GetLastError at 0</symbol>
+ <symbol>FindNextFileA at 8</symbol>
+ <symbol>FindClose at 4</symbol>
+ <symbol>GetFileAttributesA at 4</symbol>
+ <symbol>GetCurrentDirectoryA at 8</symbol>
+ <symbol>GetFullPathNameA at 16</symbol>
+ <symbol>CloseHandle at 4</symbol>
+ <symbol>CreateFileA at 28</symbol>
+ <symbol>Beep at 8</symbol>
+ <symbol>LoadStringA at 16</symbol>
+ <symbol>SetConsoleCP at 4</symbol>
+ <symbol>SetConsoleOutputCP at 4</symbol>
+ <symbol>WaitForSingleObject at 8</symbol>
+ <symbol>ReadConsoleInputA at 16</symbol>
+ <symbol>GetTickCount at 0</symbol>
+ <symbol>GetConsoleScreenBufferInfo at 8</symbol>
+ <symbol>FillConsoleOutputAttribute at 20</symbol>
+ <symbol>FillConsoleOutputCharacterA at 20</symbol>
+ <symbol>SetConsoleCursorPosition at 8</symbol>
+ <symbol>LoadLibraryA at 4</symbol>
+ <symbol>GetProcAddress at 8</symbol>
+ <symbol>SetCurrentDirectoryA at 4</symbol>
+ <symbol>SetConsoleMode at 8</symbol>
+ <symbol>CreateProcessA at 40</symbol>
+ <symbol>GetExitCodeProcess at 8</symbol>
+ <symbol>GetConsoleOutputCP at 0</symbol>
+ <symbol>GetTempPathA at 8</symbol>
+ <symbol>GetTempFileNameA at 16</symbol>
+ <symbol>GetCurrentProcess at 0</symbol>
+ <symbol>DuplicateHandle at 28</symbol>
+ <symbol>GetFileType at 4</symbol>
+ <symbol>SetFilePointer at 16</symbol>
+ <symbol>GetTimeFormatA at 24</symbol>
+ <symbol>GetDateFormatA at 24</symbol>
+ <symbol>GetEnvironmentVariableA at 12</symbol>
+ <symbol>GenerateConsoleCtrlEvent at 8</symbol>
+ <symbol>SetConsoleCtrlHandler at 8</symbol>
+ <symbol>GetVersionExA at 4</symbol>
+ <symbol>ExitProcess at 4</symbol>
+ <symbol>GetModuleFileNameA at 12</symbol>
+ <symbol>SetEnvironmentVariableA at 8</symbol>
+ <symbol>SetConsoleTextAttribute at 8</symbol>
+ <symbol>FlushConsoleInputBuffer at 4</symbol>
+ <symbol>WriteFile at 20</symbol>
+ <symbol>FormatMessageA at 28</symbol>
+ <symbol>LocalFree at 4</symbol>
+ <symbol>GetConsoleCP at 0</symbol>
+ <symbol>GetStdHandle at 4</symbol>
+ <symbol>FreeLibrary at 4</symbol>
+ <symbol>SetLastError at 4</symbol>
+ <symbol>SetStdHandle at 8</symbol>
+ <symbol>DeleteFileA at 4</symbol>
+ <symbol>FileTimeToLocalFileTime at 8</symbol>
+ <symbol>GetVolumeInformationA at 32</symbol>
+ <symbol>RemoveDirectoryA at 4</symbol>
+ <symbol>CreateDirectoryA at 8</symbol>
+ <symbol>GetLocaleInfoA at 16</symbol>
+ <symbol>GlobalMemoryStatus at 4</symbol>
+ <symbol>GetEnvironmentStrings at 0</symbol>
+ <symbol>FreeEnvironmentStringsA at 4</symbol>
+ <symbol>LocalFree</symbol>
+ <symbol>SetLocalTime at 4</symbol>
+ <symbol>GetLocalTime at 4</symbol>
+ <symbol>SetFileAttributesA at 8</symbol>
+ <symbol>SetFileApisToOEM at 0</symbol>
+ <symbol>GetConsoleMode at 8</symbol>
+ <symbol>SetConsoleCursorInfo at 8</symbol>
+ <symbol>ReadFile at 20</symbol>
+ <symbol>SetFileTime at 16</symbol>
+ <symbol>FileTimeToSystemTime at 8</symbol>
+ <symbol>GetDiskFreeSpaceA at 20</symbol>
+ <symbol>SetVolumeLabelA at 8</symbol>
+ <symbol>SetConsoleTitleA at 4</symbol>
+ <symbol>MoveFileExA at 12</symbol>
+ <symbol>GetFileTime at 16</symbol>
+ <symbol>Sleep at 4</symbol>
+ <symbol>MoveFileA at 8</symbol>
+ <symbol>CreateSemaphoreA at 16</symbol>
+ <symbol>InterlockedIncrement at 4</symbol>
+ <symbol>InterlockedDecrement at 4</symbol>
+ <symbol>ReleaseSemaphore at 12</symbol>
+</component>
Property changes on: trunk/reactos/subsys/system/cmd/tests/stubs.xml
___________________________________________________________________
Name: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050717/e890384b/attachment.html
More information about the Ros-diffs
mailing list