Build eventlog, umpnpmgr, rpcss with NDK
Modified: trunk/reactos/include/ndk/umtypes.h
Modified: trunk/reactos/include/ntos/ntpnp.h
Modified: trunk/reactos/include/ntos/obtypes.h
Modified: trunk/reactos/services/eventlog/eventlog.c
Modified: trunk/reactos/services/eventlog/logport.c
Modified: trunk/reactos/services/rpcss/rpcss.c
Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c
_____
Modified: trunk/reactos/include/ndk/umtypes.h
--- trunk/reactos/include/ndk/umtypes.h 2005-06-23 21:36:40 UTC (rev
16251)
+++ trunk/reactos/include/ndk/umtypes.h 2005-06-24 01:31:23 UTC (rev
16252)
@@ -734,8 +734,35 @@
typedef struct _OBJECT_NAME_INFORMATION
{
UNICODE_STRING Name;
-} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
+} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;
+typedef struct _IO_ERROR_LOG_PACKET
+{
+ UCHAR MajorFunctionCode;
+ UCHAR RetryCount;
+ USHORT DumpDataSize;
+ USHORT NumberOfStrings;
+ USHORT StringOffset;
+ USHORT EventCategory;
+ NTSTATUS ErrorCode;
+ ULONG UniqueErrorValue;
+ NTSTATUS FinalStatus;
+ ULONG SequenceNumber;
+ ULONG IoControlCode;
+ LARGE_INTEGER DeviceOffset;
+ ULONG DumpData[1];
+}IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET;
+
+typedef struct _IO_ERROR_LOG_MESSAGE
+{
+ USHORT Type;
+ USHORT Size;
+ USHORT DriverNameLength;
+ LARGE_INTEGER TimeStamp;
+ ULONG DriverNameOffset;
+ IO_ERROR_LOG_PACKET EntryData;
+} IO_ERROR_LOG_MESSAGE, *PIO_ERROR_LOG_MESSAGE;
+
typedef struct _CLIENT_ID
{
HANDLE UniqueProcess;
_____
Modified: trunk/reactos/include/ntos/ntpnp.h
--- trunk/reactos/include/ntos/ntpnp.h 2005-06-23 21:36:40 UTC (rev
16251)
+++ trunk/reactos/include/ntos/ntpnp.h 2005-06-24 01:31:23 UTC (rev
16252)
@@ -106,7 +106,7 @@
PULONG Result;
ULONG Flags;
ULONG TotalSize;
- PDEVICE_OBJECT DeviceObject;
+ PVOID DeviceObject;
union {
struct {
GUID ClassGuid;
_____
Modified: trunk/reactos/include/ntos/obtypes.h
--- trunk/reactos/include/ntos/obtypes.h 2005-06-23 21:36:40 UTC
(rev 16251)
+++ trunk/reactos/include/ntos/obtypes.h 2005-06-24 01:31:23 UTC
(rev 16252)
@@ -144,6 +144,8 @@
ULONG SessionId;
} OBJECT_DIRECTORY, *POBJECT_DIRECTORY;
+#endif /* __USE_W32API */
+
typedef struct _DEVICE_MAP {
POBJECT_DIRECTORY DosDevicesDirectory;
POBJECT_DIRECTORY GlobalDosDevicesDirectory;
@@ -152,8 +154,6 @@
UCHAR DriveType[32];
} DEVICE_MAP, *PDEVICE_MAP;
-#endif /* __USE_W32API */
-
extern POBJECT_TYPE ObDirectoryType;
extern PDEVICE_MAP ObSystemDeviceMap;
_____
Modified: trunk/reactos/services/eventlog/eventlog.c
--- trunk/reactos/services/eventlog/eventlog.c 2005-06-23 21:36:40 UTC
(rev 16251)
+++ trunk/reactos/services/eventlog/eventlog.c 2005-06-24 01:31:23 UTC
(rev 16252)
@@ -26,10 +26,9 @@
/* INCLUDES
*****************************************************************/
-#define NTOS_MODE_USER
-#include <ntos.h>
#include <windows.h>
-#include <stdio.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
#include "eventlog.h"
_____
Modified: trunk/reactos/services/eventlog/logport.c
--- trunk/reactos/services/eventlog/logport.c 2005-06-23 21:36:40 UTC
(rev 16251)
+++ trunk/reactos/services/eventlog/logport.c 2005-06-24 01:31:23 UTC
(rev 16252)
@@ -26,10 +26,9 @@
/* INCLUDES
*****************************************************************/
-#define NTOS_MODE_USER
-#include <ntos.h>
#include <windows.h>
-#include <string.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
#include "eventlog.h"
_____
Modified: trunk/reactos/services/rpcss/rpcss.c
--- trunk/reactos/services/rpcss/rpcss.c 2005-06-23 21:36:40 UTC
(rev 16251)
+++ trunk/reactos/services/rpcss/rpcss.c 2005-06-24 01:31:23 UTC
(rev 16252)
@@ -29,10 +29,9 @@
#define UNICODE
-#define NTOS_MODE_USER
-#include <ntos.h>
#include <windows.h>
-#include <stdio.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
#include "rpcss.h"
//#include "services.h"
_____
Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c
--- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-23 21:36:40 UTC
(rev 16251)
+++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-06-24 01:31:23 UTC
(rev 16252)
@@ -27,24 +27,20 @@
/* INCLUDES
*****************************************************************/
+#include <windows.h>
#define NTOS_MODE_USER
-#include <ntos.h>
-#include <ntos/ntpnp.h>
+#include <ndk/ntndk.h>
#include <ddk/wdmguid.h>
-#include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
#include <rpc.h>
#include <rpcdce.h>
+#include <ntos/ntpnp.h>
#include "pnp_c.h"
#define NDEBUG
#include <debug.h>
-
-
/* GLOBALS
******************************************************************/
static VOID CALLBACK
@@ -52,7 +48,7 @@
static SERVICE_TABLE_ENTRY ServiceTable[2] =
{
- {_T("PlugPlay"), ServiceMain},
+ {TEXT("PlugPlay"), ServiceMain},
{NULL, NULL}
};
Show replies by date