diff --git a/reactos/drivers/dd/vga/display/main/enable.c b/reactos/drivers/dd/vga/display/main/enable.c index 22f118ae516..29ab7dc9078 100644 --- a/reactos/drivers/dd/vga/display/main/enable.c +++ b/reactos/drivers/dd/vga/display/main/enable.c @@ -1,15 +1,15 @@ /* * entry.c * - * $Revision: 1.6 $ - * $Author: jfilby $ - * $Date: 2000/06/16 07:28:19 $ + * $Revision: 1.7 $ + * $Author: dwelch $ + * $Date: 2000/07/01 23:18:58 $ * */ #include "gdiinfo.h" -#include "..\vgavideo\vgavideo.h" -#include +#include "../vgavideo/vgavideo.h" +#include #define DBG_PREFIX "VGADDI: " diff --git a/reactos/drivers/dd/vga/display/main/gdiinfo.h b/reactos/drivers/dd/vga/display/main/gdiinfo.h index cdf83aec048..f97494f6e37 100644 --- a/reactos/drivers/dd/vga/display/main/gdiinfo.h +++ b/reactos/drivers/dd/vga/display/main/gdiinfo.h @@ -1,4 +1,4 @@ -#include "..\vgaddi.h" +#include "../vgaddi.h" GDIINFO gaulCap = { GDI_DRIVER_VERSION, diff --git a/reactos/drivers/dd/vga/display/makefile b/reactos/drivers/dd/vga/display/makefile index 2b0da279aa8..fa4da820a74 100644 --- a/reactos/drivers/dd/vga/display/makefile +++ b/reactos/drivers/dd/vga/display/makefile @@ -1,11 +1,11 @@ -# $Id: makefile,v 1.6 2000/05/13 14:56:47 ea Exp $ +# $Id: makefile,v 1.7 2000/07/01 23:18:58 dwelch Exp $ # # Makefile for ReactOS vgaddi.dll # TARGET=vgaddi -BASE_CFLAGS = -I../../../../include - +BASE_CFLAGS = -I../../../../include -I. + ifneq ($(HOST),mingw32-windows) ifneq ($(HOST),mingw32-linux) DLLTARGET=$(TARGET).a diff --git a/reactos/drivers/dd/vga/display/objects/bitblt.c b/reactos/drivers/dd/vga/display/objects/bitblt.c index c510a8f9744..0602c698dae 100644 --- a/reactos/drivers/dd/vga/display/objects/bitblt.c +++ b/reactos/drivers/dd/vga/display/objects/bitblt.c @@ -1,5 +1,5 @@ -#include "..\vgaddi.h" -#include "..\vgavideo\vgavideo.h" +#include "../vgaddi.h" +#include "../vgavideo/vgavideo.h" #include "brush.h" #include "bitblt.h" diff --git a/reactos/drivers/dd/vga/display/objects/copybits.c b/reactos/drivers/dd/vga/display/objects/copybits.c index 7577dc912a0..932fca9357e 100644 --- a/reactos/drivers/dd/vga/display/objects/copybits.c +++ b/reactos/drivers/dd/vga/display/objects/copybits.c @@ -1,8 +1,8 @@ #include -#include +#include "../../../../ntoskrnl/include/internal/i386/io.h" -#include "..\vgaddi.h" -#include "..\vgavideo\vgavideo.h" +#include "../vgaddi.h" +#include "../vgavideo/vgavideo.h" // FIXME: There's a lot of redundancy in here -- break into functions // FIXME: All functions involving the screen use terribly slow vgaPutPixel -- use something better diff --git a/reactos/drivers/dd/vga/display/objects/lineto.c b/reactos/drivers/dd/vga/display/objects/lineto.c index b434b45232c..6cd79ee8add 100644 --- a/reactos/drivers/dd/vga/display/objects/lineto.c +++ b/reactos/drivers/dd/vga/display/objects/lineto.c @@ -1,7 +1,7 @@ -#include "..\vgaddi.h" -#include "..\vgavideo\vgavideo.h" +#include "../vgaddi.h" +#include "../vgavideo/vgavideo.h" -#include +#include "../../../../ntoskrnl/include/internal/i386/io.h" BOOL VGADDILineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush, LONG x1, LONG y1, LONG x2, LONG y2, diff --git a/reactos/drivers/dd/vga/display/objects/paint.c b/reactos/drivers/dd/vga/display/objects/paint.c index 5e4b86296b5..86c80dc600c 100644 --- a/reactos/drivers/dd/vga/display/objects/paint.c +++ b/reactos/drivers/dd/vga/display/objects/paint.c @@ -1,5 +1,5 @@ -#include "..\vgaddi.h" -#include "..\vgavideo\vgavideo.h" +#include "../vgaddi.h" +#include "../vgavideo/vgavideo.h" #include "brush.h" BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor) diff --git a/reactos/drivers/dd/vga/display/objects/screen.c b/reactos/drivers/dd/vga/display/objects/screen.c index 8ecba7701fb..38670c95fab 100644 --- a/reactos/drivers/dd/vga/display/objects/screen.c +++ b/reactos/drivers/dd/vga/display/objects/screen.c @@ -1,4 +1,4 @@ -#include "..\vgaddi.h" +#include "../vgaddi.h" static WORD PaletteBuffer[] = { 16, 0, // 16 entries, start with 0 diff --git a/reactos/drivers/dd/vga/display/vgavideo/vgavideo.c b/reactos/drivers/dd/vga/display/vgavideo/vgavideo.c index 37bbb55a9aa..322c4ae286c 100644 --- a/reactos/drivers/dd/vga/display/vgavideo/vgavideo.c +++ b/reactos/drivers/dd/vga/display/vgavideo/vgavideo.c @@ -1,9 +1,10 @@ #include #include #include +#include #include "vgavideo.h" -#include +#include "../../../../ntoskrnl/include/internal/i386/io.h" INT abs(INT nm) { @@ -360,4 +361,4 @@ BOOL bltToVga(INT x1, INT y1, INT dx, INT dy, UCHAR *bitmap) return TRUE; } -*/ \ No newline at end of file +*/ diff --git a/reactos/drivers/dd/vga/miniport/initvga.c b/reactos/drivers/dd/vga/miniport/initvga.c index 70558dc4957..36c0747ed3e 100644 --- a/reactos/drivers/dd/vga/miniport/initvga.c +++ b/reactos/drivers/dd/vga/miniport/initvga.c @@ -1,6 +1,6 @@ -#include +#include "../../../../ntoskrnl/include/internal/i386/io.h" -#include "vgaVideo.h" +#include "vgavideo.h" void outxay(USHORT ad, UCHAR x, UCHAR y) { diff --git a/reactos/drivers/dd/vga/miniport/vgamp.c b/reactos/drivers/dd/vga/miniport/vgamp.c index e4f4ff0f1f8..4a1265247d3 100644 --- a/reactos/drivers/dd/vga/miniport/vgamp.c +++ b/reactos/drivers/dd/vga/miniport/vgamp.c @@ -125,7 +125,7 @@ VGAFindAdapter(PVOID DeviceExtension, { /* FIXME: Determine if the adapter is present */ *Again = FALSE; - return ERROR_DEV_NOT_EXIST; + return STATUS_DEVICE_DOES_NOT_EXIST; /* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Map resources into system memory for the adapter */ @@ -302,7 +302,7 @@ VGAStartIO(PVOID DeviceExtension, #endif default: - RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; + RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; break; } diff --git a/reactos/ntoskrnl/ldr/pe-bak.h b/reactos/ntoskrnl/ldr/pe-bak.h deleted file mode 100644 index fb5d64cc589..00000000000 --- a/reactos/ntoskrnl/ldr/pe-bak.h +++ /dev/null @@ -1,281 +0,0 @@ -/* - * COPYRIGHT: See copying in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/pe.h - * PURPOSE: Contains portable executable format definitions - * PROGRAMMER: David Welch (welch@mcmail.com) - * UPDATE HISTORY: - * 26/05/98: Created - */ - -/* NOTES - * - * This is taken from the Tool Interface Standard (TIS) Formats Specification - * for Windows - */ - -#ifndef __PE_H -#define __PE_H - -/* - * CPU types - */ -enum -{ - CPU_UNKNOWN, - CPU_I386 = 0x14c, - CPU_I486 = 0x14d, - CPU_PENTIUM = 0x14e, - CPU_MIPS_I = 0x162, - CPU_MIPS_II = 0x163, - CPU_MIPS_III = 0x166, -}; - -/* - * Image flags - */ -enum -{ - IMG_PROGRAM = 0, - IMG_EXECUTABLE = 0, - IMG_FIXED = 0x200, - IMG_LIBRARY = 0x2000, -}; - -/* - * Subsystems - */ -enum -{ - SUBSYS_UNKNOWN, - SUBSYS_NATIVE, - SUBSYS_WINDOWS_GUI, - SUBSYS_WINDOWS_CHARACTER, - SUBSYS_OS2_CHARACTER, - SUBSYS_POSIX_CHARACTER, -}; - -enum -{ - DLL_PERPROCESS_LIB_INITIALIZATION, - DLL_PERPROCESS_LIB_TERMINATION, - DLL_PERTHREAD_LIB_INITIALIZATION, - DLL_PERTHREAD_LIB_TERMINATION, -}; - -enum -{ - OBJ_CODE = 0x20, - OBJ_INITIALIZED_DATA = 0x40, - OBJ_UNINITIALIZED_DATA = 0x80, - OBJ_NOCACHE = 0x40000000, - OBJ_NONPAGEABLE = 0x80000000, - OBJ_SHARED = 0x10000000, - OBJ_EXECUTABLE = 0x20000000, - OBJ_READABLE = 0x40000000, - OBJ_WRITEABLE = 0x80000000 -}; - -typedef struct -{ - /* - * PURPOSE: Signature, current value is 'PE' - */ - unsigned char signature[4]; - - /* - * PURPOSE: CPU required for the image to run - */ - unsigned short int cpu; - - /* - * PURPOSE: Number of entries in the object table - */ - unsigned short int nr_objects; - - /* - * PURPOSE: Time and date when image was created - */ - unsigned long int time_date_stamp; - - unsigned short int reserved1; - unsigned short int reserved2; - - /* - * PURPOSE: Number of bytes in the header following the flags field - */ - unsigned short int nt_hdr_size; - - /* - * PURPOSE: Image flags - */ - unsigned short int flags; - - unsigned char reserved3; - - /* - * PURPOSE: Major/minor version number of the linker - */ - unsigned char linker_major_ver; - unsigned char linker_minor_ver; - - unsigned char reserved4; - unsigned long int reserved5; - unsigned long int reserved6; - - /* - * PURPOSE: Entry point relative to the image base - */ - unsigned long int entry; - - unsigned long int reserved7; - unsigned long int reserved8; - - /* - * PURPOSE: Virtual base of image. This will be the virtual address of - * the first byte of file. It must be a multiple of 64k - */ - unsigned long int image_base; - - /* - * PURPOSE: Object alignment factor - */ - unsigned long int object_align; - - /* - * PURPOSE: Alignment factor used to align image pages - */ - unsigned long int file_align; - - /* - * PURPOSE: OS version required to run this image - */ - unsigned short int os_version; - - /* - * PURPOSE: User specified version number - */ - unsigned short int user_version; - - /* - * PURPOSE: Subsystem version required - */ - unsigned short int subsys_version; - - unsigned long int reserved9; - - /* - * PURPOSE: Size of the image in bytes (including all headers) - */ - unsigned long int image_size; - - /* - * PURPOSE: Header size (Total of DOS header, PE header and object table) - */ - unsigned long int hdr_size; - - /* - * PURPOSE: Checksum for entire file - */ - unsigned long int checksum; - - /* - * PURPOSE: Subsystem required to run this image - */ - unsigned short int subsystem; - - /* - * PURPOSE: Special loader requirements - */ - unsigned short int dll_flags; - - /* - * PURPOSE: Stack size needed for image - */ - unsigned long int stack_reserve_size; - - /* - * PURPOSE: Stack size to be committed - */ - unsigned long int stack_commit_size; - - /* - * PURPOSE: Size of local heap to reserve - */ - unsigned long int heap_reserve_size; - - /* - * PURPOSE: Size of local heap to commit - */ - unsigned long int heap_commit_size; - - unsigned long int reserved10; - - /* - * PURPOSE: Size of the array that follows - */ - unsigned long int nr_rvas; - - - unsigned long int export_table_rva; - unsigned long int export_table_size; - unsigned long int import_table_rva; - unsigned long int import_table_size; - unsigned long int resource_tlb_rva; - unsigned long int resource_tlb_size; - unsigned long int exception_table_rva; - unsigned long int exception_table_size; - unsigned long int security_table_rva; - unsigned long int security_table_size; - unsigned long int fixup_table_rva; - unsigned long int fixup_table_size; - unsigned long int debug_table_rva; - unsigned long int debug_table_size; - unsigned long int image_description_rva; - unsigned long int image_description_size; - unsigned long int mach_specific_rva; - unsigned long int mach_specific_size; - unsigned long int tls_rva; - unsigned long int tls_size; -} PE_header; - -typedef struct -/* - * PURPOSE: Defines an entry in the image object table - */ -{ - /* - * PURPOSE: Name of object - */ - unsigned char name[8]; - - /* - * PURPOSE: Size to allocate in memory - */ - unsigned long int virtual_size; - - /* - * PURPOSE: Base address of object relative to the image base - */ - unsigned long int rva; - - /* - * PURPOSE: Size of initialized data - */ - unsigned long int physical_size; - - /* - * PURPOSE: Offset relative to the beginning of the image of the - * data for the object - */ - unsigned long int physical_offset; - - unsigned long int reserved[3]; - - /* - * PURPOSE: Object flags - */ - unsigned long int object_flags; -} PE_ObjectTableEntry; - -#endif /* __PE_H */ diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c index 2c5b9834b9d..8c8f67b093c 100644 --- a/reactos/ntoskrnl/mm/freelist.c +++ b/reactos/ntoskrnl/mm/freelist.c @@ -16,8 +16,6 @@ #include #include #include -#include -#include #define NDEBUG #include