Changes to be able to build system

svn path=/trunk/; revision=359

diff --git a/reactos/doc/notes b/reactos/doc/notes
index 25900e9..74b3f27 100644 (file)
--- a/reactos/doc/notes
+++ b/reactos/doc/notes
@@ -5,6 +5,15 @@ dashes on a line by themselves.  If you implement the fix
 reffered to in a message, feel free to delete it from the file.
 Rex ***
 -----
 reffered to in a message, feel free to delete it from the file.
 Rex ***
 -----

+Subject: [ros-kernel] Inside the Boot Process
+Date: Mon, 22 Mar 1999 22:05:47 +0100
+From: Emanuele Aliberti <ea@iol.it>
+
+For those working on the boot loader: in WinNt Magazine november 1998
+issue (http://www.winntmag.com/) there is a detailed description, by
+Mark Russinovich, of the rôle the MBR, NTLDR, boot.ini, ntdetect.com...
+play in the boot process ("Inside the Boot Process, Part 1").
+-----

 Yes with DPCs, KeDrainDpcQueue should go to HIGH_LEVEL because 
 it needs to synchronize with KeInsertDpcQueue. Also the idle thread 
 should run at DISPATCH_LEVEL and regularly drain the dpc queue, that 
 Yes with DPCs, KeDrainDpcQueue should go to HIGH_LEVEL because 
 it needs to synchronize with KeInsertDpcQueue. Also the idle thread 
 should run at DISPATCH_LEVEL and regularly drain the dpc queue, that 

diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c
index 0ac64ae..3b8e042 100644 (file)
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@@ -1,6 +1,7 @@
 
 #include <internal/mmhal.h>
 #include <internal/halio.h>
 
 #include <internal/mmhal.h>
 #include <internal/halio.h>

+#include <internal/hal/page.h>

 #include <ddk/ntddk.h>
 #include <string.h>
 #include <internal/string.h>
 #include <ddk/ntddk.h>
 #include <string.h>
 #include <internal/string.h>

diff --git a/reactos/include/base.h b/reactos/include/base.h
index a1737b9..1538e56 100644 (file)
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -465,8 +465,10 @@ typedef enum _TOKEN_INFORMATION_CLASS {
 #define INDEXTOSTATEIMAGEMASK(i) ((i) << 12)  
 
 #ifdef UNICODE
 #define INDEXTOSTATEIMAGEMASK(i) ((i) << 12)  
 
 #ifdef UNICODE

+#define _T(quote) L##quote 

 #define TEXT(quote) L##quote 
 #else
 #define TEXT(quote) L##quote 
 #else

+#define _T(quote) L##quote 

 #define TEXT(quote) quote
 #endif
 
 #define TEXT(quote) quote
 #endif
 

diff --git a/reactos/include/internal/i386/mmhal.h b/reactos/include/internal/i386/mmhal.h
index 1eac41c..1e52ae8 100644 (file)
--- a/reactos/include/internal/i386/mmhal.h
+++ b/reactos/include/internal/i386/mmhal.h
@@ -2,8 +2,8 @@
  * Lowlevel memory managment definitions
  */
 
  * Lowlevel memory managment definitions
  */
 

-#ifndef __INTERNAL_HAL_PAGE_H
-#define __INTERNAL_HAL_PAGE_H
+#ifndef __INTERNAL_HAL_I386_MMHAL_H
+#define __INTERNAL_HAL_I386_MMHAL_H

 
 #include <ddk/ntddk.h>
 
 
 #include <ddk/ntddk.h>
 


@@ -60,4 +60,4 @@ VOID MmSetPageProtect(PEPROCESS Process,
                      ULONG flProtect);
 BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address);
 
                      ULONG flProtect);
 BOOLEAN MmIsPagePresent(PEPROCESS Process, PVOID Address);
 

-#endif /* __INTERNAL_HAL_PAGE_H */
+#endif /* __INTERNAL_HAL_I386_MMHAL_H */

diff --git a/reactos/include/internal/stddef.h b/reactos/include/internal/stddef.h
index 1166931..6192b0c 100644 (file)
--- a/reactos/include/internal/stddef.h
+++ b/reactos/include/internal/stddef.h
@@ -2,9 +2,12 @@
  * Some useful things
  */
 
  * Some useful things
  */
 

-//#define NULL ((void*)0)
+#ifndef _INTERNAL_STDDEF_H
+#define _INTERNAL_STDDEF_H
+

 #ifndef NULL
 #define NULL    (0)
 #endif
 
 #ifndef NULL
 #define NULL    (0)
 #endif
 

+#endif

 
 

diff --git a/reactos/include/internal/string.h b/reactos/include/internal/string.h
index 5550e3d..1f201d3 100644 (file)
--- a/reactos/include/internal/string.h
+++ b/reactos/include/internal/string.h
@@ -5,6 +5,10 @@
 #include <internal/types.h>
 #endif
 
 #include <internal/types.h>
 #endif
 

+#ifndef _INTERNAL_STDDEF_H
+#include <internal/stddef.h>
+#endif
+

 /*
  * On a 486 or Pentium, we are better off not using the
  * byte string operations. But on a 386 or a PPro the
 /*
  * On a 486 or Pentium, we are better off not using the
  * byte string operations. But on a 386 or a PPro the

diff --git a/reactos/include/internal/types.h b/reactos/include/internal/types.h
index e69de29..1afed20 100644 (file)
--- a/reactos/include/internal/types.h
+++ b/reactos/include/internal/types.h
@@ -0,0 +1,7 @@
+
+#ifndef _LINUX_TYPES_H
+#define _LINUX_TYPES_H
+
+typedef unsigned int size_t;
+
+#endif

diff --git a/reactos/lib/kernel32/file/deviceio.c b/reactos/lib/kernel32/file/deviceio.c
index 5a9189c..8d25ca2 100644 (file)
--- a/reactos/lib/kernel32/file/deviceio.c
+++ b/reactos/lib/kernel32/file/deviceio.c
@@ -44,7 +44,7 @@ DeviceIoControl(
                bFsIoControlCode = TRUE;        
        else
                bFsIoControlCode = FALSE;
                bFsIoControlCode = TRUE;        
        else
                bFsIoControlCode = FALSE;

-CHECKPOINT
+// CHECKPOINT

        if(lpOverlapped  != NULL) {
                hEvent = lpOverlapped->hEvent;
                lpOverlapped->Internal = STATUS_PENDING;
        if(lpOverlapped  != NULL) {
                hEvent = lpOverlapped->hEvent;
                lpOverlapped->Internal = STATUS_PENDING;


@@ -54,13 +54,13 @@ CHECKPOINT
                IoStatusBlock = &IIosb;
        }
 
                IoStatusBlock = &IIosb;
        }
 

-CHECKPOINT
+// CHECKPOINT

         if(bFsIoControlCode == TRUE) {
                errCode = NtFsControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode,lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize );
         } else {   
                errCode = NtDeviceIoControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize);
         }
         if(bFsIoControlCode == TRUE) {
                errCode = NtFsControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode,lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize );
         } else {   
                errCode = NtDeviceIoControlFile(hDevice,hEvent,NULL,NULL,IoStatusBlock,dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize);
         }

-CHECKPOINT
+// CHECKPOINT

        if(errCode == STATUS_PENDING ) {
            
                if(NtWaitForSingleObject(hDevice,FALSE,NULL) < 0) {
        if(errCode == STATUS_PENDING ) {
            
                if(NtWaitForSingleObject(hDevice,FALSE,NULL) < 0) {


@@ -73,12 +73,12 @@ CHECKPOINT
                SetLastError(RtlNtStatusToDosError(errCode));
                return FALSE;
        }
                SetLastError(RtlNtStatusToDosError(errCode));
                return FALSE;
        }

-CHECKPOINT
+// CHECKPOINT

         if (lpOverlapped)
                 *lpBytesReturned = lpOverlapped->InternalHigh;
         else
                 *lpBytesReturned = IoStatusBlock->Information;
         if (lpOverlapped)
                 *lpBytesReturned = lpOverlapped->InternalHigh;
         else
                 *lpBytesReturned = IoStatusBlock->Information;

-CHECKPOINT
+// CHECKPOINT

         return TRUE;
 }
 
         return TRUE;
 }
 

diff --git a/reactos/makefile.dos b/reactos/makefile.dos
index 97725e8..8aa3350 100644 (file)
--- a/reactos/makefile.dos
+++ b/reactos/makefile.dos
@@ -19,7 +19,7 @@ include rules.mak
 #
 # Required to run the system
 #
 #
 # Required to run the system
 #

-COMPONENTS = iface_native ntoskrnl kernel32 ntdll
+COMPONENTS = iface_native ntoskrnl ntdll kernel32

 # crtdll mingw32
 
 #
 # crtdll mingw32
 
 #

diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index 530047e..04569aa 100644 (file)
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -37,7 +37,6 @@
 
 #include <ddk/ntddk.h>
 #include <internal/ke.h>
 
 #include <ddk/ntddk.h>
 #include <internal/ke.h>

-#include <string.h>

 #include <internal/string.h>
 
 #define NDEBUG
 #include <internal/string.h>
 
 #define NDEBUG

diff --git a/reactos/ntoskrnl/makefile_rex b/reactos/ntoskrnl/makefile_rex
index be98e9e..541a55f 100644 (file)
--- a/reactos/ntoskrnl/makefile_rex
+++ b/reactos/ntoskrnl/makefile_rex
@@ -144,5 +144,5 @@ ex/napi.o: ex/napi.c ../include/ntdll/napi.h
 
 #WITH_DEBUGGING = yes
 WIN32_LEAN_AND_MEAN = yes
 
 #WITH_DEBUGGING = yes
 WIN32_LEAN_AND_MEAN = yes

-WARNINGS_ARE_ERRORS = yes
+#WARNINGS_ARE_ERRORS = yes

 include ../rules.mak
 include ../rules.mak