Couple of build fixes.

svn path=/trunk/; revision=16086

diff --git a/reactos/drivers/net/tcpip/include/tcpip.h b/reactos/drivers/net/tcpip/include/tcpip.h
index 979b029..9f66072 100644 (file)
--- a/reactos/drivers/net/tcpip/include/tcpip.h
+++ b/reactos/drivers/net/tcpip/include/tcpip.h
@@ -30,6 +30,7 @@
 
 #include <debug.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 #define TAG_STRING     TAG('S', 'T', 'R', ' ') /* string */
 
 /* Define _NTTEST_ to make test version. Device names are prefixed with

diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c
index c325d51..0a9b258 100644 (file)
--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.c
@@ -45,6 +45,7 @@
 
 #define VERSION "0.0.2"
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 #define TAG_SRBT  TAG('S', 'r', 'b', 'T')
 
 #define INQUIRY_DATA_SIZE  2048

diff --git a/reactos/drivers/storage/scsiport/scsiport_int.h b/reactos/drivers/storage/scsiport/scsiport_int.h
index 1615d31..f98f2b7 100644 (file)
--- a/reactos/drivers/storage/scsiport/scsiport_int.h
+++ b/reactos/drivers/storage/scsiport/scsiport_int.h
@@ -10,6 +10,8 @@
 #define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) )
 #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 typedef enum _SCSI_PORT_TIMER_STATES
 {
   IDETimerIdle,

diff --git a/reactos/drivers/usb/cromwell/usb_wrapper.h b/reactos/drivers/usb/cromwell/usb_wrapper.h
index 9d3ad6a..d7faa0f 100644 (file)
--- a/reactos/drivers/usb/cromwell/usb_wrapper.h
+++ b/reactos/drivers/usb/cromwell/usb_wrapper.h
@@ -4,6 +4,8 @@
 #include <ddk/ntddk.h>
 #include <debug.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 void wait_ms(int mils);
 
 #ifndef _snprintf

diff --git a/reactos/drivers/video/displays/framebuf/framebuf.h b/reactos/drivers/video/displays/framebuf/framebuf.h
index 2cb3577..2d843ff 100644 (file)
--- a/reactos/drivers/video/displays/framebuf/framebuf.h
+++ b/reactos/drivers/video/displays/framebuf/framebuf.h
@@ -56,6 +56,8 @@ typedef struct _PDEV
 #endif
 } PDEV, *PPDEV;
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 #define DEVICE_NAME    L"framebuf"
 #define ALLOC_TAG      TAG('F','B','U','F')
 

diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/drivers/video/videoprt/videoprt.h
index f3c0d14..b9417bb 100644 (file)
--- a/reactos/drivers/video/videoprt/videoprt.h
+++ b/reactos/drivers/video/videoprt/videoprt.h
@@ -34,6 +34,8 @@
 #define NDEBUG
 #include <debug.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 int swprintf(wchar_t *buf, const wchar_t *fmt, ...);
 int vsprintf(char *buf, const char *fmt, va_list args);
 

diff --git a/reactos/hal/halx86/generic/reboot.c b/reactos/hal/halx86/generic/reboot.c
index f2d64e7..4e07b2c 100644 (file)
--- a/reactos/hal/halx86/generic/reboot.c
+++ b/reactos/hal/halx86/generic/reboot.c
@@ -56,12 +56,12 @@ HalReturnToFirmware (
        ULONG   Action
        )
 {
-    if (Action == FIRMWARE_HALT)
+    if (Action == HalHaltRoutine)
     {
         DbgPrint ("HalReturnToFirmware called!\n");
         DbgBreakPoint ();
     }
-    else if (Action == FIRMWARE_REBOOT)
+    else if (Action == HalRebootRoutine)
     {
         HalReleaseDisplayOwnership();
         HalReboot ();

diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h
index f26cf61..9855ca8 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -20,6 +20,8 @@
 #include <internal/ke.h>
 #include <internal/i386/ps.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 //Temporary hack below.
 PVOID STDCALL
 MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes,

diff --git a/reactos/lib/freetype/rosglue.c b/reactos/lib/freetype/rosglue.c
index 384b842..5b50eb3 100644 (file)
--- a/reactos/lib/freetype/rosglue.c
+++ b/reactos/lib/freetype/rosglue.c
@@ -19,6 +19,7 @@
 #define NDEBUG
 #include <debug.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 #define TAG_FREETYPE  TAG('F', 'T', 'Y', 'P')
 
 /*

diff --git a/reactos/lib/msafd/include/msafd.h b/reactos/lib/msafd/include/msafd.h
index 6aa4071..5c64c90 100644 (file)
--- a/reactos/lib/msafd/include/msafd.h
+++ b/reactos/lib/msafd/include/msafd.h
@@ -10,8 +10,8 @@
 #include <roscfg.h>
 #include <stdlib.h>
 #include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
+#define NTOS_USER_MODE
+#include <ntos.h>
 #include <wsahelp.h> /* comment for msvc */
 //#include "C:\Programming\ReactOS\reactos\w32api\include\wsahelp.h" uncomment for MSVC
 #include <winsock2.h>
@@ -22,10 +22,6 @@
 #include <helpers.h>
 #include <debug.h>
 
-/* Because our headers are f*cked up */
-typedef LARGE_INTEGER TIME;
-#include <ntos/zw.h>
-
 extern HANDLE GlobalHeap;
 extern WSPUPCALLTABLE Upcalls;
 extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;

diff --git a/reactos/ntoskrnl/kdbg/kdb.c b/reactos/ntoskrnl/kdbg/kdb.c
index b3f7ede..972d4b4 100644 (file)
--- a/reactos/ntoskrnl/kdbg/kdb.c
+++ b/reactos/ntoskrnl/kdbg/kdb.c
@@ -15,6 +15,10 @@
 
 /* TYPES *********************************************************************/
 
+/* FIXME: NDK headers */
+#define TempEsp TempEip
+#define TempSegSs TempCs
+
 /* DEFINES *******************************************************************/
 
 #define KDB_STACK_SIZE                   (4096*3)

diff --git a/reactos/ntoskrnl/kdbg/kdb_cli.c b/reactos/ntoskrnl/kdbg/kdb_cli.c
index 4b83fc9..5af3341 100644 (file)
--- a/reactos/ntoskrnl/kdbg/kdb_cli.c
+++ b/reactos/ntoskrnl/kdbg/kdb_cli.c
@@ -37,6 +37,10 @@
 
 /* DEFINES *******************************************************************/
 
+/* FIXME: NDK headers */
+#define TempEsp TempEip
+#define TempSegSs TempCs
+
 #define KEY_BS          8
 #define KEY_ESC         27
 #define KEY_DEL         127

diff --git a/reactos/subsys/win32k/misc/driver.c b/reactos/subsys/win32k/misc/driver.c
index 7521fe7..8b84921 100644 (file)
--- a/reactos/subsys/win32k/misc/driver.c
+++ b/reactos/subsys/win32k/misc/driver.c
@@ -23,18 +23,7 @@
  *
  */
 
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_PEHDR
-
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <win32k/driver.h>
-#include <win32k/misc.h>
-#include <wchar.h>
-#include <ddk/winddi.h>
-#include <ddk/ntapi.h>
-#include <rosrtl/string.h>
-#include <include/tags.h>
+#include <w32k.h>
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index a7ad9f1..ce90e69 100644 (file)
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -85,6 +85,7 @@
 
 #include <dib/dib.h>
 
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+
 #define NDEBUG
 #include <win32k/debug1.h>
-

diff --git a/reactos/w32api/include/ddk/kbdmou.h b/reactos/w32api/include/ddk/kbdmou.h
index 83f212f..11c3d80 100644 (file)
--- a/reactos/w32api/include/ddk/kbdmou.h
+++ b/reactos/w32api/include/ddk/kbdmou.h
@@ -1,5 +1,5 @@
 /*\r
- * ntddmou.h\r
+ * kbdmou.h\r
  *\r
  * Structures and definitions for Keyboard/Mouse class and port drivers.\r
  *\r