mirror of
https://github.com/reactos/reactos.git
synced 2025-04-19 20:19:26 +00:00
Couple of build fixes.
svn path=/trunk/; revision=16086
This commit is contained in:
parent
068cf10896
commit
fbf1722197
15 changed files with 29 additions and 22 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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')
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -15,6 +15,10 @@
|
|||
|
||||
/* TYPES *********************************************************************/
|
||||
|
||||
/* FIXME: NDK headers */
|
||||
#define TempEsp TempEip
|
||||
#define TempSegSs TempCs
|
||||
|
||||
/* DEFINES *******************************************************************/
|
||||
|
||||
#define KDB_STACK_SIZE (4096*3)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* ntddmou.h
|
||||
* kbdmou.h
|
||||
*
|
||||
* Structures and definitions for Keyboard/Mouse class and port drivers.
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue