Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 42540: Remove dead code
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 23:50:15 2009 New Revision: 42540 URL: http://svn.reactos.org/svn/reactos?rev=42540&view=rev Log: Remove dead code Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sat Aug 8 23:50:15 2009 @@ -142,41 +142,6 @@ // Do not check for error; this function is // supposed to always succeed // -} - -ULONG FsGetFilePointer(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - LONG ret; - - // - // Query file informations - // - ret = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (ret != ESUCCESS || Information.CurrentAddress.HighPart != 0) - return 0; - - // - // Return file pointer position - // - return Information.CurrentAddress.LowPart; -} - -BOOLEAN FsIsEndOfFile(PFILE FileHandle) -{ - if (FsGetFilePointer(FileHandle) >= FsGetFileSize(FileHandle)) - { - return TRUE; - } - else - { - return FALSE; - } } /* Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Sat Aug 8 23:50:15 2009 @@ -54,8 +54,6 @@ BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); ULONG FsGetFileSize(PFILE FileHandle); VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); -ULONG FsGetFilePointer(PFILE FileHandle); -BOOLEAN FsIsEndOfFile(PFILE FileHandle); ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);

1 0

[hpoussin] 42539: Use Arc* infrastructure to read the .inf file
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 23:23:23 2009 New Revision: 42539 URL: http://svn.reactos.org/svn/reactos?rev=42539&view=rev Log: Use Arc* infrastructure to read the .inf file Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] Sat Aug 8 23:23:23 2009 @@ -873,91 +873,107 @@ PCSTR FileName, PULONG ErrorLine) { - PFILE FileHandle; - PCHAR FileBuffer; - ULONG FileSize; - PINFCACHE Cache; - BOOLEAN Success; - - - *InfHandle = NULL; - *ErrorLine = (ULONG)-1; - - - /* Open the inf file */ - FileHandle = FsOpenFile (FileName); - if (FileHandle == NULL) - { -// DPRINT("NtOpenFile() failed (Status %lx)\n", Status); - return FALSE; - } - -// DPRINT("NtOpenFile() successful\n"); - - /* Query file size */ - FileSize = FsGetFileSize (FileHandle); - if (FileSize == 0) - { -// DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); - FsCloseFile (FileHandle); - return FALSE; - } - -// DPRINT("File size: %lu\n", FileLength); - - /* Allocate file buffer */ - FileBuffer = MmHeapAlloc (FileSize + 1); - if (FileBuffer == NULL) - { -// DPRINT1("RtlAllocateHeap() failed\n"); - FsCloseFile (FileHandle); - return FALSE; - } - - /* Read file */ - Success = FsReadFile(FileHandle, FileSize, NULL, FileBuffer); - - FsCloseFile (FileHandle); - if (!Success) - { -// DPRINT("FsReadFile() failed\n"); - MmHeapFree (FileBuffer); - return FALSE; - } - - /* Append string terminator */ - FileBuffer[FileSize] = 0; - - /* Allocate infcache header */ - Cache = (PINFCACHE)MmHeapAlloc (sizeof(INFCACHE)); - if (Cache == NULL) - { -// DPRINT("RtlAllocateHeap() failed\n"); - MmHeapFree (FileBuffer); - return FALSE; - } - - /* Initialize inicache header */ - RtlZeroMemory(Cache, - sizeof(INFCACHE)); - - /* Parse the inf buffer */ - Success = InfpParseBuffer (Cache, - FileBuffer, - FileBuffer + FileSize, - ErrorLine); - if (!Success) - { - MmHeapFree (Cache); - Cache = NULL; - } - - /* Free file buffer */ - MmHeapFree (FileBuffer); - - *InfHandle = (HINF)Cache; - - return Success; + FILEINFORMATION Information; + ULONG FileId; + PCHAR FileBuffer; + ULONG FileSize, Count; + PINFCACHE Cache; + BOOLEAN Success; + LONG ret; + + *InfHandle = NULL; + *ErrorLine = (ULONG)-1; + + // + // Open the .inf file + // + FileId = FsOpenFile(FileName); + if (!FileId) + { + return FALSE; + } + + // + // Query file size + // + ret = ArcGetFileInformation(FileId, &Information); + if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) + { + ArcClose(FileId); + return FALSE; + } + FileSize = Information.EndingAddress.LowPart; + + // + // Allocate buffer to cache the file + // + FileBuffer = MmHeapAlloc(FileSize + 1); + if (!FileBuffer) + { + ArcClose(FileId); + return FALSE; + } + + // + // Read file into memory + // + ret = ArcRead(FileId, FileBuffer, FileSize, &Count); + if (ret != ESUCCESS || Count != FileSize) + { + ArcClose(FileId); + MmHeapFree(FileBuffer); + return FALSE; + } + + // + // We don't need the file anymore. Close it + // + ArcClose(FileId); + + // + // Append string terminator + // + FileBuffer[FileSize] = 0; + + // + // Allocate infcache header + // + Cache = (PINFCACHE)MmHeapAlloc(sizeof(INFCACHE)); + if (!Cache) + { + MmHeapFree (FileBuffer); + return FALSE; + } + + // + // Initialize inicache header + // + RtlZeroMemory(Cache, sizeof(INFCACHE)); + + // + // Parse the inf buffer + // + Success = InfpParseBuffer(Cache, + FileBuffer, + FileBuffer + FileSize, + ErrorLine); + if (!Success) + { + MmHeapFree(Cache); + Cache = NULL; + } + + // + // Free file buffer, as it has been parsed + // + MmHeapFree(FileBuffer); + + // + // Return .inf parsed contents + // + *InfHandle = (HINF)Cache; + + return Success; }

1 0

[hpoussin] 42538: Fix some typos and make PFILE a ULONG
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 23:11:40 2009 New Revision: 42538 URL: http://svn.reactos.org/svn/reactos?rev=42538&view=rev Log: Fix some typos and make PFILE a ULONG Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -21,12 +21,12 @@ #include <debug.h> BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); -FILE* Ext2OpenFile(PCSTR FileName); +PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName); BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG SectorCount, PVOID Buffer); -BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); +BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); BOOLEAN Ext2ReadSuperBlock(VOID); BOOLEAN Ext2ReadGroupDescriptors(VOID); BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer); @@ -102,7 +102,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* Ext2OpenFile(PCSTR FileName) +PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; @@ -194,7 +194,7 @@ RtlCopyMemory(FileHandle, &TempExt2FileInfo, sizeof(EXT2_FILE_INFO)); - return (FILE*)FileHandle; + return FileHandle; } } @@ -360,9 +360,8 @@ * Reads BytesToRead from open file and * returns the number of bytes read in BytesRead */ -BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer) -{ - PEXT2_FILE_INFO Ext2FileInfo = (PEXT2_FILE_INFO)FileHandle; +BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer) +{ ULONG BlockNumber; ULONG BlockNumberIndex; ULONG OffsetInBlock; @@ -1223,7 +1222,7 @@ LONG Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { - PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); ULONGLONG BytesReadBig; BOOLEAN ret; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -33,7 +33,7 @@ BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer); BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); +BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN gCacheEnabled = FALSE; @@ -1224,9 +1224,8 @@ * Reads BytesToRead from open file and * returns the number of bytes read in BytesRead */ -BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - PFAT_FILE_INFO FatFileInfo = (PFAT_FILE_INFO)FileHandle; +BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) +{ ULONG ClusterNumber; ULONG OffsetInCluster; ULONG LengthInCluster; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -62,7 +62,7 @@ if (ret == ESUCCESS) return (PFILE)FileId; else - return NULL; + return (PFILE)0; } VOID FsCloseFile(PFILE FileHandle) Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -34,8 +34,7 @@ #define FS_EXT2 3 #define FS_ISO9660 5 -#define FILE VOID -#define PFILE FILE * +#define PFILE ULONG VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -98,9 +98,9 @@ VOID FASTCALL FrLdrSetupPae(ULONG Magic); VOID FASTCALL FrLdrSetupPageDirectory(VOID); VOID FASTCALL FrLdrGetPaeMode(VOID); -BOOLEAN NTAPI FrLdrMapKernel(FILE *KernelImage); +BOOLEAN NTAPI FrLdrMapKernel(PFILE KernelImage); ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName); -ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); +ULONG_PTR NTAPI FrLdrLoadModule(PFILE ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID NTAPI FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); @@ -108,7 +108,7 @@ PVOID NTAPI FrLdrMapImage( - IN FILE *Image, + IN PFILE Image, IN PCHAR ShortName, IN ULONG ImageType ); @@ -116,7 +116,7 @@ PVOID NTAPI FrLdrReadAndMapImage( - IN FILE *Image, + IN PFILE Image, IN PCHAR ShortName, IN ULONG ImageType ); Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -43,8 +43,8 @@ VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description) { - PFILE LinuxKernel = NULL; - PFILE LinuxInitrdFile = NULL; + PFILE LinuxKernel = 0; + PFILE LinuxInitrdFile = 0; CHAR TempString[260]; UiDrawBackdrop(); @@ -81,7 +81,7 @@ // Open the kernel LinuxKernel = FsOpenFile(LinuxKernelName); - if (LinuxKernel == NULL) + if (!LinuxKernel) { sprintf(TempString, "Linux kernel \'%s\' not found.", LinuxKernelName); UiMessageBox(TempString); @@ -92,7 +92,7 @@ if (LinuxHasInitrd) { LinuxInitrdFile = FsOpenFile(LinuxInitrdName); - if (LinuxInitrdFile == NULL) + if (!LinuxInitrdFile) { sprintf(TempString, "Linux initrd image \'%s\' not found.", LinuxInitrdName); UiMessageBox(TempString); @@ -178,11 +178,11 @@ LinuxBootFailed: - if (LinuxKernel != NULL) + if (LinuxKernel) { FsCloseFile(LinuxKernel); } - if (LinuxInitrdFile != NULL) + if (LinuxInitrdFile) { FsCloseFile(LinuxInitrdFile); } Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -58,7 +58,7 @@ } FilePointer = FsOpenFile(FileName); - if (FilePointer == NULL) + if (!FilePointer) { strcat(FileName, " not found."); UiMessageBox(FileName); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -65,7 +65,7 @@ ULONG_PTR NTAPI -FrLdrLoadModule(FILE *ModuleImage, +FrLdrLoadModule(PFILE ModuleImage, LPCSTR ModuleName, PULONG ModuleSize) { @@ -435,7 +435,7 @@ PVOID NTAPI -FrLdrReadAndMapImage(IN FILE *Image, +FrLdrReadAndMapImage(IN PFILE Image, IN PCHAR Name, IN ULONG ImageType) { @@ -674,7 +674,7 @@ PVOID NTAPI -FrLdrMapImage(IN FILE *Image, +FrLdrMapImage(IN PFILE Image, IN PCHAR Name, IN ULONG ImageType) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Aug 8 23:11:40 2009 @@ -67,7 +67,7 @@ FilePointer = FsOpenFile(szFileName); /* Try under the system root in the main dir and drivers */ - if (FilePointer == NULL) + if (!FilePointer) { strcpy(value, SystemRoot); if(value[strlen(value)-1] != '\\') @@ -76,7 +76,7 @@ FilePointer = FsOpenFile(value); } - if (FilePointer == NULL) + if (!FilePointer) { strcpy(value, SystemRoot); if(value[strlen(value)-1] != '\\') @@ -86,7 +86,7 @@ FilePointer = FsOpenFile(value); } - if (FilePointer == NULL) + if (!FilePointer) { strcpy(value, SystemRoot); if(value[strlen(value)-1] != '\\') @@ -97,7 +97,7 @@ } /* Make sure we did */ - if (FilePointer == NULL) { + if (!FilePointer) { /* Fail if file wasn't opened */ strcpy(value, szFileName); @@ -201,7 +201,7 @@ FilePointer = FsOpenFile(szFileName); /* Make sure we did */ - if (FilePointer == NULL) { + if (!FilePointer) { /* Fail if file wasn't opened */ strcpy(value, szFileName); @@ -847,7 +847,7 @@ DPRINTM(DPRINT_REACTOS, "SystemHive: '%s'", szFileName); FilePointer = FsOpenFile(szFileName); - if (FilePointer == NULL) + if (!FilePointer) { UiMessageBox("Could not find the System hive!"); return;

1 0

[hpoussin] 42537: - Half-convert FAT, Ext2 and NTFS filesytems to provide new ARC file infrastructure. This allows removing some compatibility code in fs.c - Remove use of FsOpenBootVolume() and FsOpenSystemVolume(). If callers don't want a file on boot volume, they need to use the new ArcOpen/ArcSeek/ArcRead/ArcClose functions instead of the old FsOpenFile/FsSetFilePointer/FsReadFile/FsCloseFile
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 22:53:10 2009 New Revision: 42537 URL: http://svn.reactos.org/svn/reactos?rev=42537&view=rev Log: - Half-convert FAT, Ext2 and NTFS filesytems to provide new ARC file infrastructure. This allows removing some compatibility code in fs.c - Remove use of FsOpenBootVolume() and FsOpenSystemVolume(). If callers don't want a file on boot volume, they need to use the new ArcOpen/ArcSeek/ArcRead/ArcClose functions instead of the old FsOpenFile/FsSetFilePointer/FsReadFile/FsCloseFile Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/fs.h trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -264,11 +264,7 @@ BOOLEAN PpcDiskGetSystemVolume( char *SystemPath, char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType ) { + PULONG Device ) { char *remain = strchr(SystemPath, '\\'); if( remain ) { strcpy( RemainingPath, remain+1 ); @@ -278,7 +274,7 @@ *Device = 0; // Hack to be a bit easier on ram CacheSizeLimit = 64 * 1024; - return MachDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); + return TRUE; } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -31,12 +31,6 @@ LONG TimeOut; ULONG SelectedOperatingSystem; - if (!FsOpenBootVolume()) - { - UiMessageBoxCritical("Error opening boot partition for file access."); - return; - } - // FIXME: if possible, only detect and register ARC devices... if (!MachHwDetect()) { Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -241,22 +241,19 @@ BOOLEAN DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType) + PULONG Device) { ULONG PartitionNumber; PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR VolumeType; CHAR BootPath[256]; unsigned i, RosPartition; + ULONG DriveNumber; /* * Verify system path */ - if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) + if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) { return FALSE; } @@ -278,7 +275,7 @@ RosPartition = 0; while (1) { - if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) + if (!MachDiskGetPartitionEntry(DriveNumber, ++i, &PartitionTableEntry)) { return FALSE; } @@ -294,33 +291,28 @@ } /* Check for ISO9660 file system type */ - if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) + if (DriveNumber >= 0x80 && FsRecIsIso9660(DriveNumber)) { DPRINTM(DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n"); if (NULL != Device) { - ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[0] = (char)DriveNumber; ((char *)Device)[1] = (char)i; } - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; return TRUE; } - if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) + if (!FsRecognizeVolume(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) { return FALSE; } if (NULL != Device) { - ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[0] = (char)DriveNumber; ((char *)Device)[1] = (char)i; } - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; switch (VolumeType) { @@ -330,16 +322,10 @@ case PARTITION_XINT13: case PARTITION_FAT32: case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; case PARTITION_NTFS: - *FsType = FS_NTFS; return TRUE; default: - *FsType = 0; return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -20,6 +20,31 @@ #include <freeldr.h> #include <debug.h> +BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); +FILE* Ext2OpenFile(PCSTR FileName); +BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); +BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG SectorCount, PVOID Buffer); + +BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); +BOOLEAN Ext2ReadSuperBlock(VOID); +BOOLEAN Ext2ReadGroupDescriptors(VOID); +BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer); +BOOLEAN Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer); +BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +ULONG Ext2GetGroupDescBlockNumber(ULONG Group); +ULONG Ext2GetGroupDescOffsetInBlock(ULONG Group); +ULONG Ext2GetInodeGroupNumber(ULONG Inode); +ULONG Ext2GetInodeBlockNumber(ULONG Inode); +ULONG Ext2GetInodeOffsetInBlock(ULONG Inode); +BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer); +BOOLEAN Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer); +ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode); +ULONGLONG Ext2GetInodeFileSize(PEXT2_INODE Inode); +BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock); +BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock); +BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock); + GEOMETRY Ext2DiskGeometry; // Ext2 file system disk geometry PEXT2_SUPER_BLOCK Ext2SuperBlock = NULL; // Ext2 file system super block @@ -517,43 +542,6 @@ } return TRUE; -} - -BOOLEAN Ext2ReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - BOOLEAN Success; - ULONGLONG BytesReadBig; - - Success = Ext2ReadFileBig(FileHandle, BytesToRead, &BytesReadBig, Buffer); - *BytesRead = (ULONG)BytesReadBig; - return Success; -} - -ULONG Ext2GetFileSize(FILE *FileHandle) -{ - PEXT2_FILE_INFO Ext2FileHandle = (PEXT2_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "Ext2GetFileSize() FileSize = %d\n", Ext2FileHandle->FileSize); - - return Ext2FileHandle->FileSize; -} - -VOID Ext2SetFilePointer(FILE *FileHandle, ULONG NewFilePointer) -{ - PEXT2_FILE_INFO Ext2FileHandle = (PEXT2_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "Ext2SetFilePointer() NewFilePointer = %d\n", NewFilePointer); - - Ext2FileHandle->FilePointer = NewFilePointer; -} - -ULONG Ext2GetFilePointer(FILE *FileHandle) -{ - PEXT2_FILE_INFO Ext2FileHandle = (PEXT2_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "Ext2GetFilePointer() FilePointer = %d\n", Ext2FileHandle->FilePointer); - - return Ext2FileHandle->FilePointer; } BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG SectorCount, PVOID Buffer) @@ -1178,12 +1166,144 @@ return TRUE; } -const FS_VTBL Ext2Vtbl = { - Ext2OpenVolume, - Ext2OpenFile, - NULL, - Ext2ReadFile, - Ext2GetFileSize, - Ext2SetFilePointer, - Ext2GetFilePointer, +LONG Ext2Close(ULONG FileId) +{ + PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + MmHeapFree(FileHandle); + + return ESUCCESS; +} + +LONG Ext2GetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = FileHandle->FileSize; + Information->CurrentAddress.LowPart = FileHandle->FilePointer; + + DPRINTM(DPRINT_FILESYSTEM, "Ext2GetFileInformation() FileSize = %d\n", + Information->EndingAddress.LowPart); + DPRINTM(DPRINT_FILESYSTEM, "Ext2GetFileInformation() FilePointer = %d\n", + Information->CurrentAddress.LowPart); + + return ESUCCESS; +} + +LONG Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + PEXT2_FILE_INFO FileHandle; + ULONG DeviceId; + + if (OpenMode != OpenReadOnly) + return EACCES; + + DeviceId = FsGetDeviceId(*FileId); + + DPRINTM(DPRINT_FILESYSTEM, "Ext2Open() FileName = %s\n", Path); + + // + // Call old open method + // + FileHandle = Ext2OpenFile(Path); + + // + // Check for error + // + if (!FileHandle) + return ENOENT; + + // + // Success. Remember the handle + // + FsSetDeviceSpecific(*FileId, FileHandle); + return ESUCCESS; +} + +LONG Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + ULONGLONG BytesReadBig; + BOOLEAN ret; + + // + // Read data + // + ret = Ext2ReadFileBig(FileHandle, N, &BytesReadBig, Buffer); + *Count = (ULONG)BytesReadBig; + + // + // Check for success + // + if (ret) + return ESUCCESS; + else + return EIO; +} + +LONG Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + DPRINTM(DPRINT_FILESYSTEM, "Ext2Seek() NewFilePointer = %lu\n", Position->LowPart); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->HighPart != 0) + return EINVAL; + if (Position->LowPart >= FileHandle->FileSize) + return EINVAL; + + FileHandle->FilePointer = Position->LowPart; + return ESUCCESS; +} + +const DEVVTBL Ext2FuncTable = +{ + Ext2Close, + Ext2GetFileInformation, + Ext2Open, + Ext2Read, + Ext2Seek, }; + +const DEVVTBL* Ext2Mount(ULONG DeviceId) +{ + EXT2_SUPER_BLOCK SuperBlock; + LARGE_INTEGER Position; + ULONG Count; + LONG ret; + + // + // Read the SuperBlock + // + Position.HighPart = 0; + Position.LowPart = 2 * 512; + ret = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) + return NULL; + ret = ArcRead(DeviceId, &SuperBlock, sizeof(SuperBlock), &Count); + if (ret != ESUCCESS || Count != sizeof(SuperBlock)) + return NULL; + + // + // Check if SuperBlock is valid. If yes, return Ext2 function table + // + if (SuperBlock.s_magic == EXT3_SUPER_MAGIC) + { + // + // Compatibility hack as long as FS is not using underlying device DeviceId + // + ULONG DriveNumber; + ULONGLONG StartSector; + ULONGLONG SectorCount; + int Type; + if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + return NULL; + Ext2OpenVolume(DriveNumber, StartSector, SectorCount); + return &Ext2FuncTable; + } + else + return NULL; +} Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -21,6 +21,20 @@ #define NDEBUG #include <debug.h> + +ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); +PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); +BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); +void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); +BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); +ULONG FatCountClustersInChain(ULONG StartCluster); +ULONG* FatGetClusterChainArray(ULONG StartCluster); +BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer); +BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); +BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); +BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN gCacheEnabled = FALSE; @@ -778,11 +792,10 @@ /* * FatLookupFile() * This function searches the file system for the - * specified filename and fills in a FAT_FILE_INFO structure - * with info describing the file, etc. returns true - * if the file exists or false otherwise + * specified filename and fills in an FAT_FILE_INFO structure + * with info describing the file, etc. returns ARC error code */ -BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) +LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -825,7 +838,7 @@ DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); if (DirectoryBuffer == NULL) { - return FALSE; + return ENOMEM; } // @@ -836,7 +849,7 @@ if (!FatXSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); - return FALSE; + return ENOENT; } } else @@ -844,7 +857,7 @@ if (!FatSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); - return FALSE; + return ENOENT; } } @@ -863,7 +876,7 @@ memcpy(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); - return TRUE; + return ESUCCESS; } /* @@ -1006,35 +1019,6 @@ *ClusterPointer = fat; return TRUE; -} - -/* - * FatOpenFile() - * Tries to open the file 'name' and returns true or false - * for success and failure respectively - */ -FILE* FatOpenFile(PCSTR FileName) -{ - FAT_FILE_INFO TempFatFileInfo; - PFAT_FILE_INFO FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "FatOpenFile() FileName = %s\n", FileName); - - if (!FatLookupFile(FileName, &TempFatFileInfo)) - { - return NULL; - } - - FileHandle = MmHeapAlloc(sizeof(FAT_FILE_INFO)); - - if (FileHandle == NULL) - { - return NULL; - } - - memcpy(FileHandle, &TempFatFileInfo, sizeof(FAT_FILE_INFO)); - - return (FILE*)FileHandle; } ULONG FatCountClustersInChain(ULONG StartCluster) @@ -1394,33 +1378,6 @@ return TRUE; } -ULONG FatGetFileSize(FILE *FileHandle) -{ - PFAT_FILE_INFO FatFileHandle = (PFAT_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "FatGetFileSize() FileSize = %d\n", FatFileHandle->FileSize); - - return FatFileHandle->FileSize; -} - -VOID FatSetFilePointer(FILE *FileHandle, ULONG NewFilePointer) -{ - PFAT_FILE_INFO FatFileHandle = (PFAT_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "FatSetFilePointer() NewFilePointer = %d\n", NewFilePointer); - - FatFileHandle->FilePointer = NewFilePointer; -} - -ULONG FatGetFilePointer(FILE *FileHandle) -{ - PFAT_FILE_INFO FatFileHandle = (PFAT_FILE_INFO)FileHandle; - - DPRINTM(DPRINT_FILESYSTEM, "FatGetFilePointer() FilePointer = %d\n", FatFileHandle->FilePointer); - - return FatFileHandle->FilePointer; -} - BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { if (gCacheEnabled) @@ -1443,12 +1400,147 @@ } } -const FS_VTBL FatVtbl = { - FatOpenVolume, - FatOpenFile, - NULL, - FatReadFile, - FatGetFileSize, - FatSetFilePointer, - FatGetFilePointer, +LONG FatClose(ULONG FileId) +{ + PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + MmHeapFree(FileHandle); + + return ESUCCESS; +} + +LONG FatGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = FileHandle->FileSize; + Information->CurrentAddress.LowPart = FileHandle->FilePointer; + + DPRINTM(DPRINT_FILESYSTEM, "FatGetFileInformation() FileSize = %d\n", + Information->EndingAddress.LowPart); + DPRINTM(DPRINT_FILESYSTEM, "FatGetFileInformation() FilePointer = %d\n", + Information->CurrentAddress.LowPart); + + return ESUCCESS; +} + +LONG FatOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + FAT_FILE_INFO TempFileInfo; + PFAT_FILE_INFO FileHandle; + ULONG DeviceId; + LONG ret; + + if (OpenMode != OpenReadOnly) + return EACCES; + + DeviceId = FsGetDeviceId(*FileId); + + DPRINTM(DPRINT_FILESYSTEM, "FatOpen() FileName = %s\n", Path); + + RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); + ret = FatLookupFile(Path, DeviceId, &TempFileInfo); + if (ret != ESUCCESS) + return ENOENT; + + FileHandle = MmHeapAlloc(sizeof(FAT_FILE_INFO)); + if (!FileHandle) + return ENOMEM; + + RtlCopyMemory(FileHandle, &TempFileInfo, sizeof(FAT_FILE_INFO)); + + FsSetDeviceSpecific(*FileId, FileHandle); + return ESUCCESS; +} + +LONG FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + BOOLEAN ret; + + // + // Call old read method + // + ret = FatReadFile(FileHandle, N, Count, Buffer); + + // + // Check for success + // + if (ret) + return ESUCCESS; + else + return EIO; +} + +LONG FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + + DPRINTM(DPRINT_FILESYSTEM, "FatSeek() NewFilePointer = %lu\n", Position->LowPart); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->HighPart != 0) + return EINVAL; + if (Position->LowPart >= FileHandle->FileSize) + return EINVAL; + + FileHandle->FilePointer = Position->LowPart; + return ESUCCESS; +} + +const DEVVTBL FatFuncTable = +{ + FatClose, + FatGetFileInformation, + FatOpen, + FatRead, + FatSeek, }; + +const DEVVTBL* FatMount(ULONG DeviceId) +{ + UCHAR Buffer[512]; + PFAT_BOOTSECTOR BootSector = (PFAT_BOOTSECTOR)Buffer; + PFAT32_BOOTSECTOR BootSector32 = (PFAT32_BOOTSECTOR)Buffer; + PFATX_BOOTSECTOR BootSectorX = (PFATX_BOOTSECTOR)Buffer; + LARGE_INTEGER Position; + ULONG Count; + LONG ret; + + // + // Read the BootSector + // + Position.HighPart = 0; + Position.LowPart = 0; + ret = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) + return NULL; + ret = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); + if (ret != ESUCCESS || Count != sizeof(Buffer)) + return NULL; + + // + // Check if BootSector is valid. If yes, return FAT function table + // + if (RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) || + RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) || + RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) || + RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) + { + // + // Compatibility hack as long as FS is not using underlying device DeviceId + // + ULONG DriveNumber; + ULONGLONG StartSector; + ULONGLONG SectorCount; + int Type; + if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + return NULL; + FatOpenVolume(DriveNumber, StartSector, SectorCount); + return &FatFuncTable; + } + else + return NULL; +} Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -24,31 +24,28 @@ #include <debug.h> ///////////////////////////////////////////////////////////////////////////////////////////// -// DATA -///////////////////////////////////////////////////////////////////////////////////////////// - -const FS_VTBL* pFSVtbl = NULL; // Type of filesystem on boot device, set by FsOpenVolume() -PVOID FsStaticBufferDisk = 0, FsStaticBufferData = 0; - -///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS ///////////////////////////////////////////////////////////////////////////////////////////// -static BOOLEAN CompatArcOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) -{ - // - // Always return success - // - return TRUE; -} - -static FILE* CompatArcOpenFile(PCSTR FileName) +VOID FileSystemError(PCSTR ErrorString) +{ + DPRINTM(DPRINT_FILESYSTEM, "%s\n", ErrorString); + + UiMessageBox(ErrorString); +} + +PFILE FsOpenFile(PCSTR FileName) { CHAR FullPath[MAX_PATH]; ULONG FileId; LONG ret; // + // Print status message + // + DPRINTM(DPRINT_FILESYSTEM, "Opening file '%s'...\n", FileName); + + // // Create full file name // MachDiskGetBootPath(FullPath, sizeof(FullPath)); @@ -63,261 +60,24 @@ // Check for success // if (ret == ESUCCESS) - return (FILE*)FileId; + return (PFILE)FileId; else return NULL; } -static BOOLEAN CompatArcReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) +VOID FsCloseFile(PFILE FileHandle) { ULONG FileId = (ULONG)FileHandle; - LONG ret; - - // - // Read the file - // - ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); - - // - // Check for success - // - if (ret == ESUCCESS) - return TRUE; - else - return FALSE; -} - -ULONG CompatArcGetFileSize(FILE *FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - LONG ret; - - // - // Query file informations - // - ret = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) - return 0; - - // - // Return file size - // - return Information.EndingAddress.LowPart; -} - -VOID CompatArcSetFilePointer(FILE *FileHandle, ULONG NewFilePointer) -{ - ULONG FileId = (ULONG)FileHandle; - LARGE_INTEGER Position; - - // - // Set file position - // - Position.HighPart = 0; - Position.LowPart = NewFilePointer; - ArcSeek(FileId, &Position, SeekAbsolute); + + // + // Close the handle + // + ArcClose(FileId); // // Do not check for error; this function is // supposed to always succeed // -} - -ULONG CompatArcGetFilePointer(FILE *FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - LONG ret; - - // - // Query file informations - // - ret = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (ret != ESUCCESS || Information.CurrentAddress.HighPart != 0) - return 0; - - // - // Return file pointer position - // - return Information.CurrentAddress.LowPart; -} - -static const FS_VTBL CompatArcVtbl = -{ - CompatArcOpenVolume, - CompatArcOpenFile, - NULL, - CompatArcReadFile, - CompatArcGetFileSize, - CompatArcSetFilePointer, - CompatArcGetFilePointer, -}; - -VOID FileSystemError(PCSTR ErrorString) -{ - DPRINTM(DPRINT_FILESYSTEM, "%s\n", ErrorString); - - UiMessageBox(ErrorString); -} - -/* - * - * BOOLEAN FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type); - * - * This function is called to open a disk volume for file access. - * It must be called before any of the file functions will work. - * - */ -static BOOLEAN FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type) -{ - CHAR ErrorText[80]; - - if( !FsStaticBufferDisk ) - FsStaticBufferDisk = MmAllocateMemory( 0x20000 ); - if( !FsStaticBufferDisk ) - { - FileSystemError("could not allocate filesystem static buffer"); - return FALSE; - } - FsStaticBufferData = ((PCHAR)FsStaticBufferDisk) + 0x10000; - - switch (Type) - { - case FS_FAT: - pFSVtbl = &FatVtbl; - break; - case FS_NTFS: - pFSVtbl = &NtfsVtbl; - break; - case FS_EXT2: - pFSVtbl = &Ext2Vtbl; - break; - case FS_ISO9660: - pFSVtbl = &CompatArcVtbl; - break; - default: - pFSVtbl = NULL; - break; - } - - if (pFSVtbl && pFSVtbl->OpenVolume) - { - return (*pFSVtbl->OpenVolume)(DriveNumber, StartSector, SectorCount); - } - else - { - sprintf(ErrorText, "Unsupported file system. Type: 0x%x", Type); - FileSystemError(ErrorText); - } - - return FALSE; -} -/* - * - * BOOLEAN FsOpenBootVolume() - * - * This function is called to open the boot disk volume for file access. - * It must be called before any of the file functions will work. - */ -BOOLEAN FsOpenBootVolume() -{ - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - - if (! MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) - { - FileSystemError("Unable to locate boot partition\n"); - return FALSE; - } - - return FsOpenVolume(DriveNumber, StartSector, SectorCount, Type); -} - -BOOLEAN FsOpenSystemVolume(char *SystemPath, char *RemainingPath, PULONG Device) -{ - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - - if (! MachDiskGetSystemVolume(SystemPath, RemainingPath, Device, - &DriveNumber, &StartSector, &SectorCount, - &Type)) - { - FileSystemError("Unable to locate system partition\n"); - return FALSE; - } - - return FsOpenVolume(DriveNumber, StartSector, SectorCount, Type); -} - - -PFILE FsOpenFile(PCSTR FileName) -{ - PFILE FileHandle = NULL; - - // - // Print status message - // - DPRINTM(DPRINT_FILESYSTEM, "Opening file '%s'...\n", FileName); - - // - // Check and see if the first character is '\' or '/' and remove it if so - // - while ((*FileName == '\\') || (*FileName == '/')) - { - FileName++; - } - - // - // Check file system type and pass off to appropriate handler - // - if (pFSVtbl && pFSVtbl->OpenFile) - { - FileHandle = pFSVtbl->OpenFile(FileName); - } - else - { - FileSystemError("Error: Unknown filesystem."); - } - - // - // Check return value - // - if (FileHandle != NULL) - { - DPRINTM(DPRINT_FILESYSTEM, "FsOpenFile() succeeded. FileHandle: 0x%x\n", FileHandle); - } - else - { - DPRINTM(DPRINT_FILESYSTEM, "FsOpenFile() failed.\n"); - } - - return FileHandle; -} - -VOID FsCloseFile(PFILE FileHandle) -{ - if (pFSVtbl) - { - if (pFSVtbl->CloseFile) - (*pFSVtbl->CloseFile)(FileHandle); - } - else - { - FileSystemError("Error: Unknown filesystem."); - } } /* @@ -326,61 +86,85 @@ */ BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) { - // - // Set the number of bytes read equal to zero - // - if (BytesRead != NULL) - { - *BytesRead = 0; - } - - if (pFSVtbl && pFSVtbl->ReadFile) - { - return (*pFSVtbl->ReadFile)(FileHandle, BytesToRead, BytesRead, Buffer); - } + ULONG FileId = (ULONG)FileHandle; + LONG ret; + + // + // Read the file + // + ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); + + // + // Check for success + // + if (ret == ESUCCESS) + return TRUE; else - { - FileSystemError("Unknown file system."); return FALSE; - } } ULONG FsGetFileSize(PFILE FileHandle) { - if (pFSVtbl && pFSVtbl->GetFileSize) - { - return (*pFSVtbl->GetFileSize)(FileHandle); - } - else - { - FileSystemError("Unknown file system."); + ULONG FileId = (ULONG)FileHandle; + FILEINFORMATION Information; + LONG ret; + + // + // Query file informations + // + ret = ArcGetFileInformation(FileId, &Information); + + // + // Check for error + // + if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) return 0; - } + + // + // Return file size + // + return Information.EndingAddress.LowPart; } VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) { - if (pFSVtbl && pFSVtbl->SetFilePointer) - { - (*pFSVtbl->SetFilePointer)(FileHandle, NewFilePointer); - } - else - { - FileSystemError("Unknown file system."); - } + ULONG FileId = (ULONG)FileHandle; + LARGE_INTEGER Position; + + // + // Set file position + // + Position.HighPart = 0; + Position.LowPart = NewFilePointer; + ArcSeek(FileId, &Position, SeekAbsolute); + + // + // Do not check for error; this function is + // supposed to always succeed + // } ULONG FsGetFilePointer(PFILE FileHandle) { - if (pFSVtbl && pFSVtbl->SetFilePointer) - { - return (*pFSVtbl->GetFilePointer)(FileHandle); - } - else - { - FileSystemError("Unknown file system."); + ULONG FileId = (ULONG)FileHandle; + FILEINFORMATION Information; + LONG ret; + + // + // Query file informations + // + ret = ArcGetFileInformation(FileId, &Information); + + // + // Check for error + // + if (ret != ESUCCESS || Information.CurrentAddress.HighPart != 0) return 0; - } + + // + // Return file pointer position + // + return Information.CurrentAddress.LowPart; } BOOLEAN FsIsEndOfFile(PFILE FileHandle) @@ -448,71 +232,6 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); } - -LONG CompatFsClose(ULONG FileId) -{ - PFILE FileHandle = FsGetDeviceSpecific(FileId); - - FsCloseFile(FileHandle); - return ESUCCESS; -} - -LONG CompatFsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) -{ - PFILE FileHandle = FsGetDeviceSpecific(FileId); - - memset(Information, 0, sizeof(FILEINFORMATION)); - Information->EndingAddress.LowPart = FsGetFileSize(FileHandle); - Information->CurrentAddress.LowPart = FsGetFilePointer(FileHandle); - return ESUCCESS; -} - -LONG CompatFsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) -{ - PFILE FileHandle; - static BOOLEAN bVolumeOpened = FALSE; - - if (!bVolumeOpened) - { - bVolumeOpened = FsOpenBootVolume(); - if (!bVolumeOpened) - return EIO; - } - - FileHandle = FsOpenFile(Path); - if (!FileHandle) - return EIO; - FsSetDeviceSpecific(*FileId, FileHandle); - return ESUCCESS; -} - -LONG CompatFsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) -{ - PFILE FileHandle = FsGetDeviceSpecific(FileId); - BOOLEAN ret; - - ret = FsReadFile(FileHandle, N, Count, Buffer); - return (ret ? ESUCCESS : EFAULT); -} - -LONG CompatFsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) -{ - PFILE FileHandle = FsGetDeviceSpecific(FileId); - - if (SeekMode != SeekAbsolute) - return EINVAL; - - FsSetFilePointer(FileHandle, Position->LowPart); - return ESUCCESS; -} - -const DEVVTBL CompatFsFuncTable = { - CompatFsClose, - CompatFsGetFileInformation, - CompatFsOpen, - CompatFsRead, - CompatFsSeek, -}; #define MAX_FDS 60 typedef struct tagFILEDATA @@ -640,9 +359,16 @@ /* Try to detect the file system */ FileData[DeviceId].FileFuncTable = IsoMount(DeviceId); if (!FileData[DeviceId].FileFuncTable) + FileData[DeviceId].FileFuncTable = FatMount(DeviceId); + if (!FileData[DeviceId].FileFuncTable) + FileData[DeviceId].FileFuncTable = NtfsMount(DeviceId); + if (!FileData[DeviceId].FileFuncTable) + FileData[DeviceId].FileFuncTable = Ext2Mount(DeviceId); + if (!FileData[DeviceId].FileFuncTable) { - /* FIXME: we link there to old infrastructure... */ - FileData[DeviceId].FileFuncTable = &CompatFsFuncTable; + /* Error, unable to detect file system */ + FileData[DeviceId].FuncTable = NULL; + return ENODEV; } pDevice->DeviceId = DeviceId; @@ -670,6 +396,10 @@ if (i == MAX_FDS) return EMFILE; + /* Skip leading backslash, if any */ + if (*FileName == '\\') + FileName++; + /* Open the file */ FileData[i].FuncTable = FileData[DeviceId].FileFuncTable; FileData[i].DeviceId = DeviceId; Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -271,9 +271,6 @@ DPRINTM(DPRINT_FILESYSTEM, "IsoOpen() FileName = %s\n", Path); - if (*Path == '\\') - Path++; - RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); ret = IsoLookupFile(Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) @@ -507,7 +504,7 @@ // // Check if PVD is valid. If yes, return ISO9660 function table // - if (Pvd->VdType == 1 && RtlCompareMemory(Pvd->StandardId, "CD001", 5) == 5) + if (Pvd->VdType == 1 && RtlEqualMemory(Pvd->StandardId, "CD001", 5)) return &Iso9660FuncTable; else return NULL; Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -760,74 +760,156 @@ return TRUE; } -FILE* NtfsOpenFile(PCSTR FileName) +LONG NtfsClose(ULONG FileId) +{ + PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + + NtfsReleaseAttributeContext(FileHandle->DataContext); + MmHeapFree(FileHandle); + + return ESUCCESS; +} + +LONG NtfsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record); + Information->CurrentAddress.LowPart = FileHandle->Offset; + + DPRINTM(DPRINT_FILESYSTEM, "NtfsGetFileInformation() FileSize = %d\n", + Information->EndingAddress.LowPart); + DPRINTM(DPRINT_FILESYSTEM, "NtfsGetFileInformation() FilePointer = %d\n", + Information->CurrentAddress.LowPart); + + return ESUCCESS; +} + +LONG NtfsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; - + ULONG DeviceId; + + // + // Check parameters + // + if (OpenMode != OpenReadOnly) + return EACCES; + + // + // Get underlying device + // + DeviceId = FsGetDeviceId(*FileId); + + DPRINTM(DPRINT_FILESYSTEM, "NtfsOpen() FileName = %s\n", Path); + + // + // Allocate file structure + // FileHandle = MmHeapAlloc(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); - if (FileHandle == NULL) - { + if (!FileHandle) + { + return ENOMEM; + } + RtlZeroMemory(FileHandle, sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); + + // + // Search file entry + // + MftRecord = (PNTFS_MFT_RECORD)(FileHandle + 1); + if (!NtfsLookupFile(Path, MftRecord, &FileHandle->DataContext)) + { + MmHeapFree(FileHandle); + return ENOENT; + } + + return ESUCCESS; +} + +LONG NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + ULONGLONG BytesRead64; + + // + // Read file + // + BytesRead64 = NtfsReadAttribute(FileHandle->DataContext, FileHandle->Offset, Buffer, N); + *Count = (ULONG)BytesRead64; + + // + // Check for success + // + if (BytesRead64 > 0) + return ESUCCESS; + else + return EIO; +} + +LONG NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + + DPRINTM(DPRINT_FILESYSTEM, "NtfsSeek() NewFilePointer = %lu\n", Position->LowPart); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->HighPart != 0) + return EINVAL; + if (Position->LowPart >= (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record)) + return EINVAL; + + FileHandle->Offset = Position->LowPart; + return ESUCCESS; +} + +const DEVVTBL NtfsFuncTable = +{ + NtfsClose, + NtfsGetFileInformation, + NtfsOpen, + NtfsRead, + NtfsSeek, +}; + +const DEVVTBL* NtfsMount(ULONG DeviceId) +{ + NTFS_BOOTSECTOR BootSector; + LARGE_INTEGER Position; + ULONG Count; + LONG ret; + + // + // Read the BootSector + // + Position.HighPart = 0; + Position.LowPart = 0; + ret = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) return NULL; - } - - MftRecord = (PNTFS_MFT_RECORD)(FileHandle + 1); - if (!NtfsLookupFile(FileName, MftRecord, &FileHandle->DataContext)) - { - MmHeapFree(FileHandle); + ret = ArcRead(DeviceId, &BootSector, sizeof(BootSector), &Count); + if (ret != ESUCCESS || Count != sizeof(BootSector)) return NULL; - } - - FileHandle->Offset = 0; - - return (FILE*)FileHandle; -} - -VOID NtfsCloseFile(FILE *File) -{ - PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; - NtfsReleaseAttributeContext(FileHandle->DataContext); - MmHeapFree(FileHandle); -} - -BOOLEAN NtfsReadFile(FILE *File, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; - ULONGLONG BytesRead64; - BytesRead64 = NtfsReadAttribute(FileHandle->DataContext, FileHandle->Offset, Buffer, BytesToRead); - if (BytesRead64) - { - *BytesRead = (ULONG)BytesRead64; - FileHandle->Offset += BytesRead64; - return TRUE; - } - return FALSE; -} - -ULONG NtfsGetFileSize(FILE *File) -{ - PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; - return (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record); -} - -VOID NtfsSetFilePointer(FILE *File, ULONG NewFilePointer) -{ - PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; - FileHandle->Offset = NewFilePointer; -} - -ULONG NtfsGetFilePointer(FILE *File) -{ - PNTFS_FILE_HANDLE FileHandle = (PNTFS_FILE_HANDLE)File; - return FileHandle->Offset; -} - -const FS_VTBL NtfsVtbl = { - NtfsOpenVolume, - NtfsOpenFile, - NtfsCloseFile, - NtfsReadFile, - NtfsGetFileSize, - NtfsSetFilePointer, - NtfsGetFilePointer, -}; + + // + // Check if BootSector is valid. If yes, return NTFS function table + // + if (RtlEqualMemory(BootSector.SystemId, "NTFS", 4)) + { + // + // Compatibility hack as long as FS is not using underlying device DeviceId + // + ULONG DriveNumber; + ULONGLONG StartSector; + ULONGLONG SectorCount; + int Type; + if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + return NULL; + NtfsOpenVolume(DriveNumber, StartSector, SectorCount); + return &NtfsFuncTable; + } + else + return NULL; +} Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -47,7 +47,6 @@ #define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ #elif defined(_M_PPC) || defined(_M_MIPS) || defined(_M_ARM) -extern PVOID FsStaticBufferDisk, FsStaticBufferData; #define DISKREADBUFFER 0x80000000 #define FILESYSBUFFER 0x80000000 #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -130,9 +130,7 @@ BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); BOOLEAN DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); + PULONG Device); BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); VOID DiskGetBootDevice(PULONG BootDevice); BOOLEAN DiskBootingFromFloppy(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -50,8 +50,6 @@ LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); VOID FileSystemError(PCSTR ErrorString); -BOOLEAN FsOpenBootVolume(); -BOOLEAN FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice); PFILE FsOpenFile(PCSTR FileName); VOID FsCloseFile(PFILE FileHandle); BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); @@ -62,15 +60,4 @@ ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); -typedef struct -{ - BOOLEAN (*OpenVolume)(UCHAR DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount); - PFILE (*OpenFile)(PCSTR FileName); - VOID (*CloseFile)(PFILE FileHandle); - BOOLEAN (*ReadFile)(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); - ULONG (*GetFileSize)(PFILE FileHandle); - VOID (*SetFilePointer)(PFILE FileHandle, ULONG NewFilePointer); - ULONG (*GetFilePointer)(PFILE FileHandle); -} FS_VTBL; - #endif // #defined __FS_H Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -668,37 +668,6 @@ EXT2_INODE Inode; // File's inode } EXT2_FILE_INFO, * PEXT2_FILE_INFO; - - -BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); -FILE* Ext2OpenFile(PCSTR FileName); -BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); -BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); -BOOLEAN Ext2ReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -ULONG Ext2GetFileSize(FILE *FileHandle); -VOID Ext2SetFilePointer(FILE *FileHandle, ULONG NewFilePointer); -ULONG Ext2GetFilePointer(FILE *FileHandle); -BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG SectorCount, PVOID Buffer); - -BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); -BOOLEAN Ext2ReadSuperBlock(VOID); -BOOLEAN Ext2ReadGroupDescriptors(VOID); -BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer); -BOOLEAN Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer); -BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -ULONG Ext2GetGroupDescBlockNumber(ULONG Group); -ULONG Ext2GetGroupDescOffsetInBlock(ULONG Group); -ULONG Ext2GetInodeGroupNumber(ULONG Inode); -ULONG Ext2GetInodeBlockNumber(ULONG Inode); -ULONG Ext2GetInodeOffsetInBlock(ULONG Inode); -BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer); -BOOLEAN Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer); -ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode); -ULONGLONG Ext2GetInodeFileSize(PEXT2_INODE Inode); -BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock); -BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock); -BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock); - -extern const FS_VTBL Ext2Vtbl; +const DEVVTBL* Ext2Mount(ULONG DeviceId); #endif // #defined __EXT2_H Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -152,28 +152,6 @@ ULONG DriveNumber; } FAT_FILE_INFO, * PFAT_FILE_INFO; - - -BOOLEAN FatOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); -ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); -PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); -BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer); -void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); -BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -FILE* FatOpenFile(PCSTR FileName); -ULONG FatCountClustersInChain(ULONG StartCluster); -ULONG* FatGetClusterChainArray(ULONG StartCluster); -BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer); -BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); -BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -ULONG FatGetFileSize(FILE *FileHandle); -VOID FatSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); -ULONG FatGetFilePointer(FILE *FileHandle); -BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); - - #define ATTR_NORMAL 0x00 #define ATTR_READONLY 0x01 #define ATTR_HIDDEN 0x02 @@ -191,6 +169,6 @@ #define ISFATX(FT) ((FT) == FATX16 || (FT) == FATX32) -extern const FS_VTBL FatVtbl; +const DEVVTBL* FatMount(ULONG DeviceId); #endif // #defined __FAT_H Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -99,8 +99,6 @@ ULONG DriveNumber; } ISO_FILE_INFO, * PISO_FILE_INFO; -extern const FS_VTBL Iso9660Vtbl; - const DEVVTBL* IsoMount(ULONG DeviceId); #endif // #defined __FAT_H Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -222,14 +222,6 @@ } NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE; #include <poppack.h> -BOOLEAN NtfsOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); -FILE* NtfsOpenFile(PCSTR FileName); -VOID NtfsCloseFile(FILE *FileHandle); -BOOLEAN NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -ULONG NtfsGetFileSize(FILE *FileHandle); -VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); -ULONG NtfsGetFilePointer(FILE *FileHandle); - -extern const FS_VTBL NtfsVtbl; +const DEVVTBL* NtfsMount(ULONG DeviceId); #endif // #defined __NTFS_H Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -63,7 +63,7 @@ ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN (*DiskGetBootVolume)(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); - BOOLEAN (*DiskGetSystemVolume)(char *SystemPath, char *RemainingPath, PULONG Device, PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); + BOOLEAN (*DiskGetSystemVolume)(char *SystemPath, char *RemainingPath, PULONG Device); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); VOID (*DiskGetBootDevice)(PULONG BootDevice); BOOLEAN (*DiskBootingFromFloppy)(VOID); @@ -104,11 +104,7 @@ BOOLEAN MachDiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType); + PULONG Device); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); VOID MachDiskGetBootDevice(PULONG BootDevice); BOOLEAN MachDiskBootingFromFloppy(); @@ -140,7 +136,7 @@ #define MachBeep() MachVtbl.Beep() #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) #define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) -#define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) +#define MachDiskGetSystemVolume(SysPath, RemPath, Dev) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev)) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) #define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -73,9 +73,9 @@ UiMessageBox("Invalid boot path"); goto LinuxBootFailed; } - if (!FsOpenSystemVolume(LinuxBootPath, NULL, NULL)) - { - UiMessageBox("Failed to open boot drive."); + if (!MachDiskGetSystemVolume(LinuxBootPath, NULL, NULL)) + { + UiMessageBox("Failed to get system volume."); goto LinuxBootFailed; } Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -333,15 +333,9 @@ BOOLEAN MachDiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType) -{ - return MachVtbl.DiskGetSystemVolume(SystemPath, RemainingPath, Device, - DriveNumber, StartSector, SectorCount, - FsType); + PULONG Device) +{ + return MachVtbl.DiskGetSystemVolume(SystemPath, RemainingPath, Device); } BOOLEAN Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -51,9 +51,9 @@ return; } - if (!FsOpenSystemVolume(FileName, FileName, NULL)) - { - UiMessageBox("Failed to open boot drive."); + if (!MachDiskGetSystemVolume(FileName, FileName, NULL)) + { + UiMessageBox("Failed to get system volume."); return; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -756,11 +756,11 @@ RamDiskSwitchFromBios(); /* - * Try to open system drive - */ - if (!FsOpenSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) - { - UiMessageBox("Failed to open system drive."); + * Try to get system volume + */ + if (!MachDiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) + { + UiMessageBox("Failed to get system volume."); return; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -119,13 +119,6 @@ /* set boot device */ MachDiskGetBootDevice(&LoaderBlock.BootDevice); - /* Open boot drive */ - if (!FsOpenBootVolume()) - { - UiMessageBox("Failed to open boot drive."); - return; - } - UiDrawStatusText("Loading txtsetup.sif..."); /* Open 'txtsetup.sif' */ for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) @@ -201,13 +194,6 @@ if (MachDiskBootingFromFloppy()) { UiMessageBox("Please insert \"ReactOS Boot Disk 2\" and press ENTER"); - - /* Open boot drive */ - if (!FsOpenBootVolume()) - { - UiMessageBox("Failed to open boot drive."); - return; - } /* FIXME: check volume label or disk marker file */ } Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sat Aug 8 22:53:10 2009 @@ -186,9 +186,6 @@ NULL }; - /* Try to open system drive */ - FsOpenBootVolume(); - /* Open 'txtsetup.sif' from any of source paths */ MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++)

1 0

[gschneider] 42536: Supply default ansi codepage when converting from unicode, fixes 365 kernel32 comm winetests
by gschneider＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: gschneider Date: Sat Aug 8 22:20:16 2009 New Revision: 42536 URL: http://svn.reactos.org/svn/reactos?rev=42536&view=rev Log: Supply default ansi codepage when converting from unicode, fixes 365 kernel32 comm winetests Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] Sat Aug 8 22:20:16 2009 @@ -627,7 +627,7 @@ DWORD dwErr; dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, NULL, 0, NULL, NULL); + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); bRet = cchAscii > 0; @@ -641,7 +641,7 @@ if(bRet) { bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); bRet = cchAscii > 0 && !bInvalidChars;

1 0

[tkreuzer] 42535: [FORMATTING] 4 spaces indentation, no code change
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 21:53:21 2009 New Revision: 42535 URL: http://svn.reactos.org/svn/reactos?rev=42535&view=rev Log: [FORMATTING] 4 spaces indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sat Aug 8 21:53:21 2009 @@ -130,70 +130,70 @@ /* Check arguments */ #ifdef CDS_VIDEOPARAMETERS + if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) +#else + if (lParam != NULL) +#endif + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } - if (dwflags != CDS_VIDEOPARAMETERS && lParam != NULL) -#else + if (hwnd != NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return DISP_CHANGE_BADPARAM; + } - if (lParam != NULL) -#endif + /* Copy devmode */ + if (lpDevMode != NULL) + { + _SEH2_TRY + { + ProbeForRead(lpDevMode, sizeof(DevMode.dmSize), 1); + DevMode.dmSize = lpDevMode->dmSize; + DevMode.dmSize = min(sizeof(DevMode), DevMode.dmSize); + ProbeForRead(lpDevMode, DevMode.dmSize, 1); + RtlCopyMemory(&DevMode, lpDevMode, DevMode.dmSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return DISP_CHANGE_BADPARAM; - } - if (hwnd != NULL) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return DISP_CHANGE_BADPARAM; - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } - /* Copy devmode */ - if (lpDevMode != NULL) - { - _SEH2_TRY - { - ProbeForRead(lpDevMode, sizeof(DevMode.dmSize), 1); - DevMode.dmSize = lpDevMode->dmSize; - DevMode.dmSize = min(sizeof(DevMode), DevMode.dmSize); - ProbeForRead(lpDevMode, DevMode.dmSize, 1); - RtlCopyMemory(&DevMode, lpDevMode, DevMode.dmSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - if (DevMode.dmDriverExtra > 0) - { - DPRINT1("lpDevMode->dmDriverExtra is IGNORED!\n"); - DevMode.dmDriverExtra = 0; - } - lpSafeDevMode = &DevMode; - } + if (DevMode.dmDriverExtra > 0) + { + DPRINT1("lpDevMode->dmDriverExtra is IGNORED!\n"); + DevMode.dmDriverExtra = 0; + } + lpSafeDevMode = &DevMode; + } - /* Copy the device name */ - if (lpszDeviceName != NULL) - { - Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DISP_CHANGE_BADPARAM; - } - pSafeDeviceName = &SafeDeviceName; - } + /* Copy the device name */ + if (lpszDeviceName != NULL) + { + Status = IntSafeCopyUnicodeString(&SafeDeviceName, lpszDeviceName); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DISP_CHANGE_BADPARAM; + } + pSafeDeviceName = &SafeDeviceName; + } - /* Call internal function */ - Ret = IntChangeDisplaySettings(pSafeDeviceName, lpSafeDevMode, dwflags, lParam); + /* Call internal function */ + Ret = IntChangeDisplaySettings(pSafeDeviceName, lpSafeDevMode, dwflags, lParam); - if (pSafeDeviceName != NULL) - RtlFreeUnicodeString(pSafeDeviceName); + if (pSafeDeviceName != NULL) + RtlFreeUnicodeString(pSafeDeviceName); - return Ret; + return Ret; }

1 0

[dgorbachev] 42534: - Do not compare an ULONG variable with -1 in DbgPrint(). - Simplify TuiPrintf().
by dgorbachev＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: dgorbachev Date: Sat Aug 8 21:34:21 2009 New Revision: 42534 URL: http://svn.reactos.org/svn/reactos?rev=42534&view=rev Log: - Do not compare an ULONG variable with -1 in DbgPrint(). - Simplify TuiPrintf(). Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat Aug 8 21:34:21 2009 @@ -102,209 +102,208 @@ ULONG DbgPrint(const char *Format, ...) { + int i; + int Length; + va_list ap; + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + for (i = 0; i < Length; i++) + { + DebugPrintChar(Buffer[i]); + } + + return 0; +} + +VOID DebugPrintHeader(ULONG Mask) +{ + /* No header */ + if (Mask == 0) + return; + + switch (Mask) + { + case DPRINT_WARNING: + DbgPrint("WARNING: "); + break; + case DPRINT_MEMORY: + DbgPrint("MEMORY: "); + break; + case DPRINT_FILESYSTEM: + DbgPrint("FILESYS: "); + break; + case DPRINT_INIFILE: + DbgPrint("INIFILE: "); + break; + case DPRINT_UI: + DbgPrint("UI: "); + break; + case DPRINT_DISK: + DbgPrint("DISK: "); + break; + case DPRINT_CACHE: + DbgPrint("CACHE: "); + break; + case DPRINT_REGISTRY: + DbgPrint("REGISTER: "); + break; + case DPRINT_REACTOS: + DbgPrint("REACTOS: "); + break; + case DPRINT_LINUX: + DbgPrint("LINUX: "); + break; + case DPRINT_WINDOWS: + DbgPrint("WINLDR: "); + break; + case DPRINT_HWDETECT: + DbgPrint("HWDETECT: "); + break; + default: + DbgPrint("UNKNOWN: "); + break; + } +} + +char* g_file; +int g_line; + +VOID DbgPrintMask(ULONG Mask, char *format, ...) +{ + va_list ap; + char Buffer[2096]; + char *ptr = Buffer; + + // Mask out unwanted debug messages + if (!(Mask & DebugPrintMask)) + { + return; + } + + // Print the header if we have started a new line + if (DebugStartOfLine) + { + DbgPrint("(%s:%d) ", g_file, g_line); + DebugPrintHeader(Mask); + DebugStartOfLine = FALSE; + } + + va_start(ap, format); + vsprintf(Buffer, format, ap); + va_end(ap); + + while (*ptr) + { + DebugPrintChar(*ptr++); + } +} + +VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) +{ + PUCHAR BufPtr = (PUCHAR)Buffer; + ULONG Idx; + ULONG Idx2; + + // Mask out unwanted debug messages + if (!(Mask & DebugPrintMask)) + { + return; + } + + DebugStartOfLine = FALSE; // We don't want line headers + DbgPrintMask(Mask, "Dumping buffer at 0x%x with length of %d bytes:\n", Buffer, Length); + + for (Idx=0; Idx<Length; ) + { + DebugStartOfLine = FALSE; // We don't want line headers + + if (Idx < 0x0010) + { + DbgPrintMask(Mask, "000%x:\t", Idx); + } + else if (Idx < 0x0100) + { + DbgPrintMask(Mask, "00%x:\t", Idx); + } + else if (Idx < 0x1000) + { + DbgPrintMask(Mask, "0%x:\t", Idx); + } + else + { + DbgPrintMask(Mask, "%x:\t", Idx); + } + + for (Idx2=0; Idx2<16; Idx2++,Idx++) + { + if (BufPtr[Idx] < 0x10) + { + DbgPrintMask(Mask, "0"); + } + DbgPrintMask(Mask, "%x", BufPtr[Idx]); + + if (Idx2 == 7) + { + DbgPrintMask(Mask, "-"); + } + else + { + DbgPrintMask(Mask, " "); + } + } + + Idx -= 16; + DbgPrintMask(Mask, " "); + + for (Idx2=0; Idx2<16; Idx2++,Idx++) + { + if ((BufPtr[Idx] > 20) && (BufPtr[Idx] < 0x80)) + { + DbgPrintMask(Mask, "%c", BufPtr[Idx]); + } + else + { + DbgPrintMask(Mask, "."); + } + } + + DbgPrintMask(Mask, "\n"); + } +} + +#else + +VOID DbgPrintMask(ULONG Mask, char *format, ...) +{ +} + +ULONG DbgPrint(PCCH Format, ...) +{ + return 0; +} + +#endif // DBG + +ULONG +MsgBoxPrint(const char *Format, ...) +{ va_list ap; CHAR Buffer[512]; ULONG Length; - char *ptr = Buffer; - - va_start(ap, Format); - - /* Construct a string */ - Length = _vsnprintf(Buffer, 512, Format, ap); - - /* Check if we went past the buffer */ - if (Length == -1) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - while (*ptr) - { - DebugPrintChar(*ptr++); - } - - va_end(ap); - return 0; -} - -VOID DebugPrintHeader(ULONG Mask) -{ - /* No header */ - if (Mask == 0) - return; - - switch (Mask) - { - case DPRINT_WARNING: - DbgPrint("WARNING: "); - break; - case DPRINT_MEMORY: - DbgPrint("MEMORY: "); - break; - case DPRINT_FILESYSTEM: - DbgPrint("FILESYS: "); - break; - case DPRINT_INIFILE: - DbgPrint("INIFILE: "); - break; - case DPRINT_UI: - DbgPrint("UI: "); - break; - case DPRINT_DISK: - DbgPrint("DISK: "); - break; - case DPRINT_CACHE: - DbgPrint("CACHE: "); - break; - case DPRINT_REGISTRY: - DbgPrint("REGISTER: "); - break; - case DPRINT_REACTOS: - DbgPrint("REACTOS: "); - break; - case DPRINT_LINUX: - DbgPrint("LINUX: "); - break; - case DPRINT_WINDOWS: - DbgPrint("WINLDR: "); - break; - case DPRINT_HWDETECT: - DbgPrint("HWDETECT: "); - break; - default: - DbgPrint("UNKNOWN: "); - break; - } -} - -char* g_file; -int g_line; - -VOID DbgPrintMask(ULONG Mask, char *format, ...) -{ - va_list ap; - char Buffer[2096]; - char *ptr = Buffer; - - // Mask out unwanted debug messages - if (!(Mask & DebugPrintMask)) - { - return; - } - - // Print the header if we have started a new line - if (DebugStartOfLine) - { - DbgPrint("(%s:%d) ", g_file, g_line); - DebugPrintHeader(Mask); - DebugStartOfLine = FALSE; - } - - va_start(ap, format); - vsprintf(Buffer, format, ap); - va_end(ap); - while (*ptr) - { - DebugPrintChar(*ptr++); - } -} - -VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) -{ - PUCHAR BufPtr = (PUCHAR)Buffer; - ULONG Idx; - ULONG Idx2; - - // Mask out unwanted debug messages - if (!(Mask & DebugPrintMask)) - { - return; - } - - DebugStartOfLine = FALSE; // We don't want line headers - DbgPrintMask(Mask, "Dumping buffer at 0x%x with length of %d bytes:\n", Buffer, Length); - - for (Idx=0; Idx<Length; ) - { - DebugStartOfLine = FALSE; // We don't want line headers - - if (Idx < 0x0010) - { - DbgPrintMask(Mask, "000%x:\t", Idx); - } - else if (Idx < 0x0100) - { - DbgPrintMask(Mask, "00%x:\t", Idx); - } - else if (Idx < 0x1000) - { - DbgPrintMask(Mask, "0%x:\t", Idx); - } - else - { - DbgPrintMask(Mask, "%x:\t", Idx); - } - - for (Idx2=0; Idx2<16; Idx2++,Idx++) - { - if (BufPtr[Idx] < 0x10) - { - DbgPrintMask(Mask, "0"); - } - DbgPrintMask(Mask, "%x", BufPtr[Idx]); - - if (Idx2 == 7) - { - DbgPrintMask(Mask, "-"); - } - else - { - DbgPrintMask(Mask, " "); - } - } - - Idx -= 16; - DbgPrintMask(Mask, " "); - - for (Idx2=0; Idx2<16; Idx2++,Idx++) - { - if ((BufPtr[Idx] > 20) && (BufPtr[Idx] < 0x80)) - { - DbgPrintMask(Mask, "%c", BufPtr[Idx]); - } - else - { - DbgPrintMask(Mask, "."); - } - } - - DbgPrintMask(Mask, "\n"); - } -} - -#else - -VOID DbgPrintMask(ULONG Mask, char *format, ...) -{ -} - -ULONG DbgPrint(PCCH Format, ...) -{ - return 0; -} - -#endif // DBG - -ULONG -MsgBoxPrint(const char *Format, ...) -{ - va_list ap; - CHAR Buffer[512]; - ULONG Length; va_start(ap, Format); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Aug 8 21:34:21 2009 @@ -871,7 +871,7 @@ UiMessageBox("Could not load the System hive!\n"); return; } - DPRINTM(DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size); + DPRINTM(DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u\n", (unsigned)Base, (unsigned)Size); /* * Import the loaded system hive Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Aug 8 21:34:21 2009 @@ -22,61 +22,28 @@ PVOID TextVideoBuffer = NULL; /* - * printf() - prints formatted text to stdout - * originally from GRUB + * TuiPrintf() + * Prints formatted text to the screen */ -int TuiPrintf(const char *format, ... ) -{ - char c, *ptr, str[16]; +int TuiPrintf(const char *Format, ...) +{ + int i; + int Length; va_list ap; - va_start(ap,format); - - while ((c = *(format++))) - { - if (c != '%') - { - MachConsPutChar(c); - } - else - { - switch (c = *(format++)) - { - case 'c': - MachConsPutChar((va_arg(ap, int)) & 0xff); - break; - case 's': - ptr = va_arg(ap, char *); - while ((c = *(ptr++))) - { - MachConsPutChar(c); - } - break; - case '%': - MachConsPutChar(c); - break; - case 'l': - c = *(format++); - /* Fall through. */ - case 'd': case 'u': case 'x': - if (c == 'x') - _itoa(va_arg(ap, unsigned long), str, 16); - else - _itoa(va_arg(ap, unsigned long), str, 10); - ptr = str; - while (*ptr) - { - MachConsPutChar(*(ptr++)); - } - break; - default: - printf("\nprintf() invalid format specifier - %%%c\n", c); - break; - } - } - } - + CHAR Buffer[512]; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); va_end(ap); - return 0; + + if (Length == -1) Length = sizeof(Buffer); + + for (i = 0; i < Length; i++) + { + MachConsPutChar(Buffer[i]); + } + + return Length; } BOOLEAN TuiInitialize(VOID) @@ -447,8 +414,8 @@ CHAR TempString[20]; BOOLEAN PMHour = FALSE; - /* Don't draw the time if this has been disabled */ - if (!UiDrawTime) return; + /* Don't draw the time if this has been disabled */ + if (!UiDrawTime) return; TimeInfo = ArcGetTime(); if (TimeInfo->Year < 1 || 9999 < TimeInfo->Year ||

1 0

[hpoussin] 42533: HACK FIX DiskGetBootPath() method to return something meaningful when booting from hard disk
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 21:33:08 2009 New Revision: 42533 URL: http://svn.reactos.org/svn/reactos?rev=42533&view=rev Log: HACK FIX DiskGetBootPath() method to return something meaningful when booting from hard disk Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sat Aug 8 21:33:08 2009 @@ -361,6 +361,8 @@ strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); strcat(strcat(strcat(BootPath, "("), Device), ")"); + if (strcmp(BootPath, "multi(0)disk(0)cdrom(128)") == 0) + strcpy(BootPath, "multi(0)disk(0)rdisk(0)partition(1)"); return TRUE; }

1 0

[fireball] 42532: - Implement GetDIBits, this was the last piece of code needed to support icons drawing in ROS explorer's Start Menu. - Pass a pointer to the dibsection to RosGdiGetDIBits, currently unused though. - Fix RosGdiCreateDIBSection bug: DIB section bits shouldn't be inverted once again if biHeight<0, this is already taken care of in other places. This fixes correct mask, but topdown icon drawing in the ROS explorer's Start Menu.
by fireball＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: fireball Date: Sat Aug 8 21:13:20 2009 New Revision: 42532 URL: http://svn.reactos.org/svn/reactos?rev=42532&view=rev Log: - Implement GetDIBits, this was the last piece of code needed to support icons drawing in ROS explorer's Start Menu. - Pass a pointer to the dibsection to RosGdiGetDIBits, currently unused though. - Fix RosGdiCreateDIBSection bug: DIB section bits shouldn't be inverted once again if biHeight<0, this is already taken care of in other places. This fixes correct mask, but topdown icon drawing in the ROS explorer's Start Menu. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -308,8 +308,14 @@ INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines, LPVOID bits, BITMAPINFO *info, UINT coloruse ) { - UNIMPLEMENTED; - return 0; + size_t obj_size; + DIBSECTION dib; + + /* Check if this bitmap has a DIB section */ + if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; + + /* Perform GetDIBits */ + return RosGdiGetDIBits(physDev->hKernelDC, hbitmap, startscan, lines, bits, info, coloruse, &dib); } INT CDECL RosDrv_GetDeviceCaps( NTDRV_PDEVICE *physDev, INT cap ) Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -79,7 +79,7 @@ BOOL APIENTRY RosGdiDeleteBitmap( HBITMAP hbitmap ); LONG APIENTRY RosGdiGetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ); INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ); + LPVOID bits, BITMAPINFO *info, UINT coloruse, DIBSECTION *dib ); COLORREF APIENTRY RosGdiGetPixel( HDC physDev, INT x, INT y ); BOOL APIENTRY RosGdiPatBlt( HDC physDev, INT left, INT top, INT width, INT height, DWORD rop ); LONG APIENTRY RosGdiSetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -121,7 +121,7 @@ hbmDIB = GreCreateBitmap(szSize, dib->dsBm.bmWidthBytes, ulFormat, BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (dib->dsBmih.biHeight < 0 ? BMF_TOPDOWN : 0), + 0, dib->dsBm.bmBits); /* Map handles */ @@ -196,11 +196,33 @@ return ret; } -INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) -{ - UNIMPLEMENTED; - return 0; +INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hUserBitmap, UINT StartScan, UINT ScanLines, + LPVOID Bits, BITMAPINFO *bmi, UINT ColorUse, DIBSECTION *dib ) +{ + PDC pDC; + + HGDIOBJ hBitmap = GDI_MapUserHandle(hUserBitmap); + + /* Get a pointer to the DCs */ + pDC = DC_Lock(physDev); + + DPRINT1("RosGdiGetDIBits for bitmap %x (user handle %x), StartScan %d, ScanLines %d, height %d\n", + hBitmap, hUserBitmap, StartScan, ScanLines, dib->dsBm.bmHeight); + + /* Set the bits */ + GreGetDIBits(pDC, + hBitmap, + StartScan, + ScanLines, + Bits, + bmi, + ColorUse); + + /* Release DC objects */ + DC_Unlock(pDC); + + /* Return amount of lines set */ + return ScanLines; } COLORREF APIENTRY RosGdiGetPixel( HDC physDev, INT x, INT y ) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -11,6 +11,50 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +static const RGBQUAD EGAColorsQuads[16] = { +/* rgbBlue, rgbGreen, rgbRed, rgbReserved */ + { 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x80, 0x00 }, + { 0x00, 0x80, 0x00, 0x00 }, + { 0x00, 0x80, 0x80, 0x00 }, + { 0x80, 0x00, 0x00, 0x00 }, + { 0x80, 0x00, 0x80, 0x00 }, + { 0x80, 0x80, 0x00, 0x00 }, + { 0x80, 0x80, 0x80, 0x00 }, + { 0xc0, 0xc0, 0xc0, 0x00 }, + { 0x00, 0x00, 0xff, 0x00 }, + { 0x00, 0xff, 0x00, 0x00 }, + { 0x00, 0xff, 0xff, 0x00 }, + { 0xff, 0x00, 0x00, 0x00 }, + { 0xff, 0x00, 0xff, 0x00 }, + { 0xff, 0xff, 0x00, 0x00 }, + { 0xff, 0xff, 0xff, 0x00 } +}; + +static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palette */ +/* rgbBlue, rgbGreen, rgbRed, rgbReserved */ + { 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x80, 0x00 }, + { 0x00, 0x80, 0x00, 0x00 }, + { 0x00, 0x80, 0x80, 0x00 }, + { 0x80, 0x00, 0x00, 0x00 }, + { 0x80, 0x00, 0x80, 0x00 }, + { 0x80, 0x80, 0x00, 0x00 }, + { 0xc0, 0xc0, 0xc0, 0x00 }, + { 0xc0, 0xdc, 0xc0, 0x00 }, + { 0xf0, 0xca, 0xa6, 0x00 }, + { 0xf0, 0xfb, 0xff, 0x00 }, + { 0xa4, 0xa0, 0xa0, 0x00 }, + { 0x80, 0x80, 0x80, 0x00 }, + { 0x00, 0x00, 0xf0, 0x00 }, + { 0x00, 0xff, 0x00, 0x00 }, + { 0x00, 0xff, 0xff, 0x00 }, + { 0xff, 0x00, 0x00, 0x00 }, + { 0xff, 0x00, 0xff, 0x00 }, + { 0xff, 0xff, 0x00, 0x00 }, + { 0xff, 0xff, 0xff, 0x00 } +}; INT NTAPI DIB_GetDIBWidthBytes(INT width, INT depth) { @@ -538,4 +582,385 @@ return result; } +// Converts a device-dependent bitmap to a DIB +INT +NTAPI +GreGetDIBits( + PDC Dc, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + VOID *Bits, + BITMAPINFO *Info, + UINT Usage) +{ + SURFACE *psurf = NULL; + HBITMAP hDestBitmap = NULL; + HPALETTE hSourcePalette = NULL; + HPALETTE hDestPalette = NULL; + PPALETTE SourcePalette = NULL; + PPALETTE DestPalette = NULL; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Result = 0; + BOOL bPaletteMatch = FALSE; + PBYTE ChkBits = Bits; + PVOID ColorPtr; + RGBQUAD *rgbQuads; + ULONG SourcePaletteType = 0; + ULONG DestPaletteType; + ULONG Index; + + DPRINT("Entered NtGdiGetDIBitsInternal()\n"); + + if ((Usage && Usage != DIB_PAL_COLORS) || !Info || !hBitmap) + return 0; + + // if ScanLines == 0, no need to copy Bits. + if (!ScanLines) + ChkBits = NULL; + + _SEH2_TRY + { + ProbeForWrite(Info, Info->bmiHeader.biSize, 1); // Comp for Core. + //if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + { + return 0; + } + + /* Get a pointer to the source bitmap object */ + psurf = SURFACE_Lock(hBitmap); + if (psurf == NULL) + return 0; + + hSourcePalette = psurf->hDIBPalette; + if (!hSourcePalette) + { + hSourcePalette = pPrimarySurface->DevInfo.hpalDefault; + } + + ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); + rgbQuads = (RGBQUAD *)ColorPtr; + + /* Copy palette information + * Always create a palette for 15 & 16 bit. */ + if (Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat) && + Info->bmiHeader.biBitCount != 15 && Info->bmiHeader.biBitCount != 16) + { + hDestPalette = hSourcePalette; + bPaletteMatch = TRUE; + } + else + hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; + + SourcePalette = PALETTE_LockPalette(hSourcePalette); + /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ + ASSERT(SourcePalette); + SourcePaletteType = SourcePalette->Mode; + PALETTE_UnlockPalette(SourcePalette); + + if (bPaletteMatch) + { + DestPalette = PALETTE_LockPalette(hDestPalette); + /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ + DPRINT("DestPalette : %p\n", DestPalette); + ASSERT(DestPalette); + DestPaletteType = DestPalette->Mode; + } + else + { + DestPalette = SourcePalette; + } + + /* Copy palette. */ + /* FIXME: This is largely incomplete. ATM no Core!*/ + switch (Info->bmiHeader.biBitCount) + { + case 1: + case 4: + case 8: + Info->bmiHeader.biClrUsed = 0; + if (/*psurf->hSecure &&*/ + BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) + { + if (Usage == DIB_RGB_COLORS) + { + if (DestPalette->NumColors != 1 << Info->bmiHeader.biBitCount) + Info->bmiHeader.biClrUsed = DestPalette->NumColors; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + rgbQuads[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + rgbQuads[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + rgbQuads[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + rgbQuads[Index].rgbReserved = 0; + } + } + else + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + } + else + { + if (Usage == DIB_PAL_COLORS) + { + PWORD Ptr = ColorPtr; + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount); + Index++) + { + Ptr[Index] = (WORD)Index; + } + } + else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) + { + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbReserved = 0; + } + } + else + { + switch (Info->bmiHeader.biBitCount) + { + case 1: + rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; + rgbQuads[0].rgbReserved = 0; + rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; + rgbQuads[1].rgbReserved = 0; + break; + case 4: + RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); + break; + case 8: + { + INT r, g, b; + RGBQUAD *color; + + RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); + RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); + color = rgbQuads + 10; + for (r = 0; r <= 5; r++) /* FIXME */ + for (g = 0; g <= 5; g++) + for (b = 0; b <= 5; b++) + { + color->rgbRed = (r * 0xff) / 5; + color->rgbGreen = (g * 0xff) / 5; + color->rgbBlue = (b * 0xff) / 5; + color->rgbReserved = 0; + color++; + } + } + break; + } + } + } + + case 15: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0x7c00; + ((PDWORD)Info->bmiColors)[1] = 0x03e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 16: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xf800; + ((PDWORD)Info->bmiColors)[1] = 0x07e0; + ((PDWORD)Info->bmiColors)[2] = 0x001f; + } + break; + + case 24: + case 32: + if (Info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)Info->bmiColors)[0] = 0xff0000; + ((PDWORD)Info->bmiColors)[1] = 0x00ff00; + ((PDWORD)Info->bmiColors)[2] = 0x0000ff; + } + break; + } + + if (bPaletteMatch) + PALETTE_UnlockPalette(DestPalette); + + /* fill out the BITMAPINFO struct */ + if (!ChkBits) + { // Core or not to Core? We have converted from Core in Gdi~ so? + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcWidth = psurf->SurfObj.sizlBitmap.cx; + coreheader->bcPlanes = 1; + coreheader->bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + coreheader->bcHeight = psurf->SurfObj.sizlBitmap.cy; + if (psurf->SurfObj.lDelta > 0) + coreheader->bcHeight = -coreheader->bcHeight; + } + + if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; + Info->bmiHeader.biHeight = psurf->SurfObj.sizlBitmap.cy; + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + switch (psurf->SurfObj.iBitmapFormat) + { + /* FIXME: What about BI_BITFIELDS? */ + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + Info->bmiHeader.biCompression = BI_RGB; + break; + case BMF_4RLE: + Info->bmiHeader.biCompression = BI_RLE4; + break; + case BMF_8RLE: + Info->bmiHeader.biCompression = BI_RLE8; + break; + case BMF_JPEG: + Info->bmiHeader.biCompression = BI_JPEG; + break; + case BMF_PNG: + Info->bmiHeader.biCompression = BI_PNG; + break; + } + /* Image size has to be calculated */ + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; + Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ + /* Report negtive height for top-down bitmaps. */ + if (psurf->SurfObj.lDelta > 0) + Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; + } + Result = psurf->SurfObj.sizlBitmap.cy; + } + else + { + SIZEL DestSize; + POINTL SourcePoint; + +// +// If we have a good dib pointer, why not just copy bits from there w/o XLATE'ing them. +// + /* Create the destination bitmap too for the copy operation */ + if (StartScan > psurf->SurfObj.sizlBitmap.cy) + { + goto cleanup; + } + else + { + ScanLines = min(ScanLines, psurf->SurfObj.sizlBitmap.cy - StartScan); + DestSize.cx = psurf->SurfObj.sizlBitmap.cx; + DestSize.cy = ScanLines; + + hDestBitmap = NULL; + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + hDestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), + GrepBitmapFormat(coreheader->bcBitCount, BI_RGB), + 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(DestSize.cx, + Info->bmiHeader.biBitCount) * DestSize.cy; + + hDestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + GrepBitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (hDestBitmap == NULL) + goto cleanup; + } + + if (NT_SUCCESS(Status)) + { + XLATEOBJ *XlateObj; + SURFOBJ *DestSurfObj; + RECTL DestRect; + + XlateObj = IntEngCreateXlate(DestPaletteType, + SourcePaletteType, + hDestPalette, + hSourcePalette); + + SourcePoint.x = 0; + SourcePoint.y = psurf->SurfObj.sizlBitmap.cy - (StartScan + ScanLines); + + /* Determine destination rectangle */ + DestRect.top = 0; + DestRect.left = 0; + DestRect.right = DestSize.cx; + DestRect.bottom = DestSize.cy; + + DestSurfObj = EngLockSurface((HSURF)hDestBitmap); + + if (EngCopyBits(DestSurfObj, + &psurf->SurfObj, + NULL, + XlateObj, + &DestRect, + &SourcePoint)) + { + DPRINT("GetDIBits %d \n",abs(Info->bmiHeader.biHeight) - StartScan); + Result = ScanLines; + } + + EngDeleteXlate(XlateObj); + EngUnlockSurface(DestSurfObj); + } + } +cleanup: + if (hDestBitmap != NULL) + EngDeleteSurface((HSURF)hDestBitmap); + + if (hDestPalette != NULL && bPaletteMatch == FALSE) + PALETTE_FreePaletteByHandle(hDestPalette); + + SURFACE_Unlock(psurf); + + DPRINT("leaving GreGetDIBits\n"); + + return Result; +} + /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -59,6 +59,17 @@ CONST BITMAPINFO *bmi, UINT ColorUse); +INT +NTAPI +GreGetDIBits( + PDC DC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + VOID *Bits, + BITMAPINFO *bmi, + UINT ColorUse); + INT FASTCALL BitsPerFormat(ULONG Format); Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Aug 8 21:13:20 2009 @@ -5,7 +5,7 @@ RosGdiCreateDIBSection 5 RosGdiDeleteBitmap 1 RosGdiGetBitmapBits 3 -RosGdiGetDIBits 7 +RosGdiGetDIBits 8 RosGdiGetPixel 3 RosGdiPatBlt 6 RosGdiSetBitmapBits 3

1 0

[sginsberg] 42531: Fix Uniata for msvc: - Add missing msvc intrinsics to winddk.h - Don't assume compiler means a specific header set, and don't rely on the default calling convention being stdcall. - Disable a warning spotted by MSVC -- requesting anyone with understanding of the code to have a look.
by sginsberg＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: sginsberg Date: Sat Aug 8 20:27:01 2009 New Revision: 42531 URL: http://svn.reactos.org/svn/reactos?rev=42531&view=rev Log: Fix Uniata for msvc: - Add missing msvc intrinsics to winddk.h - Don't assume compiler means a specific header set, and don't rely on the default calling convention being stdcall. - Disable a warning spotted by MSVC -- requesting anyone with understanding of the code to have a look. Modified: trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h [iso-8859-1] Sat Aug 8 20:27:01 2009 @@ -86,47 +86,21 @@ /* Compiler dependencies */ /***************************************************/ -/* ReactOS-specific defines */ -#ifdef DDKAPI - #define USE_REACTOS_DDK -#endif //DDKAPI +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define DDKCDECLAPI __cdecl /* Are we under GNU C (mingw) ??? */ -#if __GNUC__ >=3 +#ifdef __GNUC__ #define DEF_U64(x) (x##ULL) #define DEF_I64(x) (x##LL) - - /* ReactOS-specific defines */ - #ifdef USE_REACTOS_DDK - #define DDKFASTAPI __attribute__((fastcall)) - #else //USE_REACTOS_DDK - - #define DDKAPI __attribute__((stdcall)) - #define DDKFASTAPI __attribute__((fastcall)) - #define DDKCDECLAPI __attribute__((cdecl)) - - #endif //DDKAPI - - #define DECLSPEC_NAKED __attribute__((naked)) #else // !__GNUC__ => MSVC/Intel #define DEF_U64(x) (x##UI64) #define DEF_I64(x) (x##I64) - /* ReactOS-specific defines */ - #ifdef USE_REACTOS_DDK - #else //USE_REACTOS_DDK - - #define DDKAPI __stdcall - #define DDKFASTAPI __fastcall - #define DDKCDECLAPI _cdecl - - #endif //DDKAPI - - #define DECLSPEC_NAKED __declspec(naked) - #endif //__GNUC__ Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Sat Aug 8 20:27:01 2009 @@ -425,7 +425,15 @@ deviceExtension->lun[ldev].IdentifyData.FeaturesSupport.Address48) { i++; } else { +#ifdef _MSC_VER +#pragma message ("HACK HACK HACK Disabling warning HACK HACK HACK") +#pragma warning(push) +#pragma warning(disable:4333) +#endif fis[7] |= (plba[3] >> 24) & 0x0f; +#ifdef _MSC_VER +#pragma warning(pop) +#endif } fis[8] = plba[3]; Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] Sat Aug 8 20:27:01 2009 @@ -629,12 +629,14 @@ NTHALAPI VOID +NTAPI HalDisplayString ( PUCHAR String ); NTHALAPI VOID +NTAPI HalQueryDisplayParameters ( OUT PULONG WidthInCharacters, OUT PULONG HeightInLines, @@ -644,6 +646,7 @@ NTHALAPI VOID +NTAPI HalSetDisplayParameters ( IN ULONG CursorColumn, IN ULONG CursorRow Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Aug 8 20:27:01 2009 @@ -33,6 +33,24 @@ #ifdef __GNUC__ #include "intrin.h" +#endif + +#ifdef _MSC_VER +// +// FIXME: MSVC Intrinsics +// +unsigned char __readfsbyte(const unsigned long Offset); +#pragma intrinsic(__readfsbyte) +long _InterlockedExchange(volatile long * const Target, const long Value); +#pragma intrinsic(_InterlockedExchange) +long _InterlockedExchangeAdd(volatile long * const Addend, const long Value); +#pragma intrinsic(_InterlockedExchangeAdd) +long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); +#pragma intrinsic(_InterlockedCompareExchange) +long _InterlockedDecrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedDecrement) +long _InterlockedIncrement(volatile long * const lpAddend); +#pragma intrinsic(_InterlockedIncrement) #endif #if !defined(_NTHAL_) @@ -5116,15 +5134,6 @@ ULONG Spare1; } KFLOATING_SAVE, *PKFLOATING_SAVE; -#ifdef _MSC_VER -// -// FIXME: Intrinsics -// -unsigned char __readfsbyte(const unsigned long Offset); -#pragma intrinsic(__readfsbyte) -#endif - - FORCEINLINE ULONG KeGetCurrentProcessorNumber(VOID)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs