From 7cd48df5b69e1104df7ae424183f7289bc839f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 27 Aug 2007 12:47:56 +0000 Subject: [PATCH] Do not include when compiling cmlib_host. This file defines too much things. svn path=/trunk/; revision=28599 --- reactos/include/reactos/typedefs_host.h | 15 +++++++- reactos/lib/cmlib/cmlib.h | 49 +++++++++++++++++++++---- reactos/lib/cmlib/cmlib.mak | 5 +-- reactos/tools/mkhive/mkhive.h | 29 +-------------- reactos/tools/mkhive/rtl.c | 1 - 5 files changed, 57 insertions(+), 42 deletions(-) diff --git a/reactos/include/reactos/typedefs_host.h b/reactos/include/reactos/typedefs_host.h index 9342439e79c..384787b27ef 100644 --- a/reactos/include/reactos/typedefs_host.h +++ b/reactos/include/reactos/typedefs_host.h @@ -9,10 +9,13 @@ #ifndef _TYPEDEFS_HOST_H #define _TYPEDEFS_HOST_H +#include #include #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } -#define ASSERT(x) { if (!(x)) { printf("ASSERT at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } +#define ASSERT(x) { if (!(x)) { printf("Assertion " #x " at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } +#define DPRINT if (0) printf +#define DPRINT1 printf #define NTAPI __stdcall #define WINAPI __stdcall @@ -24,9 +27,13 @@ #define FALSE 0 #define TRUE (!(FALSE)) +/* FIXME: this value is target specific, host tools MUST not use it + * and this line has to be removed */ +#define PAGE_SIZE 4096 + typedef void VOID, *PVOID, *HANDLE; typedef HANDLE HKEY, *PHKEY; -typedef size_t SIZE_T, *PSIZE_T; +typedef long unsigned int SIZE_T, *PSIZE_T; typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; typedef char CHAR, *PCHAR, *PSTR; typedef const char CCHAR; @@ -48,6 +55,7 @@ typedef int POOL_TYPE; #define MAXUSHORT USHRT_MAX +#include typedef struct _RTL_BITMAP { ULONG SizeOfBitMap; @@ -89,9 +97,12 @@ typedef struct _UNICODE_STRING USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; +#include + typedef const UNICODE_STRING *PCUNICODE_STRING; #define NT_SUCCESS(x) ((x)>=0) +#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define RtlZeroMemory(Destination, Length) memset(Destination, 0, Length) #define RtlCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h index 5730ca3a21f..0a89b8e2619 100644 --- a/reactos/lib/cmlib/cmlib.h +++ b/reactos/lib/cmlib/cmlib.h @@ -8,15 +8,48 @@ #ifndef CMLIB_H #define CMLIB_H -#ifdef _TYPEDEFS_HOST_H -#define REG_OPTION_VOLATILE 1 -#define OBJ_CASE_INSENSITIVE 0x00000040L -#define USHORT_MAX USHRT_MAX -#else - #ifdef CMLIB_HOST - #include - #endif +#ifdef CMLIB_HOST +#include +#include +#include +#include +#endif + +#ifndef _TYPEDEFS_HOST_H #include +#else + #define REG_OPTION_VOLATILE 1 + #define OBJ_CASE_INSENSITIVE 0x00000040L + #define USHORT_MAX USHRT_MAX + +VOID NTAPI +KeQuerySystemTime( + OUT PLARGE_INTEGER CurrentTime); + +VOID NTAPI +RtlInitializeBitMap( + IN PRTL_BITMAP BitMapHeader, + IN PULONG BitMapBuffer, + IN ULONG SizeOfBitMap); + +ULONG NTAPI +RtlFindSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG NumberToFind, + IN ULONG HintIndex); + +VOID NTAPI +RtlSetBits( + IN PRTL_BITMAP BitMapHeader, + IN ULONG StartingIndex, + IN ULONG NumberToSet); + +VOID NTAPI +RtlClearAllBits( + IN PRTL_BITMAP BitMapHeader); + +#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) + #endif #include diff --git a/reactos/lib/cmlib/cmlib.mak b/reactos/lib/cmlib/cmlib.mak index c947a310c95..fb09170aed1 100644 --- a/reactos/lib/cmlib/cmlib.mak +++ b/reactos/lib/cmlib/cmlib.mak @@ -31,9 +31,8 @@ CMLIB_HOST_OBJECTS = \ $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o)) CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ - -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ - -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES + -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk \ + -DCMLIB_HOST $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) diff --git a/reactos/tools/mkhive/mkhive.h b/reactos/tools/mkhive/mkhive.h index 5078fd1ef18..0609765ac95 100644 --- a/reactos/tools/mkhive/mkhive.h +++ b/reactos/tools/mkhive/mkhive.h @@ -33,9 +33,6 @@ #include #include -VOID NTAPI -KeQuerySystemTime( - OUT PLARGE_INTEGER CurrentTime); NTSTATUS NTAPI RtlAnsiStringToUnicodeString( IN OUT PUNICODE_STRING UniDest, @@ -74,31 +71,7 @@ extern LIST_ENTRY CmiHiveListHead; #define min(a, b) (((a) < (b)) ? (a) : (b)) #endif - -/* Debugging macros */ - -#ifdef _MSC_VER -#include -#include -static void DPRINT1(const char* fmt, ... ) -{ - va_list args; - va_start ( args, fmt ); - vprintf ( fmt, args ); - va_end ( args ); -} -static void DPRINT ( const char* fmt, ... ) -{ -} -#else -#define DPRINT1(args...) do { printf("(%s:%d) ",__FILE__,__LINE__); printf(args); } while(0); -#define DPRINT(args...) -#endif//_MSC_VER -#define CHECKPOINT1 do { printf("%s:%d\n",__FILE__,__LINE__); } while(0); - -#define CHECKPOINT - -#ifdef WINDOWS_HOST +#ifdef _WIN32 #define strncasecmp _strnicmp #define strcasecmp _stricmp #else diff --git a/reactos/tools/mkhive/rtl.c b/reactos/tools/mkhive/rtl.c index 8c9b4a74ccd..0daabcb5bdc 100644 --- a/reactos/tools/mkhive/rtl.c +++ b/reactos/tools/mkhive/rtl.c @@ -139,7 +139,6 @@ VOID NTAPI KeQuerySystemTime( OUT PLARGE_INTEGER CurrentTime) { - DPRINT1("KeQuerySystemTime() unimplemented\n"); CurrentTime->QuadPart = 0; }