[ros-diffs] [janderwald] 24501: - add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system - fix includes in those modules
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Fri Oct 13 12:56:52 CEST 2006
Author: janderwald
Date: Fri Oct 13 14:56:52 2006
New Revision: 24501
URL: http://svn.reactos.org/svn/reactos?rev=24501&view=rev
Log:
- add cat, load, unload, infinst, nts2w32err, objdir, partinfo to build system
- fix includes in those modules
Added:
trunk/reactos/base/applications/utils/cat/cat.rbuild (with props)
trunk/reactos/base/applications/utils/driver/driver.rbuild (with props)
trunk/reactos/base/applications/utils/driver/load/load.rbuild (with props)
trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (with props)
trunk/reactos/base/applications/utils/infinst/infinst.rbuild (with props)
trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (with props)
trunk/reactos/base/applications/utils/objdir/objdir.rbuild (with props)
trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (with props)
Modified:
trunk/reactos/base/applications/utils/driver/load/load.c
trunk/reactos/base/applications/utils/driver/unload/unload.c
trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c
trunk/reactos/base/applications/utils/objdir/objdir.c
trunk/reactos/base/applications/utils/partinfo/partinfo.c
trunk/reactos/base/applications/utils/utils.rbuild
Added: trunk/reactos/base/applications/utils/cat/cat.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/cat/cat.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/cat/cat.rbuild (added)
+++ trunk/reactos/base/applications/utils/cat/cat.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,7 @@
+<module name="cat" type="win32cui" installbase="bin" installname="cat.exe" >
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <file>cat.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/cat/cat.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/utils/driver/driver.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/driver/driver.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/driver/driver.rbuild (added)
+++ trunk/reactos/base/applications/utils/driver/driver.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,8 @@
+<group>
+<directory name="load">
+ <xi:include href="load/load.rbuild" />
+</directory>
+<directory name="unload">
+ <xi:include href="unload/unload.rbuild" />
+</directory>
+</group>
Propchange: trunk/reactos/base/applications/utils/driver/driver.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/driver/load/load.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/driver/load/load.c?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/driver/load/load.c (original)
+++ trunk/reactos/base/applications/utils/driver/load/load.c Fri Oct 13 14:56:52 2006
@@ -1,31 +1,32 @@
/*
* Load a device driver
*/
+#define WIN32_NO_STATUS
#include <windows.h>
-#include <ntos/zw.h>
+#include <stdlib.h>
+#include <ntndk.h>
-int
-main(int argc, char *argv[])
+int wmain(int argc, WCHAR * argv[])
{
NTSTATUS Status;
UNICODE_STRING ServiceName;
if (argc != 2)
{
- printf("Usage: load <ServiceName>\n");
+ wprintf(L"Usage: load <ServiceName>\n");
return 0;
}
- ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR);
+ ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR);
ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL));
wsprintf(ServiceName.Buffer,
L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S",
argv[1]);
- wprintf(L"%s %d %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer));
+ wprintf(L"%s %u %d\n", ServiceName.Buffer, ServiceName.Length, wcslen(ServiceName.Buffer));
Status = NtLoadDriver(&ServiceName);
free(ServiceName.Buffer);
if (!NT_SUCCESS(Status))
{
- printf("Failed: %X\n", Status);
+ wprintf(L"Failed: %x\n", Status);
return 1;
}
return 0;
Added: trunk/reactos/base/applications/utils/driver/load/load.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/driver/load/load.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/driver/load/load.rbuild (added)
+++ trunk/reactos/base/applications/utils/driver/load/load.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,8 @@
+<module name="load" type="win32cui" installbase="bin" installname="load.exe" unicode="true" >
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <library>user32</library>
+ <file>load.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/driver/load/load.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/driver/unload/unload.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/driver/unload/unload.c?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/driver/unload/unload.c (original)
+++ trunk/reactos/base/applications/utils/driver/unload/unload.c Fri Oct 13 14:56:52 2006
@@ -1,21 +1,22 @@
/*
* Unload a device driver
*/
+#define WIN32_NO_STATUS
#include <windows.h>
-#include <ntos/zw.h>
+#include <stdlib.h>
+#include <ntndk.h>
-int
-main(int argc, char *argv[])
+int wmain(int argc, WCHAR * argv[])
{
NTSTATUS Status;
UNICODE_STRING ServiceName;
if (argc != 2)
{
- printf("Usage: unload <ServiceName>\n");
+ wprintf(L"Usage: unload <ServiceName>\n");
return 0;
}
- ServiceName.Length = (strlen(argv[1]) + 52) * sizeof(WCHAR);
+ ServiceName.Length = (wcslen(argv[1]) + 52) * sizeof(WCHAR);
ServiceName.Buffer = (LPWSTR)malloc(ServiceName.Length + sizeof(UNICODE_NULL));
wsprintf(ServiceName.Buffer,
L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\%S",
@@ -25,7 +26,7 @@
free(ServiceName.Buffer);
if (!NT_SUCCESS(Status))
{
- printf("Failed: %X\n", Status);
+ wprintf(L"Failed: %X\n", Status);
return 1;
}
return 0;
Added: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/driver/unload/unload.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/driver/unload/unload.rbuild (added)
+++ trunk/reactos/base/applications/utils/driver/unload/unload.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,8 @@
+<module name="unload" type="win32cui" installbase="bin" installname="unload.exe" unicode="true">
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <library>user32</library>
+ <file>unload.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/driver/unload/unload.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/utils/infinst/infinst.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/infinst/infinst.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/infinst/infinst.rbuild (added)
+++ trunk/reactos/base/applications/utils/infinst/infinst.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,10 @@
+<module name="infinst" type="win32cui" installbase="bin" installname="infinst.exe" >
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <library>user32</library>
+ <library>setupapi</library>
+ <library>comdlg32</library>
+ <file>infinst.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/infinst/infinst.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c (original)
+++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.c Fri Oct 13 14:56:52 2006
@@ -12,9 +12,10 @@
* 2004-01-10 Emanuele Aliberti
*
*/
+#define WIN32_NO_STATUS
#include <windows.h>
-#include <ntddk.h>
-
+#include <stdlib.h>
+#include <ntndk.h>
#include <stdio.h>
int main (int argc, char * argv [])
Added: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild (added)
+++ trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,7 @@
+<module name="nts2w32err" type="win32cui" installbase="bin" installname="nts2w32err.exe" >
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <file>nts2w32err.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/objdir/objdir.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/objdir/objdir.c?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/objdir/objdir.c (original)
+++ trunk/reactos/base/applications/utils/objdir/objdir.c Fri Oct 13 14:56:52 2006
@@ -17,11 +17,11 @@
* Added -r option.
*/
-#include <ntddk.h>
-#include <stdarg.h>
-#include <string.h>
+#define WIN32_NO_STATUS
+#include <windows.h>
+#include <stdlib.h>
+#include <ntndk.h>
#include <stdio.h>
-#include <stdlib.h>
#define MAX_DIR_ENTRY 256
Added: trunk/reactos/base/applications/utils/objdir/objdir.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/objdir/objdir.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/objdir/objdir.rbuild (added)
+++ trunk/reactos/base/applications/utils/objdir/objdir.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,9 @@
+<module name="objdir" type="win32cui" installbase="bin" installname="objdir.exe">
+ <define name="__USE_W32API" />
+ <define name="UNICODE" />
+ <define name="_UNICODE" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <file>objdir.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/objdir/objdir.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/partinfo/partinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/partinfo/partinfo.c?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/partinfo/partinfo.c (original)
+++ trunk/reactos/base/applications/utils/partinfo/partinfo.c Fri Oct 13 14:56:52 2006
@@ -2,13 +2,11 @@
* partinfo - partition info program
*/
+#define WIN32_NO_STATUS
#include <windows.h>
-//#include <winioctl.h>
-#include <string.h>
+#include <stdlib.h>
+#include <ntndk.h>
#include <stdio.h>
-#include <stdlib.h>
-
-#include <ntddk.h>
//#define DUMP_DATA
#define DUMP_SIZE_INFO
Added: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild?rev=24501&view=auto
==============================================================================
--- trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild (added)
+++ trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild Fri Oct 13 14:56:52 2006
@@ -1,0 +1,7 @@
+<module name="partinfo" type="win32cui" installbase="bin" installname="partinfo.exe">
+ <define name="__USE_W32API" />
+ <library>msvcrt</library>
+ <library>kernel32</library>
+ <library>ntdll</library>
+ <file>partinfo.c</file>
+</module>
Propchange: trunk/reactos/base/applications/utils/partinfo/partinfo.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/utils/utils.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/utils/utils.rbuild?rev=24501&r1=24500&r2=24501&view=diff
==============================================================================
--- trunk/reactos/base/applications/utils/utils.rbuild (original)
+++ trunk/reactos/base/applications/utils/utils.rbuild Fri Oct 13 14:56:52 2006
@@ -1,6 +1,24 @@
<group>
<directory name="binpatch">
<xi:include href="binpatch/binpatch.rbuild" />
+</directory>
+<directory name="cat">
+ <xi:include href="cat/cat.rbuild" />
+</directory>
+<directory name="driver">
+ <xi:include href="driver/driver.rbuild" />
+</directory>
+<directory name="infinst">
+ <xi:include href="infinst/infinst.rbuild" />
+</directory>
+<directory name="nts2w32err">
+ <xi:include href="nts2w32err/nts2w32err.rbuild" />
+</directory>
+<directory name="objdir">
+ <xi:include href="objdir/objdir.rbuild" />
+</directory>
+<directory name="partinfo">
+ <xi:include href="partinfo/partinfo.rbuild" />
</directory>
<directory name="ps">
<xi:include href="ps/ps.rbuild" />
More information about the Ros-diffs
mailing list