From 728ea14e4f9dfcb3c58637f9dae0652fb762494e Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Fri, 13 Oct 2006 10:56:52 +0000
Subject: [PATCH] - add cat, load, unload, infinst, nts2w32err, objdir,
 partinfo to build system - fix includes in those modules

svn path=/trunk/; revision=24501
---
 reactos/base/applications/utils/cat/cat.rbuild |  7 +++++++
 .../applications/utils/driver/driver.rbuild    |  8 ++++++++
 .../base/applications/utils/driver/load/load.c | 15 ++++++++-------
 .../applications/utils/driver/load/load.rbuild |  8 ++++++++
 .../applications/utils/driver/unload/unload.c  | 13 +++++++------
 .../utils/driver/unload/unload.rbuild          |  8 ++++++++
 .../applications/utils/infinst/infinst.rbuild  | 10 ++++++++++
 .../applications/utils/nts2w32err/nts2w32err.c |  5 +++--
 .../utils/nts2w32err/nts2w32err.rbuild         |  7 +++++++
 .../base/applications/utils/objdir/objdir.c    |  8 ++++----
 .../applications/utils/objdir/objdir.rbuild    |  9 +++++++++
 .../applications/utils/partinfo/partinfo.c     |  8 +++-----
 .../utils/partinfo/partinfo.rbuild             |  7 +++++++
 reactos/base/applications/utils/utils.rbuild   | 18 ++++++++++++++++++
 14 files changed, 107 insertions(+), 24 deletions(-)
 create mode 100644 reactos/base/applications/utils/cat/cat.rbuild
 create mode 100644 reactos/base/applications/utils/driver/driver.rbuild
 create mode 100644 reactos/base/applications/utils/driver/load/load.rbuild
 create mode 100644 reactos/base/applications/utils/driver/unload/unload.rbuild
 create mode 100644 reactos/base/applications/utils/infinst/infinst.rbuild
 create mode 100644 reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild
 create mode 100644 reactos/base/applications/utils/objdir/objdir.rbuild
 create mode 100644 reactos/base/applications/utils/partinfo/partinfo.rbuild

diff --git a/reactos/base/applications/utils/cat/cat.rbuild b/reactos/base/applications/utils/cat/cat.rbuild
new file mode 100644
index 00000000000..c7a8f25706b
--- /dev/null
+++ b/reactos/base/applications/utils/cat/cat.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/driver/driver.rbuild b/reactos/base/applications/utils/driver/driver.rbuild
new file mode 100644
index 00000000000..357808e87df
--- /dev/null
+++ b/reactos/base/applications/utils/driver/driver.rbuild
@@ -0,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>
diff --git a/reactos/base/applications/utils/driver/load/load.c b/reactos/base/applications/utils/driver/load/load.c
index 9d6a39cb9d2..3ec87d32f46 100644
--- a/reactos/base/applications/utils/driver/load/load.c
+++ b/reactos/base/applications/utils/driver/load/load.c
@@ -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;
diff --git a/reactos/base/applications/utils/driver/load/load.rbuild b/reactos/base/applications/utils/driver/load/load.rbuild
new file mode 100644
index 00000000000..851850ba532
--- /dev/null
+++ b/reactos/base/applications/utils/driver/load/load.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/driver/unload/unload.c b/reactos/base/applications/utils/driver/unload/unload.c
index 6afa80e62ec..8f6e655b251 100644
--- a/reactos/base/applications/utils/driver/unload/unload.c
+++ b/reactos/base/applications/utils/driver/unload/unload.c
@@ -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 @@ main(int argc, char *argv[])
    free(ServiceName.Buffer);
    if (!NT_SUCCESS(Status))
    {
-      printf("Failed: %X\n", Status);
+      wprintf(L"Failed: %X\n", Status);
       return 1;
    }
    return 0;
diff --git a/reactos/base/applications/utils/driver/unload/unload.rbuild b/reactos/base/applications/utils/driver/unload/unload.rbuild
new file mode 100644
index 00000000000..e8f7da0e6ee
--- /dev/null
+++ b/reactos/base/applications/utils/driver/unload/unload.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/infinst/infinst.rbuild b/reactos/base/applications/utils/infinst/infinst.rbuild
new file mode 100644
index 00000000000..d30aa7b21b4
--- /dev/null
+++ b/reactos/base/applications/utils/infinst/infinst.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/nts2w32err/nts2w32err.c b/reactos/base/applications/utils/nts2w32err/nts2w32err.c
index 85cdca01b3f..54ac4c258bc 100644
--- a/reactos/base/applications/utils/nts2w32err/nts2w32err.c
+++ b/reactos/base/applications/utils/nts2w32err/nts2w32err.c
@@ -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 [])
diff --git a/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild b/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild
new file mode 100644
index 00000000000..5318fa4864b
--- /dev/null
+++ b/reactos/base/applications/utils/nts2w32err/nts2w32err.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/objdir/objdir.c b/reactos/base/applications/utils/objdir/objdir.c
index ab906354b44..016060a774c 100644
--- a/reactos/base/applications/utils/objdir/objdir.c
+++ b/reactos/base/applications/utils/objdir/objdir.c
@@ -17,11 +17,11 @@
  * 		Added -r option.
  */
 
-#include <ntddk.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
+#define WIN32_NO_STATUS
+#include <windows.h>
 #include <stdlib.h>
+#include <ntndk.h>
+#include <stdio.h>
 
 #define MAX_DIR_ENTRY 256
 
diff --git a/reactos/base/applications/utils/objdir/objdir.rbuild b/reactos/base/applications/utils/objdir/objdir.rbuild
new file mode 100644
index 00000000000..23894a34821
--- /dev/null
+++ b/reactos/base/applications/utils/objdir/objdir.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/partinfo/partinfo.c b/reactos/base/applications/utils/partinfo/partinfo.c
index b4636645e74..92205e44f22 100644
--- a/reactos/base/applications/utils/partinfo/partinfo.c
+++ b/reactos/base/applications/utils/partinfo/partinfo.c
@@ -2,13 +2,11 @@
  * partinfo - partition info program
  */
 
+#define WIN32_NO_STATUS
 #include <windows.h>
-//#include <winioctl.h>
-#include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
-
-#include <ntddk.h>
+#include <ntndk.h>
+#include <stdio.h>
 
 //#define DUMP_DATA
 #define DUMP_SIZE_INFO
diff --git a/reactos/base/applications/utils/partinfo/partinfo.rbuild b/reactos/base/applications/utils/partinfo/partinfo.rbuild
new file mode 100644
index 00000000000..3e93ca71e1a
--- /dev/null
+++ b/reactos/base/applications/utils/partinfo/partinfo.rbuild
@@ -0,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>
\ No newline at end of file
diff --git a/reactos/base/applications/utils/utils.rbuild b/reactos/base/applications/utils/utils.rbuild
index ed9e26354a9..0ffd32d45b3 100644
--- a/reactos/base/applications/utils/utils.rbuild
+++ b/reactos/base/applications/utils/utils.rbuild
@@ -2,6 +2,24 @@
 <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" />
 </directory>