Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h
Modified: trunk/reactos/drivers/storage/class2/class2.c
Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h
Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h
Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h
Modified: trunk/reactos/drivers/video/videoprt/videoprt.h
Modified: trunk/reactos/hal/halx86/generic/reboot.c
Modified: trunk/reactos/hal/halx86/include/hal.h
Modified: trunk/reactos/lib/freetype/rosglue.c
Modified: trunk/reactos/lib/msafd/include/msafd.h
Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c
Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c
Modified: trunk/reactos/subsys/win32k/misc/driver.c
Modified: trunk/reactos/subsys/win32k/w32k.h
Modified: trunk/reactos/w32api/include/ddk/kbdmou.h
--- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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
--- trunk/reactos/drivers/storage/class2/class2.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/storage/class2/class2.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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
--- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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,
--- trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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
--- trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -56,6 +56,8 @@
#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')
--- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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);
--- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -56,12 +56,12 @@
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 ();
--- trunk/reactos/hal/halx86/include/hal.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/hal/halx86/include/hal.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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,
--- trunk/reactos/lib/freetype/rosglue.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/lib/freetype/rosglue.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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')
/*
--- trunk/reactos/lib/msafd/include/msafd.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/lib/msafd/include/msafd.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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;
--- trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -15,6 +15,10 @@
/* TYPES *********************************************************************/
+/* FIXME: NDK headers */
+#define TempEsp TempEip
+#define TempSegSs TempCs
+
/* DEFINES *******************************************************************/
#define KDB_STACK_SIZE (4096*3)
--- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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
--- trunk/reactos/subsys/win32k/misc/driver.c 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/subsys/win32k/misc/driver.c 2005-06-19 09:07:44 UTC (rev 16086)
@@ -23,19 +23,8 @@
*
*/
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_PEHDR
+#include <w32k.h>
-#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>
-
#define NDEBUG
#include <debug.h>
--- trunk/reactos/subsys/win32k/w32k.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/subsys/win32k/w32k.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -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>
-
--- trunk/reactos/w32api/include/ddk/kbdmou.h 2005-06-19 08:21:35 UTC (rev 16085)
+++ trunk/reactos/w32api/include/ddk/kbdmou.h 2005-06-19 09:07:44 UTC (rev 16086)
@@ -1,5 +1,5 @@
/*
- * ntddmou.h
+ * kbdmou.h
*
* Structures and definitions for Keyboard/Mouse class and port drivers.
*