Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove Freeldr's dependency on windef.h

Browse source 
- Explicitly include winerror.h

svn path=/trunk/; revision=37641
This commit is contained in:
Stefan Ginsberg 2008-11-25 16:55:43 +00:00
parent 4409645578
commit ed46b7621c
10 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
View file

@ -25,6 +25,12 @@
#define NDEBUG
#include <debug.h>
/* non-standard specifier from windef.h -- please deprecate */
#undef PACKED
#ifdef __GNUC__
#define PACKED __attribute__((packed))
#endif
typedef struct
{
UCHAR Signature[4]; // (ret) signature ("VESA")

6
reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
View file

@ -22,6 +22,12 @@
#define NDEBUG
#include <debug.h>
/* non-standard specifier from windef.h -- please deprecate */
#undef PACKED
#ifdef __GNUC__
#define PACKED __attribute__((packed))
#endif
typedef struct
{
UCHAR PacketSize; // 00h - Size of packet (10h or 18h)

6
reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
View file

@ -22,6 +22,12 @@
#define NDEBUG
#include <debug.h>
/* non-standard specifier from windef.h -- please deprecate */
#undef PACKED
#ifdef __GNUC__
#define PACKED __attribute__((packed))
#endif
#define VIDEOPORT_PALETTE_READ 0x03C7
#define VIDEOPORT_PALETTE_WRITE 0x03C8
#define VIDEOPORT_PALETTE_DATA 0x03C9

2
reactos/boot/freeldr/freeldr/fs/ext2.c
View file

@ -182,7 +182,7 @@ FILE* Ext2OpenFile(PCSTR FileName)
*/
BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer)
{
UINT i;
UINT32 i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;

8
reactos/boot/freeldr/freeldr/fs/fat.c
View file

@ -784,7 +784,7 @@ static BOOLEAN FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG Dir
*/
BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer)
{
UINT i;
UINT32 i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;
@ -922,9 +922,9 @@ void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry)
BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
{
ULONG fat = 0;
UINT FatOffset;
UINT ThisFatSecNum;
UINT ThisFatEntOffset;
UINT32 FatOffset;
UINT32 ThisFatSecNum;
UINT32 ThisFatEntOffset;
DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster));

2
reactos/boot/freeldr/freeldr/fs/iso.c
View file

@ -172,7 +172,7 @@ static PVOID IsoBufferDirectory(ULONG DirectoryStartSector, ULONG DirectoryLengt
*/
static BOOLEAN IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer)
{
UINT i;
UINT32 i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;

1
reactos/boot/freeldr/freeldr/include/freeldr.h
View file

@ -84,6 +84,7 @@
#include <ver.h>
#include <cmdline.h>
#include <bget.h>
#include <winerror.h>
/* Needed by boot manager */
#include <bootmgr.h>
#include <oslist.h>

2
reactos/boot/freeldr/freeldr/include/winldr.h
View file

@ -27,7 +27,7 @@
// ReactOS Loading Functions
//
///////////////////////////////////////////////////////////////////////////////////////
VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion);
VOID LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion);
/* Entry-point to kernel */
typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock);

4
reactos/boot/freeldr/freeldr/mm/meminit.c
View file

@ -476,8 +476,8 @@ ULONG MmFindAvailablePagesBeforePage(PVOID PageLookupTable, ULONG TotalPageCount
VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount)
{
UINT Index;
UINT Index2;
UINT32 Index;
UINT32 Index2;
// Loop through each entry in the array
for (Index=0; Index<*MapCount; Index++)

4
reactos/boot/freeldr/freeldr/windows/winldr.c
View file

@ -77,7 +77,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
PCHAR Options,
PCHAR SystemPath,
PCHAR BootPath,
WORD VersionToBoot)
USHORT VersionToBoot)
{
/* Examples of correct options and paths */
//CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200";
@ -417,7 +417,7 @@ PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size,
VOID
LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion)
{
CHAR MsgBuffer[256];
CHAR SystemPath[512], SearchPath[512];