Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[hpoussin] 43267: Rework FAT filesystem to not be tied to boot filesystem
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 18:47:54 2009 New Revision: 43267 URL: http://svn.reactos.org/svn/reactos?rev=43267&view=rev Log: Rework FAT filesystem to not be tied to boot filesystem Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h 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 Oct 3 18:47:54 2009 @@ -23,33 +23,34 @@ #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); +PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); +BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +LONG FatLookupFile(PFAT_VOLUME_INFO Volume, 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(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); - -ULONG BytesPerSector; /* Number of bytes per sector */ -ULONG SectorsPerCluster; /* Number of sectors per cluster */ -ULONG FatVolumeStartSector; /* Absolute starting sector of the partition */ -ULONG FatSectorStart; /* Starting sector of 1st FAT table */ -ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ -ULONG NumberOfFats; /* Number of FAT tables */ -ULONG SectorsPerFat; /* Sectors per FAT table */ -ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ -ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ -ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ -ULONG DataSectorStart; /* Starting sector of the data area */ - -ULONG FatType = 0; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ -ULONG FatDriveNumber = 0; +BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer); +ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster); +ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster); +BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); +BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); + +typedef struct _FAT_VOLUME_INFO +{ + ULONG BytesPerSector; /* Number of bytes per sector */ + ULONG SectorsPerCluster; /* Number of sectors per cluster */ + ULONG FatSectorStart; /* Starting sector of 1st FAT table */ + ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ + ULONG NumberOfFats; /* Number of FAT tables */ + ULONG SectorsPerFat; /* Sectors per FAT table */ + ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ + ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ + ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ + ULONG DataSectorStart; /* Starting sector of the data area */ + ULONG FatType; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ + ULONG DeviceId; +} FAT_VOLUME_INFO; + +PFAT_VOLUME_INFO FatVolumes[MAX_FDS]; VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj) { @@ -129,7 +130,7 @@ SW(Obj, LastAccessDate); } -BOOLEAN FatOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) +BOOLEAN FatOpenVolume(PFAT_VOLUME_INFO Volume, PFAT_BOOTSECTOR BootSector, ULONGLONG PartitionSectorCount) { char ErrMsg[80]; ULONG FatSize; @@ -137,42 +138,21 @@ PFAT32_BOOTSECTOR Fat32VolumeBootSector; PFATX_BOOTSECTOR FatXVolumeBootSector; - DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DriveNumber = 0x%x VolumeStartSector = %d\n", DriveNumber, VolumeStartSector); - - // Store the drive number - FatDriveNumber = DriveNumber; + DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DeviceId = %d\n", Volume->DeviceId); // // Allocate the memory to hold the boot sector // - FatVolumeBootSector = (PFAT_BOOTSECTOR) MmHeapAlloc(512); - Fat32VolumeBootSector = (PFAT32_BOOTSECTOR) FatVolumeBootSector; - FatXVolumeBootSector = (PFATX_BOOTSECTOR) FatVolumeBootSector; - - // - // Make sure we got the memory - // - if (FatVolumeBootSector == NULL) - { - FileSystemError("Out of memory."); - return FALSE; - } - - // Now try to read the boot sector - // If this fails then abort - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PVOID)DISKREADBUFFER)) - { - MmHeapFree(FatVolumeBootSector); - return FALSE; - } - RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); + FatVolumeBootSector = (PFAT_BOOTSECTOR)BootSector; + Fat32VolumeBootSector = (PFAT32_BOOTSECTOR)BootSector; + FatXVolumeBootSector = (PFATX_BOOTSECTOR)BootSector; // Get the FAT type - FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); + Volume->FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); // Dump boot sector (and swap it for big endian systems) DPRINTM(DPRINT_FILESYSTEM, "Dumping boot sector:\n"); - if (ISFATX(FatType)) + if (ISFATX(Volume->FatType)) { FatSwapFatXBootSector(FatXVolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR)); @@ -183,10 +163,10 @@ DPRINTM(DPRINT_FILESYSTEM, "NumberOfFats: %d\n", FatXVolumeBootSector->NumberOfFats); DPRINTM(DPRINT_FILESYSTEM, "Unknown: 0x%x\n", FatXVolumeBootSector->Unknown); - DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", FatType == FATX16 ? "FATX16" : "FATX32"); - - } - else if (FatType == FAT32) + DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", Volume->FatType == FATX16 ? "FATX16" : "FATX32"); + + } + else if (Volume->FatType == FAT32) { FatSwapFat32BootSector(Fat32VolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR)); @@ -249,19 +229,13 @@ } // - // Set the correct partition offset - // - FatVolumeStartSector = VolumeStartSector; - - // // Check the boot sector magic // - if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) - { - sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", - DriveNumber, FatVolumeBootSector->BootSectorMagic); + if (! ISFATX(Volume->FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) + { + sprintf(ErrMsg, "Invalid boot sector magic (expected 0xaa55 found 0x%x)", + FatVolumeBootSector->BootSectorMagic); FileSystemError(ErrMsg); - MmHeapFree(FatVolumeBootSector); return FALSE; } @@ -269,72 +243,60 @@ // Check the FAT cluster size // We do not support clusters bigger than 64k // - if ((ISFATX(FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || - (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) + if ((ISFATX(Volume->FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || + (! ISFATX(Volume->FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) { FileSystemError("This file system has cluster sizes bigger than 64k.\nFreeLoader does not support this."); - MmHeapFree(FatVolumeBootSector); return FALSE; } - - // - // Clear our variables - // - FatSectorStart = 0; - ActiveFatSectorStart = 0; - NumberOfFats = 0; - RootDirSectorStart = 0; - DataSectorStart = 0; - SectorsPerFat = 0; - RootDirSectors = 0; // // Get the sectors per FAT, // root directory starting sector, // and data sector start // - if (ISFATX(FatType)) - { - BytesPerSector = 512; - SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); - FatSectorStart = (4096 / BytesPerSector); - ActiveFatSectorStart = FatSectorStart; - NumberOfFats = 1; - FatSize = PartitionSectorCount / SectorsPerCluster * - (FATX16 == FatType ? 2 : 4); - SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / BytesPerSector; - - RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; - RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; - - DataSectorStart = RootDirSectorStart + RootDirSectors; - } - else if (FatType != FAT32) - { - BytesPerSector = FatVolumeBootSector->BytesPerSector; - SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; - FatSectorStart = FatVolumeBootSector->ReservedSectors; - ActiveFatSectorStart = FatSectorStart; - NumberOfFats = FatVolumeBootSector->NumberOfFats; - SectorsPerFat = FatVolumeBootSector->SectorsPerFat; - - RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; - RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (BytesPerSector - 1)) / BytesPerSector; - - DataSectorStart = RootDirSectorStart + RootDirSectors; + if (ISFATX(Volume->FatType)) + { + Volume->BytesPerSector = 512; + Volume->SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); + Volume->FatSectorStart = (4096 / Volume->BytesPerSector); + Volume->ActiveFatSectorStart = Volume->FatSectorStart; + Volume->NumberOfFats = 1; + FatSize = PartitionSectorCount / Volume->SectorsPerCluster * + (Volume->FatType == FATX16 ? 2 : 4); + Volume->SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / Volume->BytesPerSector; + + Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; + Volume->RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; + + Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; + } + else if (Volume->FatType != FAT32) + { + Volume->BytesPerSector = FatVolumeBootSector->BytesPerSector; + Volume->SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; + Volume->FatSectorStart = FatVolumeBootSector->ReservedSectors; + Volume->ActiveFatSectorStart = Volume->FatSectorStart; + Volume->NumberOfFats = FatVolumeBootSector->NumberOfFats; + Volume->SectorsPerFat = FatVolumeBootSector->SectorsPerFat; + + Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; + Volume->RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (Volume->BytesPerSector - 1)) / Volume->BytesPerSector; + + Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; } else { - BytesPerSector = Fat32VolumeBootSector->BytesPerSector; - SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; - FatSectorStart = Fat32VolumeBootSector->ReservedSectors; - ActiveFatSectorStart = FatSectorStart + - ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); - NumberOfFats = Fat32VolumeBootSector->NumberOfFats; - SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; - - RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; - DataSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; + Volume->BytesPerSector = Fat32VolumeBootSector->BytesPerSector; + Volume->SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; + Volume->FatSectorStart = Fat32VolumeBootSector->ReservedSectors; + Volume->ActiveFatSectorStart = Volume->FatSectorStart + + ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); + Volume->NumberOfFats = Fat32VolumeBootSector->NumberOfFats; + Volume->SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; + + Volume->RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; + Volume->DataSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; // // Check version @@ -345,20 +307,6 @@ FileSystemError("FreeLoader is too old to work with this FAT32 filesystem.\nPlease update FreeLoader."); return FALSE; } - } - MmHeapFree(FatVolumeBootSector); - - { - GEOMETRY DriveGeometry; - ULONG BlockSize; - - // Initialize drive by getting its geometry - if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) - { - return FALSE; - } - - BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); } return TRUE; @@ -419,7 +367,7 @@ } } -PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) +PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) { PVOID DirectoryBuffer; @@ -429,9 +377,9 @@ * For FAT32, the root directory is nothing special. We can treat it the same * as a subdirectory. */ - if (RootDirectory && FAT32 == FatType) - { - DirectoryStartCluster = RootDirStartCluster; + if (RootDirectory && Volume->FatType == FAT32) + { + DirectoryStartCluster = Volume->RootDirStartCluster; RootDirectory = FALSE; } @@ -440,18 +388,18 @@ // if (RootDirectory) { - *DirectorySize = RootDirSectors * BytesPerSector; + *DirectorySize = Volume->RootDirSectors * Volume->BytesPerSector; } else { - *DirectorySize = FatCountClustersInChain(DirectoryStartCluster) * SectorsPerCluster * BytesPerSector; + *DirectorySize = FatCountClustersInChain(Volume, DirectoryStartCluster) * Volume->SectorsPerCluster * Volume->BytesPerSector; } // // Attempt to allocate memory for directory buffer // DPRINTM(DPRINT_FILESYSTEM, "Trying to allocate (DirectorySize) %d bytes.\n", *DirectorySize); - DirectoryBuffer = MmHeapAlloc(*DirectorySize); + DirectoryBuffer = MmAllocateMemory(*DirectorySize); if (DirectoryBuffer == NULL) { @@ -463,17 +411,17 @@ // if (RootDirectory) { - if (!FatReadVolumeSectors(FatDriveNumber, RootDirSectorStart, RootDirSectors, DirectoryBuffer)) - { - MmHeapFree(DirectoryBuffer); + if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer)) + { + MmFreeMemory(DirectoryBuffer); return NULL; } } else { - if (!FatReadClusterChain(DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) - { - MmHeapFree(DirectoryBuffer); + if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) + { + MmFreeMemory(DirectoryBuffer); return NULL; } } @@ -481,7 +429,7 @@ return DirectoryBuffer; } -BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -639,8 +587,8 @@ // FatParseShortFileName(ShortNameBuffer, DirEntry); - DPRINTM(DPRINT_FILESYSTEM, "Entry: %d LFN = %s\n", CurrentEntry, LfnNameBuffer); - DPRINTM(DPRINT_FILESYSTEM, "Entry: %d DOS name = %s\n", CurrentEntry, ShortNameBuffer); + //DPRINTM(DPRINT_FILESYSTEM, "Entry: %d LFN = %s\n", CurrentEntry, LfnNameBuffer); + //DPRINTM(DPRINT_FILESYSTEM, "Entry: %d DOS name = %s\n", CurrentEntry, ShortNameBuffer); // // See if the file name matches either the short or long name @@ -672,7 +620,7 @@ // StartCluster = ((ULONG)DirEntry->ClusterHigh << 16) + DirEntry->ClusterLow; DPRINTM(DPRINT_FILESYSTEM, "StartCluster = 0x%x\n", StartCluster); - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, StartCluster); // // See if memory allocation failed @@ -696,7 +644,7 @@ return FALSE; } -static BOOLEAN FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +static BOOLEAN FatXSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -746,7 +694,7 @@ /* * Get the cluster chain */ - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(DirEntry->StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, DirEntry->StartCluster); /* * See if memory allocation failed @@ -769,7 +717,7 @@ * specified filename and fills in an FAT_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) +LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -809,7 +757,7 @@ // // Buffer the directory contents // - DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); + DirectoryBuffer = FatBufferDirectory(Volume, DirectoryStartCluster, &DirectorySize, (i == 0) ); if (DirectoryBuffer == NULL) { return ENOMEM; @@ -818,24 +766,24 @@ // // Search for file name in directory // - if (ISFATX(FatType)) - { - if (!FatXSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) - { - MmHeapFree(DirectoryBuffer); + if (ISFATX(Volume->FatType)) + { + if (!FatXSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + { + MmFreeMemory(DirectoryBuffer); return ENOENT; } } else { - if (!FatSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) - { - MmHeapFree(DirectoryBuffer); + if (!FatSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + { + MmFreeMemory(DirectoryBuffer); return ENOENT; } } - MmHeapFree(DirectoryBuffer); + MmFreeMemory(DirectoryBuffer); // // If we have another sub-directory to go then @@ -844,8 +792,8 @@ if ((i+1) < NumberOfPathParts) { DirectoryStartCluster = FatFileInfo.FileFatChain[0]; - MmHeapFree(FatFileInfo.FileFatChain); - } + } + MmFreeMemory(FatFileInfo.FileFatChain); } memcpy(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); @@ -899,44 +847,44 @@ Buffer[Idx++] = (DirEntry->FileName[10] == ' ') ? '\0' : DirEntry->FileName[10]; } - DPRINTM(DPRINT_FILESYSTEM, "FatParseShortFileName() ShortName = %s\n", Buffer); + //DPRINTM(DPRINT_FILESYSTEM, "FatParseShortFileName() ShortName = %s\n", Buffer); } /* * FatGetFatEntry() * returns the Fat entry for a given cluster number */ -BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) +BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; UINT32 FatOffset; UINT32 ThisFatSecNum; UINT32 ThisFatEntOffset; - DPRINTM(DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); - - switch(FatType) + //DPRINTM(DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); + + switch(Volume->FatType) { case FAT12: FatOffset = Cluster + (Cluster / 2); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); DPRINTM(DPRINT_FILESYSTEM, "FatOffset: %d\n", FatOffset); DPRINTM(DPRINT_FILESYSTEM, "ThisFatSecNum: %d\n", ThisFatSecNum); DPRINTM(DPRINT_FILESYSTEM, "ThisFatEntOffset: %d\n", ThisFatEntOffset); - if (ThisFatEntOffset == (BytesPerSector - 1)) - { - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) + if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) + { + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) { return FALSE; } } else { - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -955,10 +903,10 @@ case FATX16: FatOffset = (Cluster * 2); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); + + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -972,10 +920,10 @@ case FATX32: FatOffset = (Cluster * 4); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); + + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -986,16 +934,20 @@ break; - } - - DPRINTM(DPRINT_FILESYSTEM, "FAT entry is 0x%x.\n", fat); + default: + DPRINTM(DPRINT_FILESYSTEM, "Unknown FAT type %d\n", Volume->FatType); + return FALSE; + + } + + //DPRINTM(DPRINT_FILESYSTEM, "FAT entry is 0x%x.\n", fat); *ClusterPointer = fat; return TRUE; } -ULONG FatCountClustersInChain(ULONG StartCluster) +ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster) { ULONG ClusterCount = 0; @@ -1006,9 +958,9 @@ // // If end of chain then break out of our cluster counting loop // - if (((FatType == FAT12) && (StartCluster >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { break; } @@ -1021,7 +973,7 @@ // // Get next cluster // - if (!FatGetFatEntry(StartCluster, &StartCluster)) + if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) { return 0; } @@ -1032,7 +984,7 @@ return ClusterCount; } -ULONG* FatGetClusterChainArray(ULONG StartCluster) +ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster) { ULONG ClusterCount; ULONG ArraySize; @@ -1041,13 +993,13 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetClusterChainArray() StartCluster = %d\n", StartCluster); - ClusterCount = FatCountClustersInChain(StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array + ClusterCount = FatCountClustersInChain(Volume, StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array ArraySize = ClusterCount * sizeof(ULONG); // // Allocate array memory // - ArrayPointer = MmHeapAlloc(ArraySize); + ArrayPointer = MmAllocateMemory(ArraySize); if (ArrayPointer == NULL) { @@ -1067,9 +1019,9 @@ // // Don't try to get next cluster for last cluster // - if (((FatType == FAT12) && (StartCluster >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { Idx++; break; @@ -1078,43 +1030,21 @@ // // Get next cluster // - if (!FatGetFatEntry(StartCluster, &StartCluster)) - { - MmHeapFree(ArrayPointer); + if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) + { + MmFreeMemory(ArrayPointer); return NULL; } } return ArrayPointer; -} - -/* - * FatReadCluster() - * Reads the specified cluster into memory - */ -BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer) -{ - ULONG ClusterStartSector; - - ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; - - DPRINTM(DPRINT_FILESYSTEM, "FatReadCluster() ClusterNumber = %d Buffer = 0x%x ClusterStartSector = %d\n", ClusterNumber, Buffer, ClusterStartSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); - - return TRUE; } /* * FatReadClusterChain() * Reads the specified clusters into memory */ -BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) +BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) { ULONG ClusterStartSector; @@ -1123,21 +1053,21 @@ while (NumberOfClusters > 0) { - DPRINTM(DPRINT_FILESYSTEM, "FatReadClusterChain() StartClusterNumber = %d NumberOfClusters = %d Buffer = 0x%x\n", StartClusterNumber, NumberOfClusters, Buffer); + //DPRINTM(DPRINT_FILESYSTEM, "FatReadClusterChain() StartClusterNumber = %d NumberOfClusters = %d Buffer = 0x%x\n", StartClusterNumber, NumberOfClusters, Buffer); // // Calculate starting sector for cluster // - ClusterStartSector = ((StartClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; + ClusterStartSector = ((StartClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; // // Read cluster into memory // - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } - memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); + memcpy(Buffer, (PVOID)FILESYSBUFFER, Volume->SectorsPerCluster * Volume->BytesPerSector); // // Decrement count of clusters left to read @@ -1147,12 +1077,12 @@ // // Increment buffer address by cluster size // - Buffer = (PVOID)((ULONG_PTR)Buffer + (SectorsPerCluster * BytesPerSector)); + Buffer = (PVOID)((ULONG_PTR)Buffer + (Volume->SectorsPerCluster * Volume->BytesPerSector)); // // Get next cluster // - if (!FatGetFatEntry(StartClusterNumber, &StartClusterNumber)) + if (!FatGetFatEntry(Volume, StartClusterNumber, &StartClusterNumber)) { return FALSE; } @@ -1160,9 +1090,9 @@ // // If end of chain then break out of our cluster reading loop // - if (((FatType == FAT12) && (StartClusterNumber >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartClusterNumber >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) { break; } @@ -1175,15 +1105,15 @@ * FatReadPartialCluster() * Reads part of a cluster into memory */ -BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) +BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { ULONG ClusterStartSector; - DPRINTM(DPRINT_FILESYSTEM, "FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); - - ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; - - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) + //DPRINTM(DPRINT_FILESYSTEM, "FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); + + ClusterStartSector = ((ClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; + + if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -1200,6 +1130,7 @@ */ BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) { + PFAT_VOLUME_INFO Volume = FatFileInfo->Volume; ULONG ClusterNumber; ULONG OffsetInCluster; ULONG LengthInCluster; @@ -1260,7 +1191,7 @@ // the last cluster. // - BytesPerCluster = SectorsPerCluster * BytesPerSector; + BytesPerCluster = Volume->SectorsPerCluster * Volume->BytesPerSector; // // Only do the first read if we @@ -1279,7 +1210,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) + if (!FatReadPartialCluster(Volume, ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) { return FALSE; } @@ -1310,7 +1241,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadClusterChain(ClusterNumber, NumberOfClusters, Buffer)) + if (!FatReadClusterChain(Volume, ClusterNumber, NumberOfClusters, Buffer)) { return FALSE; } @@ -1335,7 +1266,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(ClusterNumber, 0, BytesToRead, Buffer)) + if (!FatReadPartialCluster(Volume, ClusterNumber, 0, BytesToRead, Buffer)) { return FALSE; } @@ -1351,16 +1282,35 @@ return TRUE; } -BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) -{ - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { +BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) +{ + LARGE_INTEGER Position; + ULONG Count; + LONG ret; + + //DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors(): SectorNumber %d, SectorCount %d, Buffer %p\n", + // SectorNumber, SectorCount, Buffer); + + // + // Seek to right position + // + Position.QuadPart = SectorNumber * 512; + ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) + { + DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to seek\n"); return FALSE; } - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + // + // Read data + // + ret = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); + if (ret != ESUCCESS || Count != SectorCount * 512) + { + DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to read\n"); + return FALSE; + } // Return success return TRUE; @@ -1393,6 +1343,7 @@ LONG FatOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { + PFAT_VOLUME_INFO FatVolume; FAT_FILE_INFO TempFileInfo; PFAT_FILE_INFO FileHandle; ULONG DeviceId; @@ -1402,11 +1353,12 @@ return EACCES; DeviceId = FsGetDeviceId(*FileId); + FatVolume = FatVolumes[DeviceId]; DPRINTM(DPRINT_FILESYSTEM, "FatOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - ret = FatLookupFile(Path, DeviceId, &TempFileInfo); + ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) return ENOENT; @@ -1415,6 +1367,7 @@ return ENOMEM; RtlCopyMemory(FileHandle, &TempFileInfo, sizeof(FAT_FILE_INFO)); + FileHandle->Volume = FatVolume; FsSetDeviceSpecific(*FileId, FileHandle); return ESUCCESS; @@ -1468,13 +1421,24 @@ const DEVVTBL* FatMount(ULONG DeviceId) { + PFAT_VOLUME_INFO Volume; UCHAR Buffer[512]; PFAT_BOOTSECTOR BootSector = (PFAT_BOOTSECTOR)Buffer; PFAT32_BOOTSECTOR BootSector32 = (PFAT32_BOOTSECTOR)Buffer; PFATX_BOOTSECTOR BootSectorX = (PFATX_BOOTSECTOR)Buffer; + FILEINFORMATION FileInformation; LARGE_INTEGER Position; ULONG Count; + ULARGE_INTEGER SectorCount; LONG ret; + + // + // Allocate data for volume information + // + Volume = MmHeapAlloc(sizeof(FAT_VOLUME_INFO)); + if (!Volume) + return NULL; + RtlZeroMemory(Volume, sizeof(FAT_VOLUME_INFO)); // // Read the BootSector @@ -1483,31 +1447,63 @@ Position.LowPart = 0; ret = ArcSeek(DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) + { + MmHeapFree(Volume); return NULL; + } ret = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); if (ret != ESUCCESS || Count != sizeof(Buffer)) + { + MmHeapFree(Volume); 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 (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) - return NULL; - FatOpenVolume(DriveNumber, StartSector, SectorCount); - return &FatFuncTable; - } - else + } + + // + // Check if BootSector is valid. If no, return early + // + if (!RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) && + !RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) && + !RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) && + !RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) + { + MmHeapFree(Volume); return NULL; -} + } + + // + // Determine sector count + // + ret = ArcGetFileInformation(DeviceId, &FileInformation); + if (ret != ESUCCESS) + { + MmHeapFree(Volume); + return NULL; + } + SectorCount.HighPart = FileInformation.EndingAddress.HighPart; + SectorCount.LowPart = FileInformation.EndingAddress.LowPart; + SectorCount.QuadPart /= SECTOR_SIZE; + + // + // Keep device id + // + Volume->DeviceId = DeviceId; + + // + // Really open the volume + // + if (!FatOpenVolume(Volume, BootSector, SectorCount.QuadPart)) + { + MmHeapFree(Volume); + return NULL; + } + + // + // Remember FAT volume information + // + FatVolumes[DeviceId] = Volume; + + // + // Return success + // + return &FatFuncTable; +} 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 Oct 3 18:47:54 2009 @@ -144,12 +144,15 @@ } FATX_DIRENTRY, * PFATX_DIRENTRY; #include <poppack.h> +typedef struct _FAT_VOLUME_INFO *PFAT_VOLUME_INFO; + typedef struct { ULONG FileSize; /* File size */ ULONG FilePointer; /* File pointer */ ULONG* FileFatChain; /* File fat chain array */ ULONG DriveNumber; + PFAT_VOLUME_INFO Volume; } FAT_FILE_INFO, * PFAT_FILE_INFO; #define ATTR_NORMAL 0x00

1 0

[bfreisen] 43266: * only show message box on exit if the image has not been saved and is not blank * set as wallpaper: now working, setting wallpaper style: not yet * made number of undo-steps changeable through define-statement; increased to 10 (see original) * zoom tool got its track bar (see original)
by bfreisen＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: bfreisen Date: Sat Oct 3 18:33:41 2009 New Revision: 43266 URL: http://svn.reactos.org/svn/reactos?rev=43266&view=rev Log: * only show message box on exit if the image has not been saved and is not blank * set as wallpaper: now working, setting wallpaper style: not yet * made number of undo-steps changeable through define-statement; increased to 10 (see original) * zoom tool got its track bar (see original) Modified: trunk/reactos/base/applications/paint/definitions.h trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/history.c trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/registry.c trunk/reactos/base/applications/paint/toolsettings.c trunk/reactos/base/applications/paint/winproc.c trunk/reactos/base/applications/paint/winproc.h Modified: trunk/reactos/base/applications/paint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/de… ============================================================================== --- trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -7,6 +7,9 @@ */ /* DEFINES **********************************************************/ + +#define HISTORYSIZE 11 +/* HISTORYSIZE = number of possible undo-steps + 1 */ #define SIZEOF(a) (sizeof(a) / sizeof((a)[0])) Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -9,6 +9,7 @@ /* INCLUDES *********************************************************/ #include <windows.h> +#include "definitions.h" /* VARIABLES declared in main.c *************************************/ @@ -19,10 +20,11 @@ extern int imgXRes; extern int imgYRes; -extern HBITMAP hBms[4]; +extern HBITMAP hBms[HISTORYSIZE]; extern int currInd; extern int undoSteps; extern int redoSteps; +extern BOOL imageSaved; extern short startX; extern short startY; @@ -86,6 +88,8 @@ extern HWND hSizeboxCenterBottom; extern HWND hSizeboxRightBottom; +extern HWND hTrackbarZoom; + /* VARIABLES declared in mouse.c *************************************/ extern POINT pointStack[256]; Modified: trunk/reactos/base/applications/paint/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.c [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -29,14 +29,15 @@ void newReversible() { - DeleteObject(hBms[(currInd+1)%4]); - hBms[(currInd+1)%4] = CopyImage( hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); - currInd = (currInd+1)%4; - if (undoSteps<3) undoSteps++; + DeleteObject(hBms[(currInd+1)%HISTORYSIZE]); + hBms[(currInd+1)%HISTORYSIZE] = CopyImage( hBms[currInd], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); + currInd = (currInd+1)%HISTORYSIZE; + if (undoSteps<HISTORYSIZE-1) undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); imgXRes = GetDIBWidth(hBms[currInd]); imgYRes = GetDIBHeight(hBms[currInd]); + imageSaved = FALSE; } void undo() @@ -44,10 +45,10 @@ if (undoSteps>0) { ShowWindow(hSelection, SW_HIDE); - currInd = (currInd+3)%4; + currInd = (currInd+HISTORYSIZE-1)%HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); undoSteps--; - if (redoSteps<3) redoSteps++; + if (redoSteps<HISTORYSIZE-1) redoSteps++; setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); } } @@ -57,10 +58,10 @@ if (redoSteps>0) { ShowWindow(hSelection, SW_HIDE); - currInd = (currInd+1)%4; + currInd = (currInd+1)%HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); redoSteps--; - if (undoSteps<3) undoSteps++; + if (undoSteps<HISTORYSIZE-1) undoSteps++; setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); } } @@ -68,7 +69,7 @@ void resetToU1() { DeleteObject(hBms[currInd]); - hBms[currInd] = CopyImage( hBms[(currInd+3)%4], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); + hBms[currInd] = CopyImage( hBms[(currInd+HISTORYSIZE-1)%HISTORYSIZE], IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG); SelectObject(hDrawingDC, hBms[currInd]); imgXRes = GetDIBWidth(hBms[currInd]); imgYRes = GetDIBHeight(hBms[currInd]); @@ -82,10 +83,10 @@ void insertReversible(HBITMAP hbm) { - DeleteObject(hBms[(currInd+1)%4]); - hBms[(currInd+1)%4] = hbm; - currInd = (currInd+1)%4; - if (undoSteps<3) undoSteps++; + DeleteObject(hBms[(currInd+1)%HISTORYSIZE]); + hBms[(currInd+1)%HISTORYSIZE] = hbm; + currInd = (currInd+1)%HISTORYSIZE; + if (undoSteps<HISTORYSIZE-1) undoSteps++; redoSteps = 0; SelectObject(hDrawingDC, hBms[currInd]); setImgXYRes(GetDIBWidth(hBms[currInd]), GetDIBHeight(hBms[currInd])); @@ -98,10 +99,10 @@ HBRUSH oldBrush; SelectObject(hDrawingDC, hBms[currInd]); - DeleteObject(hBms[(currInd+1)%4]); - hBms[(currInd+1)%4] = CreateDIBWithProperties(width, height); - currInd = (currInd+1)%4; - if (undoSteps<3) undoSteps++; + DeleteObject(hBms[(currInd+1)%HISTORYSIZE]); + hBms[(currInd+1)%HISTORYSIZE] = CreateDIBWithProperties(width, height); + currInd = (currInd+1)%HISTORYSIZE; + if (undoSteps<HISTORYSIZE-1) undoSteps++; redoSteps = 0; hdc = CreateCompatibleDC(hDrawingDC); Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -37,10 +37,11 @@ int imgXRes = 400; int imgYRes = 300; -HBITMAP hBms[4]; +HBITMAP hBms[HISTORYSIZE]; int currInd = 0; int undoSteps = 0; int redoSteps = 0; +BOOL imageSaved = TRUE; // global status variables @@ -116,6 +117,8 @@ HWND hSizeboxLeftBottom; HWND hSizeboxCenterBottom; HWND hSizeboxRightBottom; + +HWND hTrackbarZoom; int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) { @@ -305,6 +308,9 @@ /* creating the tool settings child window */ hToolSettings = CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, hThisInstance, NULL); + hTrackbarZoom = CreateWindowEx(0, TRACKBAR_CLASS, _T(""), WS_CHILD | TBS_VERT | TBS_AUTOTICKS, 1, 1, 40, 64, hToolSettings, NULL, hThisInstance, NULL); + SendMessage(hTrackbarZoom, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 6)); + SendMessage(hTrackbarZoom, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)3); /* creating the palette child window */ hPalWin = CreateWindowEx(0, _T("Palette"), _T(""), WS_CHILD | WS_VISIBLE, 56, 9, 255, 32, hwnd, NULL, hThisInstance, NULL); Modified: trunk/reactos/base/applications/paint/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/re… ============================================================================== --- trunk/reactos/base/applications/paint/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/registry.c [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -13,9 +13,11 @@ /* FUNCTIONS ********************************************************/ -void SetWallpaper(TCHAR *FileName, DWORD dwStyle, DWORD dwTile) +void SetWallpaper(TCHAR *FileName, DWORD dwStyle, DWORD dwTile) //FIXME: The pattern (tiled/stretched) is not set { - HKEY hDesktop; + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) FileName, SPIF_UPDATEINIFILE); + + /*HKEY hDesktop; TCHAR szStyle[3], szTile[3]; if ((dwStyle > 2) || (dwTile > 2)) @@ -34,5 +36,5 @@ RegSetValueEx(hDesktop, _T("TileWallpaper"), 0, REG_SZ, (LPBYTE) szTile, _tcslen(szTile) * sizeof(TCHAR)); RegCloseKey(hDesktop); - } + }*/ } Modified: trunk/reactos/base/applications/paint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/to… ============================================================================== --- trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/toolsettings.c [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -9,8 +9,10 @@ /* INCLUDES *********************************************************/ #include <windows.h> +#include <commctrl.h> #include "globalvar.h" #include "drawing.h" +#include "winproc.h" /* FUNCTIONS ********************************************************/ @@ -18,6 +20,11 @@ { switch (message) { + case WM_VSCROLL: + { + ZoomTo(125<<SendMessage(hTrackbarZoom, TBM_GETPOS, 0, 0)); + } + break; case WM_PAINT: { HDC hdc = GetDC(hwnd); @@ -25,8 +32,11 @@ int rectang2[4] = {0, 70, 42, 136}; DefWindowProc (hwnd, message, wParam, lParam); - - DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); + + if (activeTool!=6) + DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); + else + DrawEdge(hdc, (LPRECT)&rectang, BDR_SUNKENOUTER, BF_RECT); if (activeTool>=13) DrawEdge(hdc, (LPRECT)&rectang2, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE); else Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -31,6 +31,10 @@ activeTool = tool; pointSP = 0; // resets the point-buffer of the polygon and bezier functions SendMessage(hToolSettings, WM_PAINT, 0, 0); + if (tool==6) + ShowWindow(hTrackbarZoom, SW_SHOW); + else + ShowWindow(hTrackbarZoom, SW_HIDE); } void updateCanvasAndScrollbars() @@ -48,6 +52,14 @@ { zoom = newZoom; updateCanvasAndScrollbars(); + int tbPos = 0; + int tempZoom = newZoom; + while (tempZoom>125) + { + tbPos++; + tempZoom = tempZoom>>1; + } + SendMessage(hTrackbarZoom, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)tbPos); } HDC hdc; @@ -67,7 +79,7 @@ showMiniature = FALSE; break; } - if (undoSteps>0) + if (!imageSaved) { TCHAR programname[20]; TCHAR saveprompttext[100]; @@ -503,7 +515,10 @@ break; case IDM_FILESAVE: if (isAFile) + { SaveDIBToFile(hBms[currInd], filepathname, hDrawingDC); + imageSaved = TRUE; + } else SendMessage(hwnd, WM_COMMAND, IDM_FILESAVEAS, 0); break; @@ -514,11 +529,12 @@ TCHAR resstr[100]; SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC); CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); - CopyMemory(filepathname, sfn.lpstrFileTitle, sizeof(filepathname)); + CopyMemory(filepathname, sfn.lpstrFile, sizeof(filepathname)); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(tempstr, resstr, filename); SetWindowText(hMainWnd, tempstr); isAFile = TRUE; + imageSaved = TRUE; } break; case IDM_FILEASWALLPAPERPLANE: Modified: trunk/reactos/base/applications/paint/winproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.h [iso-8859-1] Sat Oct 3 18:33:41 2009 @@ -7,4 +7,6 @@ * PROGRAMMERS: Benedikt Freisen */ +void ZoomTo(int newZoom); + LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

1 0

[sginsberg] 43265: - Replace some x86 assembly in drivers with portable breakpoint support.
by sginsberg＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: sginsberg Date: Sat Oct 3 16:15:46 2009 New Revision: 43265 URL: http://svn.reactos.org/svn/reactos?rev=43265&view=rev Log: - Replace some x86 assembly in drivers with portable breakpoint support. Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/video/font/bmfd/bmfd.h trunk/reactos/drivers/video/font/bmfd/font.c trunk/reactos/drivers/video/font/bmfd/glyph.c trunk/reactos/drivers/video/font/ftfd/enable.c trunk/reactos/drivers/video/font/ftfd/font.c trunk/reactos/drivers/video/font/ftfd/ftfd.h Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -1472,7 +1472,7 @@ *NdisWrapperHandle = NULL; #if BREAK_ON_MINIPORT_INIT - __asm__ ("int $3\n"); + DbgBreakPoint(); #endif Miniport = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DRIVER_BLOCK)); Modified: trunk/reactos/drivers/video/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/bm… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/bmfd.h [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -263,17 +263,6 @@ ULONG DbgPrint(IN PCHAR Format, IN ...); -FORCEINLINE -VOID -DbgBreakPoint(VOID) -{ -#ifdef __GNUC__ - asm volatile ("int $3"); -#else - __asm int 3; -#endif -} - DHPDEV APIENTRY BmfdEnablePDEV( Modified: trunk/reactos/drivers/video/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/font.c [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -247,7 +247,7 @@ ULONG cjView; DbgPrint("BmfdLoadFontFile()\n"); - DbgBreakPoint(); + EngDebugBreak(); /* Check parameters */ if (cFiles != 1) @@ -323,7 +323,7 @@ PBMFD_FILE pfile = (PBMFD_FILE)iFile; DbgPrint("BmfdQueryFontFile()\n"); -// DbgBreakPoint(); +// EngDebugBreak(); switch (ulMode) { @@ -397,7 +397,7 @@ HGLYPH * phglyphs; DbgPrint("DrvQueryFontTree(iMode=%ld)\n", iMode); -// DbgBreakPoint(); +// EngDebugBreak(); /* Check parameters, we only support QFT_GLYPHSET */ if (!iFace || iFace > pfile->cNumFaces || iMode != QFT_GLYPHSET) @@ -522,7 +522,7 @@ PANOSE panose = {0}; DbgPrint("BmfdQueryFont()\n"); -// DbgBreakPoint(); +// EngDebugBreak(); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) Modified: trunk/reactos/drivers/video/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/gl… ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/glyph.c [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -331,7 +331,7 @@ DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", pfo, iMode, hg, pgd, pv, cjSize); -// DbgBreakPoint(); +// EngDebugBreak(); switch (iMode) { Modified: trunk/reactos/drivers/video/font/ftfd/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/en… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -77,7 +77,7 @@ IN HANDLE hDriver) { DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); - DbgBreakPoint(); + EngDebugBreak(); /* Return a dummy DHPDEV */ Modified: trunk/reactos/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -145,7 +145,7 @@ PFTFD_FILE pfile = (PFTFD_FILE)iFile; DbgPrint("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); -// DbgBreakPoint(); +// EngDebugBreak(); switch (ulMode) { @@ -322,7 +322,7 @@ FT_Done_Face(ftface); DbgPrint("Finished with the ifi: %p\n", pifiX); - DbgBreakPoint(); + EngDebugBreak(); return pifi; } @@ -469,7 +469,7 @@ *pid = (ULONG_PTR)pGlyphSet; DbgPrint("pGlyphSet=%p\n", pGlyphSet); -DbgBreakPoint(); +EngDebugBreak(); return pGlyphSet; } Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat Oct 3 16:15:46 2009 @@ -51,17 +51,6 @@ ULONG DbgPrint(IN PCHAR Format, IN ...); - -FORCEINLINE -VOID -DbgBreakPoint(VOID) -{ -#ifdef __GNUC__ - asm volatile ("int $3"); -#else - __asm int 3; -#endif -} DHPDEV APIENTRY

1 0

[hpoussin] 43264: [freeldr] Fix warning on recent GCC versions
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 15:29:41 2009 New Revision: 43264 URL: http://svn.reactos.org/svn/reactos?rev=43264&view=rev Log: [freeldr] Fix warning on recent GCC versions Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c 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 Oct 3 15:29:41 2009 @@ -119,7 +119,7 @@ /* Check if we booted from floppy */ MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline)); - BootFromFloppy = strstr(reactos_kernel_cmdline, "fdisk"); + BootFromFloppy = strstr(reactos_kernel_cmdline, "fdisk") != NULL; UiDrawStatusText("Loading txtsetup.sif..."); /* Open 'txtsetup.sif' */ 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 Oct 3 15:29:41 2009 @@ -194,7 +194,7 @@ MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); /* And check if we booted from floppy */ - BootFromFloppy = strstr(SystemPath, "fdisk"); + BootFromFloppy = strstr(SystemPath, "fdisk") != NULL; /* Open 'txtsetup.sif' from any of source paths */ for (i = BootFromFloppy ? 0 : 1; ; i++)

1 0

[hpoussin] 43263: [freeldr] Code code specific to ARC emulation to its own directory
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 15:11:22 2009 New Revision: 43263 URL: http://svn.reactos.org/svn/reactos?rev=43263&view=rev Log: [freeldr] Code code specific to ARC emulation to its own directory Added: trunk/reactos/boot/freeldr/freeldr/arcemul/ (with props) trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c (with props) trunk/reactos/boot/freeldr/freeldr/arcemul/time.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/machine.c Propchange: trunk/reactos/boot/freeldr/freeldr/arcemul/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Oct 3 15:11:22 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Sat Oct 3 15:11:22 2009 @@ -1,0 +1,176 @@ +/* + * PROJECT: ReactOS Boot Loader (FreeLDR) + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/arcemul/mm.c + * PURPOSE: Routines for ARC Memory Management + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +typedef struct +{ + MEMORY_DESCRIPTOR m; + ULONG Index; + BOOLEAN GeneratedDescriptor; +} MEMORY_DESCRIPTOR_INT; +static const MEMORY_DESCRIPTOR_INT MemoryDescriptors[] = +{ +#if defined (__i386__) || defined (_M_AMD64) + { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // realmode int vectors + { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // freeldr stack + cmdline + { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) + { { MemorySpecialMemory, 0x78, 8 }, 3, }, // prot mode stack. BIOSCALLBUFFER + { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER + { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER + { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video + { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory +#elif __arm__ // This needs to be done per-platform specific way + { { MemoryLoadedProgram, 0x80000, 32 }, 0, }, // X-Loader + OmapLdr + { { MemoryLoadedProgram, 0x81000, 128 }, 1, }, // FreeLDR + { { MemoryFirmwareTemporary, 0x80500, 4096 }, 2, }, // Video Buffer +#endif +}; +MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current) +{ + MEMORY_DESCRIPTOR_INT* CurrentDescriptor; + BIOS_MEMORY_MAP BiosMemoryMap[32]; + static ULONG BiosMemoryMapEntryCount; + static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; + static BOOLEAN MemoryMapInitialized = FALSE; + ULONG i, j; + + // + // Check if it is the first time we're called + // + if (!MemoryMapInitialized) + { + // + // Get the machine generated memory map + // + RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); + BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, + sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + + // + // Copy the entries to our structure + // + for (i = 0, j = 0; i < BiosMemoryMapEntryCount; i++) + { + // + // Is it suitable memory? + // + if (BiosMemoryMap[i].Type != BiosMemoryUsable) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Copy this memory descriptor + // + BiosMemoryDescriptors[j].m.MemoryType = MemoryFree; + BiosMemoryDescriptors[j].m.BasePage = BiosMemoryMap[i].BaseAddress / MM_PAGE_SIZE; + BiosMemoryDescriptors[j].m.PageCount = BiosMemoryMap[i].Length / MM_PAGE_SIZE; + BiosMemoryDescriptors[j].Index = j; + BiosMemoryDescriptors[j].GeneratedDescriptor = TRUE; + j++; + } + + // + // Remember how much descriptors we found + // + BiosMemoryMapEntryCount = j; + + // + // Mark memory map as already retrieved and initialized + // + MemoryMapInitialized = TRUE; + } + + CurrentDescriptor = CONTAINING_RECORD(Current, MEMORY_DESCRIPTOR_INT, m); + + if (Current == NULL) + { + // + // First descriptor requested + // + if (BiosMemoryMapEntryCount > 0) + { + // + // Return first generated memory descriptor + // + return &BiosMemoryDescriptors[0].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + } + else + { + // + // Strange case, we have no memory descriptor + // + return NULL; + } + } + else if (CurrentDescriptor->GeneratedDescriptor) + { + // + // Current entry is a generated descriptor + // + if (CurrentDescriptor->Index + 1 < BiosMemoryMapEntryCount) + { + // + // Return next generated descriptor + // + return &BiosMemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + } + else + { + // + // No fixed memory descriptor; end of memory map + // + return NULL; + } + } + else + { + // + // Current entry is a fixed descriptor + // + if (CurrentDescriptor->Index + 1 < sizeof(MemoryDescriptors) / sizeof(MemoryDescriptors[0])) + { + // + // Return next fixed descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else + { + // + // No more fixed memory descriptor; end of memory map + // + return NULL; + } + } +} Propchange: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/freeldr/freeldr/arcemul/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/time.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/time.c [iso-8859-1] Sat Oct 3 15:11:22 2009 @@ -1,0 +1,30 @@ +/* + * PROJECT: ReactOS Boot Loader (FreeLDR) + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/arcemul/time.c + * PURPOSE: Routines for Time measurement + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* FUNCTIONS ******************************************************************/ + +TIMEINFO* +ArcGetTime(VOID) +{ + return MachVtbl.GetTime(); +} + +ULONG +ArcGetRelativeTime(VOID) +{ + TIMEINFO* TimeInfo; + ULONG ret; + + TimeInfo = ArcGetTime(); + ret = ((TimeInfo->Hour * 24) + TimeInfo->Minute) * 60 + TimeInfo->Second; + return ret; +} Propchange: trunk/reactos/boot/freeldr/freeldr/arcemul/time.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sat Oct 3 15:11:22 2009 @@ -11,6 +11,10 @@ <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> </group> + <directory name="arcemul"> + <file>mm.c</file> + <file>time.c</file> + </directory> <directory name="cache"> <file>blocklist.c</file> <file>cache.c</file> 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 Oct 3 15:11:22 2009 @@ -149,178 +149,6 @@ MachVtbl.PrepareForReactOS(Setup); } -typedef struct -{ - MEMORY_DESCRIPTOR m; - ULONG Index; - BOOLEAN GeneratedDescriptor; -} MEMORY_DESCRIPTOR_INT; -static const MEMORY_DESCRIPTOR_INT MemoryDescriptors[] = -{ -#if defined (__i386__) || defined (_M_AMD64) - { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // realmode int vectors - { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // freeldr stack + cmdline - { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) - { { MemorySpecialMemory, 0x78, 8 }, 3, }, // prot mode stack. BIOSCALLBUFFER - { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER - { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER - { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video - { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory -#elif __arm__ // This needs to be done per-platform specific way - { { MemoryLoadedProgram, 0x80000, 32 }, 0, }, // X-Loader + OmapLdr - { { MemoryLoadedProgram, 0x81000, 128 }, 1, }, // FreeLDR - { { MemoryFirmwareTemporary, 0x80500, 4096 }, 2, }, // Video Buffer -#endif -}; -MEMORY_DESCRIPTOR* -ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current) -{ - MEMORY_DESCRIPTOR_INT* CurrentDescriptor; - BIOS_MEMORY_MAP BiosMemoryMap[32]; - static ULONG BiosMemoryMapEntryCount; - static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; - static BOOLEAN MemoryMapInitialized = FALSE; - ULONG i, j; - - // - // Does machine provide an override for this function? - // - if (MachVtbl.GetMemoryDescriptor) - { - // - // Yes. Use it instead - // - return MachVtbl.GetMemoryDescriptor(Current); - } - - // - // Check if it is the first time we're called - // - if (!MemoryMapInitialized) - { - // - // Get the machine generated memory map - // - RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); - - // - // Copy the entries to our structure - // - for (i = 0, j = 0; i < BiosMemoryMapEntryCount; i++) - { - // - // Is it suitable memory? - // - if (BiosMemoryMap[i].Type != BiosMemoryUsable) - { - // - // No. Process next descriptor - // - continue; - } - - // - // Copy this memory descriptor - // - BiosMemoryDescriptors[j].m.MemoryType = MemoryFree; - BiosMemoryDescriptors[j].m.BasePage = BiosMemoryMap[i].BaseAddress / MM_PAGE_SIZE; - BiosMemoryDescriptors[j].m.PageCount = BiosMemoryMap[i].Length / MM_PAGE_SIZE; - BiosMemoryDescriptors[j].Index = j; - BiosMemoryDescriptors[j].GeneratedDescriptor = TRUE; - j++; - } - - // - // Remember how much descriptors we found - // - BiosMemoryMapEntryCount = j; - - // - // Mark memory map as already retrieved and initialized - // - MemoryMapInitialized = TRUE; - } - - CurrentDescriptor = CONTAINING_RECORD(Current, MEMORY_DESCRIPTOR_INT, m); - - if (Current == NULL) - { - // - // First descriptor requested - // - if (BiosMemoryMapEntryCount > 0) - { - // - // Return first generated memory descriptor - // - return &BiosMemoryDescriptors[0].m; - } - else if (sizeof(MemoryDescriptors) > 0) - { - // - // Return first fixed memory descriptor - // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; - } - else - { - // - // Strange case, we have no memory descriptor - // - return NULL; - } - } - else if (CurrentDescriptor->GeneratedDescriptor) - { - // - // Current entry is a generated descriptor - // - if (CurrentDescriptor->Index + 1 < BiosMemoryMapEntryCount) - { - // - // Return next generated descriptor - // - return &BiosMemoryDescriptors[CurrentDescriptor->Index + 1].m; - } - else if (sizeof(MemoryDescriptors) > 0) - { - // - // Return first fixed memory descriptor - // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; - } - else - { - // - // No fixed memory descriptor; end of memory map - // - return NULL; - } - } - else - { - // - // Current entry is a fixed descriptor - // - if (CurrentDescriptor->Index + 1 < sizeof(MemoryDescriptors) / sizeof(MemoryDescriptors[0])) - { - // - // Return next fixed descriptor - // - return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[CurrentDescriptor->Index + 1].m; - } - else - { - // - // No more fixed memory descriptor; end of memory map - // - return NULL; - } - } -} - BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size) { @@ -363,26 +191,6 @@ return MachVtbl.DiskGetCacheableBlockCount(DriveNumber); } -TIMEINFO* -ArcGetTime(VOID) -{ - return MachVtbl.GetTime(); -} - -ULONG -ArcGetRelativeTime(VOID) -{ - TIMEINFO* TimeInfo; - ULONG ret; - - if (MachVtbl.GetRelativeTime) - return MachVtbl.GetRelativeTime(); - - TimeInfo = ArcGetTime(); - ret = ((TimeInfo->Hour * 24) + TimeInfo->Minute) * 60 + TimeInfo->Second; - return ret; -} - VOID MachHwDetect(VOID) {

1 0

[hpoussin] 43262: [freeldr] It's easy to check if we booted from a floppy thanks to boot path. No need to maintain a machine callback for that
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 14:49:14 2009 New Revision: 43262 URL: http://svn.reactos.org/svn/reactos?rev=43262&view=rev Log: [freeldr] It's easy to check if we booted from a floppy thanks to boot path. No need to maintain a machine callback for that Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sat Oct 3 14:49:14 2009 @@ -203,7 +203,6 @@ // MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sat Oct 3 14:49:14 2009 @@ -46,7 +46,6 @@ MachVtbl.GetMemoryMap = PcMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sat Oct 3 14:49:14 2009 @@ -49,7 +49,6 @@ MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; 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 Oct 3 14:49:14 2009 @@ -254,10 +254,6 @@ VOID PpcDiskGetBootDevice( PULONG BootDevice ) { BootDevice[0] = BootDevice[1] = 0; -} - -BOOLEAN PpcDiskBootingFromFloppy(VOID) { - return FALSE; } BOOLEAN PpcDiskReadLogicalSectors( ULONG DriveNumber, ULONGLONG SectorNumber, @@ -495,7 +491,6 @@ MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; MachVtbl.DiskGetBootDevice = PpcDiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = PpcDiskBootingFromFloppy; MachVtbl.DiskReadLogicalSectors = PpcDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = PpcDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; 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 Oct 3 14:49:14 2009 @@ -219,12 +219,6 @@ ((char *)BootDevice)[1] = (char)BootPartition; } -BOOLEAN -DiskBootingFromFloppy(VOID) -{ - return BootDrive < 0x80; -} - #define IsRecognizedPartition(P) \ ((P) == PARTITION_FAT_12 || \ (P) == PARTITION_FAT_16 || \ @@ -344,7 +338,7 @@ return FALSE; } strcpy(BootPath, Path); - strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); + strcat(BootPath, BootDrive < 0x80 ? "fdisk" : "cdrom"); strcat(strcat(strcat(BootPath, "("), Device), ")"); if (strcmp(BootPath, "multi(0)disk(0)cdrom(128)") == 0) 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 Oct 3 14:49:14 2009 @@ -133,7 +133,6 @@ PULONG Device); BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); VOID DiskGetBootDevice(PULONG BootDevice); -BOOLEAN DiskBootingFromFloppy(VOID); BOOLEAN DiskNormalizeSystemPath(char *SystemPath, unsigned Size); 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 Oct 3 14:49:14 2009 @@ -64,7 +64,6 @@ BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); VOID (*DiskGetBootDevice)(PULONG BootDevice); - BOOLEAN (*DiskBootingFromFloppy)(VOID); BOOLEAN (*DiskNormalizeSystemPath)(char *SystemPath, unsigned Size); BOOLEAN (*DiskReadLogicalSectors)(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN (*DiskGetPartitionEntry)(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); @@ -100,7 +99,6 @@ MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); VOID MachDiskGetBootDevice(PULONG BootDevice); -BOOLEAN MachDiskBootingFromFloppy(); BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size); BOOLEAN MachDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); @@ -130,7 +128,6 @@ #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) -#define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() #define MachDiskNormalizeSystemPath(Path, Size) MachVtbl.DiskNormalizeSystemPath((Path), (Size)) #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) MachVtbl.DiskReadLogicalSectors((Drive), (Start), (Count), (Buf)) #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) 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 Oct 3 14:49:14 2009 @@ -38,7 +38,6 @@ #undef MachPrepareForReactOS #undef MachDiskGetBootPath #undef MachDiskGetBootDevice -#undef MachDiskBootingFromFloppy #undef MachDiskNormalizeSystemPath #undef MachDiskReadLogicalSectors #undef MachDiskGetPartitionEntry @@ -335,12 +334,6 @@ } BOOLEAN -MachDiskBootingFromFloppy() -{ - return MachVtbl.DiskBootingFromFloppy(); -} - -BOOLEAN MachDiskNormalizeSystemPath(char *SystemPath, unsigned Size) { return MachVtbl.DiskNormalizeSystemPath(SystemPath, Size); 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 Oct 3 14:49:14 2009 @@ -47,6 +47,7 @@ ULONG i; LPCSTR SourcePath; LPCSTR LoadOptions, DbgLoadOptions = ""; + BOOLEAN BootFromFloppy; LPCSTR sourcePaths[] = { "", /* Only for floppy boot */ #if defined(_M_IX86) @@ -116,12 +117,13 @@ LoaderBlock.ArchExtra = (ULONG_PTR)MachHwDetect(); UiDrawStatusText(""); - /* set boot device */ - MachDiskGetBootDevice(&LoaderBlock.BootDevice); + /* Check if we booted from floppy */ + MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline)); + BootFromFloppy = strstr(reactos_kernel_cmdline, "fdisk"); UiDrawStatusText("Loading txtsetup.sif..."); /* Open 'txtsetup.sif' */ - for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) + for (i = BootFromFloppy ? 0 : 1; ; i++) { SourcePath = sourcePaths[i]; if (!SourcePath) @@ -191,7 +193,7 @@ LoaderBlock.KernelBase = KernelBase; /* Insert boot disk 2 */ - if (MachDiskBootingFromFloppy()) + if (BootFromFloppy) { UiMessageBox("Please insert \"ReactOS Boot Disk 2\" and press ENTER"); 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 Oct 3 14:49:14 2009 @@ -158,6 +158,7 @@ CHAR FileName[512]; CHAR BootPath[512]; LPCSTR LoadOptions, BootOptions; + BOOLEAN BootFromFloppy; #if DBG LPCSTR DbgOptions; #endif @@ -189,9 +190,14 @@ NULL }; + /* Get boot path */ + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); + + /* And check if we booted from floppy */ + BootFromFloppy = strstr(SystemPath, "fdisk"); + /* Open 'txtsetup.sif' from any of source paths */ - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) + for (i = BootFromFloppy ? 0 : 1; ; i++) { SourcePath = SourcePaths[i]; if (!SourcePath)

1 0

[hpoussin] 43261: WINLDR: Move i386 specific code to its own file
by hpoussin＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: hpoussin Date: Sat Oct 3 14:36:52 2009 New Revision: 43261 URL: http://svn.reactos.org/svn/reactos?rev=43261&view=rev Log: WINLDR: Move i386 specific code to its own file Added: trunk/reactos/boot/freeldr/freeldr/windows/i386/ (with props) trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Sat Oct 3 14:36:52 2009 @@ -100,4 +100,12 @@ </if> </directory> + + <directory name="windows"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>ntsetup.c</file> + </directory> + </if> + </directory> </module> Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 3 14:36:52 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Oct 3 14:36:52 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c [iso-8859-1] Sat Oct 3 14:36:52 2009 @@ -1,0 +1,83 @@ +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/windows/i386/ntsetup.c + * PURPOSE: i386-specific setup for Windows boot + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> +#include <debug.h> + +// this is needed for new IDT filling +#if 0 +extern ULONG_PTR i386DivideByZero; +extern ULONG_PTR i386DebugException; +extern ULONG_PTR i386NMIException; +extern ULONG_PTR i386Breakpoint; +extern ULONG_PTR i386Overflow; +extern ULONG_PTR i386BoundException; +extern ULONG_PTR i386InvalidOpcode; +extern ULONG_PTR i386FPUNotAvailable; +extern ULONG_PTR i386DoubleFault; +extern ULONG_PTR i386CoprocessorSegment; +extern ULONG_PTR i386InvalidTSS; +extern ULONG_PTR i386SegmentNotPresent; +extern ULONG_PTR i386StackException; +extern ULONG_PTR i386GeneralProtectionFault; +extern ULONG_PTR i386PageFault; // exc 14 +extern ULONG_PTR i386CoprocessorError; // exc 16 +extern ULONG_PTR i386AlignmentCheck; // exc 17 +#endif + +/* FUNCTIONS **************************************************************/ + +// Last step before going virtual +void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, + PVOID *GdtIdt, + ULONG *PcrBasePage, + ULONG *TssBasePage) +{ + ULONG TssSize; + ULONG TssPages; + ULONG_PTR Pcr = 0; + ULONG_PTR Tss = 0; + ULONG BlockSize, NumPages; + + LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support + LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; + + /* Allocate 2 pages for PCR */ + Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); + *PcrBasePage = Pcr >> MM_PAGE_SHIFT; + + if (Pcr == 0) + { + UiMessageBox("Can't allocate PCR\n"); + return; + } + + /* Allocate TSS */ + TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); + TssPages = TssSize / MM_PAGE_SIZE; + + Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); + + *TssBasePage = Tss >> MM_PAGE_SHIFT; + + /* Allocate space for new GDT + IDT */ + BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? + NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; + *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); + + if (*GdtIdt == NULL) + { + UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + return; + } + + /* Zero newly prepared GDT+IDT */ + RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); +} Propchange: trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Oct 3 14:36:52 2009 @@ -24,6 +24,12 @@ #include <ndk/ldrtypes.h> #include <debug.h> +// TODO: Move to .h +void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, + PVOID *GdtIdt, + ULONG *PcrBasePage, + ULONG *TssBasePage); + //FIXME: Do a better way to retrieve Arc disk information extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; @@ -91,8 +97,6 @@ ULONG i, PathSeparator; PLOADER_PARAMETER_EXTENSION Extension; - LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support - /* Construct SystemRoot and ArcBoot from SystemPath */ PathSeparator = strstr(BootPath, "\\") - BootPath; strncpy(ArcBoot, BootPath, PathSeparator); @@ -203,54 +207,6 @@ if (LoaderBlock->SetupLdrBlock) LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); -} - -// Last step before going virtual -void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, - PVOID *GdtIdt, - ULONG *PcrBasePage, - ULONG *TssBasePage) -{ - ULONG TssSize; - ULONG TssPages; - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = NULL; //CommonDataArea; - LoaderBlock->u.I386.MachineType = 0; // ntldr sets this to 0 - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - *PcrBasePage = Pcr >> MM_PAGE_SHIFT; - - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR\n"); - return; - } - - /* Allocate TSS */ - TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - TssPages = TssSize / MM_PAGE_SIZE; - - Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); - - *TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - *GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - - if (*GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT); } BOOLEAN Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sat Oct 3 14:36:52 2009 @@ -77,27 +77,6 @@ } GDTIDT; #pragma pack(4) -// this is needed for new IDT filling -#if 0 -extern ULONG_PTR i386DivideByZero; -extern ULONG_PTR i386DebugException; -extern ULONG_PTR i386NMIException; -extern ULONG_PTR i386Breakpoint; -extern ULONG_PTR i386Overflow; -extern ULONG_PTR i386BoundException; -extern ULONG_PTR i386InvalidOpcode; -extern ULONG_PTR i386FPUNotAvailable; -extern ULONG_PTR i386DoubleFault; -extern ULONG_PTR i386CoprocessorSegment; -extern ULONG_PTR i386InvalidTSS; -extern ULONG_PTR i386SegmentNotPresent; -extern ULONG_PTR i386StackException; -extern ULONG_PTR i386GeneralProtectionFault; -extern ULONG_PTR i386PageFault; // exc 14 -extern ULONG_PTR i386CoprocessorError; // exc 16 -extern ULONG_PTR i386AlignmentCheck; // exc 17 -#endif - /* GLOBALS ***************************************************************/ PHARDWARE_PTE PDE;

1 0

[dchapyshev] 43260: - Implement delete of the program information from the registry - Store settings information in HKEY_LOCAL_MACHINE instead HKEY_CURRENT_USER
by dchapyshev＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: dchapyshev Date: Sat Oct 3 11:34:19 2009 New Revision: 43260 URL: http://svn.reactos.org/svn/reactos?rev=43260&view=rev Log: - Implement delete of the program information from the registry - Store settings information in HKEY_LOCAL_MACHINE instead HKEY_CURRENT_USER Modified: trunk/reactos/base/applications/rapps/installed.c trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -136,17 +136,17 @@ ShowInstalledAppInfo(INT Index) { WCHAR szText[MAX_PATH], szInfo[MAX_PATH]; - HKEY hKey = (HKEY) ListViewGetlParam(Index); - - if (!hKey) return FALSE; - - GetApplicationString(hKey, L"DisplayName", szText); + PINSTALLED_INFO Info = ListViewGetlParam(Index); + + if (!Info || !Info->hSubKey) return FALSE; + + GetApplicationString(Info->hSubKey, L"DisplayName", szText); NewRichEditText(szText, CFE_BOLD); InsertRichEditText(L"\n", 0); #define GET_INFO(a, b, c, d) \ - if (GetApplicationString(hKey, a, szInfo)) \ + if (GetApplicationString(Info->hSubKey, a, szInfo)) \ { \ LoadStringW(hInst, b, szText, sizeof(szText) / sizeof(WCHAR)); \ InsertRichEditText(szText, c); \ @@ -175,32 +175,70 @@ } +VOID +RemoveAppFromRegistry(INT Index) +{ + PINSTALLED_INFO Info; + WCHAR szFullName[MAX_PATH] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"; + WCHAR szMsgText[MAX_STR_LEN], szMsgTitle[MAX_STR_LEN]; + INT ItemIndex = SendMessage(hListView, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + + if (!IS_INSTALLED_ENUM(SelectedEnumType)) + return; + + Info = ListViewGetlParam(Index); + if (!Info || !Info->hSubKey || (ItemIndex == -1)) return; + + if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)) || + !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, sizeof(szMsgTitle) / sizeof(WCHAR))) + return; + + if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) + { + wcsncat(szFullName, Info->szKeyName, MAX_PATH - wcslen(szFullName)); + + if (RegDeleteKeyW(Info->hRootKey, szFullName) == ERROR_SUCCESS) + { + (VOID) ListView_DeleteItem(hListView, ItemIndex); + return; + } + + if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + return; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + } +} + + BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc) { DWORD dwSize = MAX_PATH, dwType, dwValue; BOOL bIsSystemComponent, bIsUpdate; - WCHAR pszName[MAX_PATH]; WCHAR pszParentKeyName[MAX_PATH]; WCHAR pszDisplayName[MAX_PATH]; - HKEY hKey, hSubKey; + INSTALLED_INFO Info; + HKEY hKey; LONG ItemIndex = 0; - if (RegOpenKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + Info.hRootKey = IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; + + if (RegOpenKeyW(Info.hRootKey, L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall", &hKey) != ERROR_SUCCESS) { return FALSE; } - while (RegEnumKeyExW(hKey, ItemIndex, pszName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) - { - if (RegOpenKeyW(hKey, pszName, &hSubKey) == ERROR_SUCCESS) + while (RegEnumKeyExW(hKey, ItemIndex, Info.szKeyName, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + if (RegOpenKeyW(hKey, Info.szKeyName, &Info.hSubKey) == ERROR_SUCCESS) { dwType = REG_DWORD; dwSize = sizeof(DWORD); - if (RegQueryValueExW(hSubKey, + if (RegQueryValueExW(Info.hSubKey, L"SystemComponent", NULL, &dwType, @@ -216,7 +254,7 @@ dwType = REG_SZ; dwSize = MAX_PATH; - bIsUpdate = (RegQueryValueExW(hSubKey, + bIsUpdate = (RegQueryValueExW(Info.hSubKey, L"ParentKeyName", NULL, &dwType, @@ -224,7 +262,7 @@ &dwSize) == ERROR_SUCCESS); dwSize = MAX_PATH; - if (RegQueryValueExW(hSubKey, + if (RegQueryValueExW(Info.hSubKey, L"DisplayName", NULL, &dwType, @@ -240,7 +278,7 @@ ((EnumType == ENUM_APPLICATIONS) && (!bIsUpdate)) || /* Applications only */ ((EnumType == ENUM_UPDATES) && (bIsUpdate))) /* Updates only */ { - if (!lpEnumProc(ItemIndex, pszDisplayName, pszName, (LPARAM)hSubKey)) + if (!lpEnumProc(ItemIndex, pszDisplayName, Info)) break; } } Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "&Ñëàãàíå", ID_INSTALL MENUITEM "&Ìàõàíå",ID_UNINSTALL MENUITEM "&Ïðîìÿíà", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "Î&ïðåñíÿâàíå", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Ñëàãàíå", ID_INSTALL MENUITEM "&Ìàõàíå", ID_UNINSTALL MENUITEM "&Ïðîìÿíà", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "Î&ïðåñíÿâàíå", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "&Installieren", ID_INSTALL MENUITEM "&Deinstallieren",ID_UNINSTALL MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Aktualisieren", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Installieren", ID_INSTALL MENUITEM "&Deinstallieren", ID_UNINSTALL MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Aktualisieren", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "&Install", ID_INSTALL MENUITEM "&Uninstall",ID_UNINSTALL MENUITEM "&Modify", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refresh", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Install", ID_INSTALL MENUITEM "&Uninstall", ID_UNINSTALL MENUITEM "&Modify", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refresh", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "&Instalar", ID_INSTALL MENUITEM "&Desinstalar",ID_UNINSTALL MENUITEM "&Modificar", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refrescar", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Instalar", ID_INSTALL MENUITEM "&Desinstalar", ID_UNINSTALL MENUITEM "&Modificar", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refrescar", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "CXg[(&I)", ID_INSTALL MENUITEM "ACXg[(&U)",ID_UNINSTALL MENUITEM "ÏX(&M)", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "XV(&R)", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "CXg[(&I)", ID_INSTALL MENUITEM "ACXg[(&U)", ID_UNINSTALL MENUITEM "ÏX(&M)", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "XV(&R)", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W["" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -13,6 +13,8 @@ MENUITEM "&Installere", ID_INSTALL MENUITEM "&Avinstallere",ID_UNINSTALL MENUITEM "&Endre", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Oppdatere", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Installere", ID_INSTALL MENUITEM "&Avinstallere", ID_UNINSTALL MENUITEM "&Endre", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Oppdater", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -15,6 +15,8 @@ MENUITEM "&Instaluj", ID_INSTALL MENUITEM "&Odinstaluj",ID_UNINSTALL MENUITEM "&Modyfikuj", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "O&dwie¿", ID_REFRESH END @@ -41,6 +43,8 @@ MENUITEM "&Instaluj", ID_INSTALL MENUITEM "&odinstaluj", ID_UNINSTALL MENUITEM "&Modyfikuj", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Odwie¿", ID_REFRESH END @@ -185,4 +189,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -10,9 +10,11 @@ END POPUP "&Ïðîãðàììû" BEGIN - MENUITEM "&Óñòàíîâèòü", ID_INSTALL + MENUITEM "Ó&ñòàíîâèòü", ID_INSTALL MENUITEM "&Óäàëèòü", ID_UNINSTALL MENUITEM "&Èçìåíèòü", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "Ó&äàëèòü èç ðååñòðà", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Îáíîâèòü", ID_REFRESH END @@ -39,6 +41,8 @@ MENUITEM "&Óñòàíîâèòü", ID_INSTALL MENUITEM "&Óäàëèòü", ID_UNINSTALL MENUITEM "&Èçìåíèòü", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "Ó&äàëèòü èç ðååñòðà", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Îáíîâèòü", ID_REFRESH END @@ -183,4 +187,7 @@ IDS_CHOOSE_FOLDER_TEXT "Âûáåðèòå ïàïêó, êîòîðàÿ áóäåò èñïîëüçîâàòüñÿ äëÿ çàãðóçêè ïðîãðàìì:" IDS_CHOOSE_FOLDER_ERROR "Âû óêàçàëè íåñóùåñòâóþùóþ ïàïêó!" IDS_USER_NOT_ADMIN "Âû äîëæíû áûòü àäìèíèñòðàòîðîì äëÿ çàïóñêà ""Ìåíåäæåðà ïðèëîæåíèé ReactOS""!" + IDS_APP_REG_REMOVE "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü äàííûå îá óñòàíîâëåííîé ïðîãðàììå èç ðååñòðà?" + IDS_INFORMATION "Èíôîðìàöèÿ" + IDS_UNABLE_TO_REMOVE "Íå óäàëîñü óäàëèòü äàííûå î ïðîãðàììå èç ðååñòðà!" END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -18,6 +18,8 @@ MENUITEM "&Intalova", ID_INSTALL MENUITEM "O&dintalova", ID_UNINSTALL MENUITEM "&Zmeni", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Obnovi", ID_REFRESH END @@ -44,6 +46,8 @@ MENUITEM "&Intalova", ID_INSTALL MENUITEM "O&dintalova", ID_UNINSTALL MENUITEM "&Zmeni", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Obnovi", ID_REFRESH END @@ -188,4 +192,7 @@ IDS_CHOOSE_FOLDER_TEXT "Vyberte prieèinok, ktorý sa pouije pre sahovanie programov:" IDS_CHOOSE_FOLDER_ERROR "Zvolili ste si neexistujúci prieèinok!" IDS_USER_NOT_ADMIN "Mali by ste by administrátor pre spustenie ""Manaéra aplikácií systému ReactOS""!" + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -22,6 +22,8 @@ MENUITEM "&Âèäàëèòè",ID_UNINSTALL MENUITEM "&Çì³íèòè", ID_MODIFY MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM SEPARATOR MENUITEM "&Îíîâèòè", ID_REFRESH END POPUP "Äîâ³äêà" @@ -47,6 +49,8 @@ MENUITEM "&Âñòàíîâèòè", ID_INSTALL MENUITEM "&Âèäàëèòè", ID_UNINSTALL MENUITEM "&Çì³íèòè", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Remove from Registry", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Îíîâèòè", ID_REFRESH END @@ -191,4 +195,7 @@ IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" -END + IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" +END Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -71,6 +71,14 @@ typedef struct { + HKEY hRootKey; + HKEY hSubKey; + WCHAR szKeyName[MAX_PATH]; + +} INSTALLED_INFO, *PINSTALLED_INFO; + +typedef struct +{ BOOL bSaveWndPos; BOOL bUpdateAtStart; BOOL bLogEnabled; @@ -95,12 +103,13 @@ BOOL InstallApplication(INT Index); /* installed.c */ -typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, LPWSTR lpName, LPWSTR lpKeyName, LPARAM lParam); +typedef BOOL (CALLBACK *APPENUMPROC)(INT ItemIndex, LPWSTR lpName, INSTALLED_INFO Info); BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc); BOOL GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString); BOOL ShowInstalledAppInfo(INT Index); BOOL UninstallApplication(INT Index, BOOL bModify); BOOL IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey); +VOID RemoveAppFromRegistry(INT Index); /* winmain.c */ extern HWND hMainWnd; Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -69,6 +69,7 @@ #define ID_COPY_LINK 557 #define ID_SETTINGS 558 #define ID_REFRESH 559 +#define ID_REGREMOVE 560 /* Strings */ #define IDS_APPTITLE 100 @@ -87,6 +88,9 @@ #define IDS_CHOOSE_FOLDER_TEXT 113 #define IDS_CHOOSE_FOLDER_ERROR 114 #define IDS_USER_NOT_ADMIN 115 +#define IDS_APP_REG_REMOVE 116 +#define IDS_INFORMATION 117 +#define IDS_UNABLE_TO_REMOVE 118 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Oct 3 11:34:19 2009 @@ -15,6 +15,7 @@ INT SelectedEnumType = ENUM_ALL_COMPONENTS; SETTINGS_INFO SettingsInfo; + VOID FillDafaultSettings(PSETTINGS_INFO pSettingsInfo) { @@ -37,7 +38,7 @@ HKEY hKey; DWORD dwSize; - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { dwSize = sizeof(SETTINGS_INFO); if (RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&SettingsInfo, &dwSize) == ERROR_SUCCESS) @@ -70,7 +71,7 @@ SettingsInfo.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); } - if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL, + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"Software\\ReactOS\\rapps", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { RegSetValueEx(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO)); @@ -82,31 +83,40 @@ FreeInstalledAppList(VOID) { INT Count = ListView_GetItemCount(hListView) - 1; - HKEY hKey; + PINSTALLED_INFO Info; while (Count >= 0) { - hKey = ListViewGetlParam(Count); - if (hKey) - RegCloseKey(hKey); + Info = ListViewGetlParam(Count); + if (Info) + { + RegCloseKey(Info->hSubKey); + HeapFree(GetProcessHeap(), 0, Info); + } Count--; } } BOOL CALLBACK -EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, LPWSTR lpKeyName, LPARAM lParam) -{ +EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, INSTALLED_INFO Info) +{ + PINSTALLED_INFO ItemInfo; WCHAR szText[MAX_PATH]; INT Index; - Index = ListViewAddItem(ItemIndex, 0, lpName, lParam); + ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); + if (!ItemInfo) return FALSE; + + *ItemInfo = Info; + + Index = ListViewAddItem(ItemIndex, 0, lpName, (LPARAM)ItemInfo); /* Get version info */ - GetApplicationString((HKEY)lParam, L"DisplayVersion", szText); + GetApplicationString((HKEY)ItemInfo->hSubKey, L"DisplayVersion", szText); ListView_SetItemText(hListView, Index, 1, szText); /* Get comments */ - GetApplicationString((HKEY)lParam, L"Comments", szText); + GetApplicationString((HKEY)ItemInfo->hSubKey, L"Comments", szText); ListView_SetItemText(hListView, Index, 2, szText); return TRUE; @@ -399,6 +409,10 @@ UpdateApplicationsList(-1); break; + case ID_REGREMOVE: + RemoveAppFromRegistry(-1); + break; + case ID_REFRESH: UpdateApplicationsList(-1); break;

1 0

[jimtabor] 43259: - Prevent kernel bug check in win32k when calling a hook proc when thread is in cleanup. - This is not a hack and not a fix. Please retest related bug report applications. Tested Firefox 3.5 and the new putty. Need new debug print outs. ATM Ff 3.5 send out WH_JOURNALRECORD hook calls when the thread is in cleanup. Look like this: Thread is in cleanup and trying to call hook 0 - Reference bug 4298.
by jimtabor＠svn.reactos.org 03 Oct '09

03 Oct '09

Author: jimtabor Date: Sat Oct 3 04:30:47 2009 New Revision: 43259 URL: http://svn.reactos.org/svn/reactos?rev=43259&view=rev Log: - Prevent kernel bug check in win32k when calling a hook proc when thread is in cleanup. - This is not a hack and not a fix. Please retest related bug report applications. Tested Firefox 3.5 and the new putty. Need new debug print outs. ATM Ff 3.5 send out WH_JOURNALRECORD hook calls when the thread is in cleanup. Look like this: Thread is in cleanup and trying to call hook 0 - Reference bug 4298. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat Oct 3 04:30:47 2009 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * Entry Point for win32k.sys */ @@ -285,6 +284,7 @@ DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); Win32Thread->IsExiting = TRUE; + Win32Thread->TIF_flags |= TIF_INCLEANUP; HOOK_DestroyThreadHooks(Thread); UnregisterThreadHotKeys(Thread); /* what if this co_ func crash in umode? what will clean us up then? */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sat Oct 3 04:30:47 2009 @@ -326,6 +326,14 @@ UNICODE_STRING ClassName; PANSI_STRING asWindowName; PANSI_STRING asClassName; + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + if (pti->TIF_flags & TIF_INCLEANUP) + { + DPRINT1("Thread is in cleanup and trying to call hook %d\n", Code); + return 0; + } ArgumentLength = sizeof(HOOKPROC_CALLBACK_ARGUMENTS) - sizeof(WCHAR) + ModuleName->Length; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Oct 3 04:30:47 2009 @@ -425,6 +425,7 @@ co_IntSendMessage(Window->hSelf, WM_NCDESTROY, 0, 0); } MsqRemoveTimersWindow(ThreadData->MessageQueue, Window->hSelf); + HOOK_DestroyThreadHooks(ThreadData->pEThread); // This is needed here too! /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window);

1 0

[janderwald] 43258: - Add KSPROPSETID_Audio guid - Allocate data format after successful initialization of IPinWaveCyclic - Store Miniport Adapter in subdevice descriptor - Implement GUID_NULL handler for topology nodes - Implement setting / retrieving properties for topology nodes
by janderwald＠svn.reactos.org 02 Oct '09

02 Oct '09

Author: janderwald Date: Fri Oct 2 23:55:53 2009 New Revision: 43258 URL: http://svn.reactos.org/svn/reactos?rev=43258&view=rev Log: - Add KSPROPSETID_Audio guid - Allocate data format after successful initialization of IPinWaveCyclic - Store Miniport Adapter in subdevice descriptor - Implement GUID_NULL handler for topology nodes - Implement setting / retrieving properties for topology nodes Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -82,6 +82,7 @@ const GUID IID_IAllocatorMXF = {0xa5f0d62cL, 0xb30f, 0x11d2, {0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; +const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; /// /// undocumented guids Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -161,6 +161,8 @@ DEFINE_ABSTRACT_IRPTARGET() }; +typedef IIrpTarget *PIRPTARGET; + /***************************************************************************** * ISubdevice ***************************************************************************** @@ -212,6 +214,7 @@ LIST_ENTRY SymbolicLinkList; LIST_ENTRY PhysicalConnectionList; UNICODE_STRING RefString; + PUNKNOWN UnknownMiniport; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -913,12 +913,6 @@ DPRINT("CPortPinWaveCyclic::Init entered Size %u\n", DataFormat->FormatSize); - m_Format = (PKSDATAFORMAT)ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); - if (!m_Format) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlMoveMemory(m_Format, DataFormat, DataFormat->FormatSize); - Status = NewIrpQueue(&m_IrpQueue); if (!NT_SUCCESS(Status)) return Status; @@ -943,7 +937,7 @@ NonPagedPool, ConnectDetails->PinId, Capture, - m_Format, + DataFormat, &m_DmaChannel, &m_ServiceGroup); #if 0 @@ -999,6 +993,13 @@ return Status; } + m_Format = (PKSDATAFORMAT)ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + if (!m_Format) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlMoveMemory(m_Format, DataFormat, DataFormat->FormatSize); + + Port->AddRef(); Filter->AddRef(); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -273,6 +273,12 @@ DPRINT("IPortTopology_fnInit success\n"); + if (NT_SUCCESS(Status)) + { + // store for node property requests + m_SubDeviceDescriptor->UnknownMiniport = UnknownMiniport; + } + return STATUS_SUCCESS; } @@ -455,7 +461,7 @@ DPRINT("CreatePinWorkerRoutine called\n"); // create the pin Status = WorkerContext->Filter->NewIrpTarget(&Pin, - NULL, + KSSTRING_Pin, NULL, NonPagedPool, DeviceObject, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -298,6 +298,9 @@ return Status; } + // store for node property requests + m_SubDeviceDescriptor->UnknownMiniport = UnknownMiniport; + // check if it supports IPinCount interface Status = UnknownMiniport->QueryInterface(IID_IPinCount, (PVOID*)&PinCount); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Fri Oct 2 23:55:53 2009 @@ -51,8 +51,133 @@ IN PKSPROPERTY_SET PropertySet, IN PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor) { + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PKSP_NODE Property; + PPCNODE_DESCRIPTOR Node; + PPCPROPERTY_ITEM PropertyItem; + ULONG Index; + LPGUID Buffer; + //PULONG Flags; + PPCPROPERTY_REQUEST PropertyRequest; + KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - return KsPropertyHandler(Irp, PropertySetCount, PropertySet); + + /* try first KsPropertyHandler */ + Status = KsPropertyHandler(Irp, PropertySetCount, PropertySet); + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // access property + Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + // check if this a GUID_NULL request + if (Status == STATUS_NOT_FOUND) + { + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE)) + return Status; + + // check if its a request for a topology node + if (IsEqualGUIDAligned(Property->Property.Set, GUID_NULL) && Property->Property.Id == 0 && Property->Property.Flags == (KSPROPERTY_TYPE_SETSUPPORT | KSPROPERTY_TYPE_TOPOLOGY)) + { + if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + + Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + + PC_ASSERT(Node->AutomationTable); + PC_ASSERT(Node->AutomationTable->PropertyCount); + PC_ASSERT(Node->AutomationTable->PropertyItemSize); + + Irp->IoStatus.Information = sizeof(GUID) * Node->AutomationTable->PropertyCount; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID) * Node->AutomationTable->PropertyCount) + { + // buffer too small + return STATUS_MORE_ENTRIES; + } + + PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; + Buffer = (LPGUID)Irp->UserBuffer; + + for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) + { + RtlMoveMemory(Buffer, PropertyItem->Set, sizeof(GUID)); + Buffer++; + + PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); + } + return STATUS_SUCCESS; + } + else /*if (Property->Property.Flags == (KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY) || + Property->Property.Flags == (KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY) || + Property->Property.Flags == (KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY)) */ + { + if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + + Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + + PC_ASSERT(Node->AutomationTable); + PC_ASSERT(Node->AutomationTable->PropertyCount); + PC_ASSERT(Node->AutomationTable->PropertyItemSize); + + PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; + //Flags = (PULONG)Irp->UserBuffer; + + for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) + { + if (IsEqualGUIDAligned(*PropertyItem->Set, Property->Property.Set) && PropertyItem->Id == Property->Property.Id) + { + PropertyRequest = (PPCPROPERTY_REQUEST)AllocateItem(NonPagedPool, sizeof(PCPROPERTY_REQUEST), TAG_PORTCLASS); + if (!PropertyRequest) + return STATUS_INSUFFICIENT_RESOURCES; + + PC_ASSERT(SubDeviceDescriptor->UnknownMiniport); + PropertyRequest->MajorTarget = SubDeviceDescriptor->UnknownMiniport; + //PropertyRequest->MinorTarget = (PUNKNOWN)0xABADCAFE; + PropertyRequest->Irp = Irp; + PropertyRequest->Node = Property->NodeId; + PropertyRequest->PropertyItem = PropertyItem; + PropertyRequest->Verb = Property->Property.Flags; + PropertyRequest->InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength - sizeof(KSNODEPROPERTY); + PropertyRequest->Instance = (PVOID)((ULONG_PTR)IoStack->Parameters.DeviceIoControl.Type3InputBuffer + sizeof(KSNODEPROPERTY)); + PropertyRequest->ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + PropertyRequest->Value = Irp->UserBuffer; + + Status = PropertyItem->Handler(PropertyRequest); + + if (Status != STATUS_PENDING) + { + //DPRINT1("Status %x ValueSize %u + + Irp->IoStatus.Information = PropertyRequest->ValueSize; + ExFreePool(PropertyRequest); + } + return Status; + } + PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); + } + } +#if 0 + else + { + UNICODE_STRING GuidString; + RtlStringFromGUID(Property->Property.Set, &GuidString); + DPRINT1("Id %u Flags %x Set %S\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer); + DbgBreakPoint(); + } +#endif + } + return Status; } VOID @@ -102,6 +227,39 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; +} + +VOID +DumpFilterDescriptor( + IN PPCFILTER_DESCRIPTOR FilterDescription) +{ + ULONG Index; + PPCPROPERTY_ITEM PropertyItem; + UNICODE_STRING GuidString; + + DPRINT1("======================\n"); + DPRINT1("Descriptor Automation Table%p\n",FilterDescription->AutomationTable); + + if (FilterDescription->AutomationTable) + { + DPRINT1("FilterPropertiesCount %u FilterPropertySize %u Expected %u\n", FilterDescription->AutomationTable->PropertyCount, FilterDescription->AutomationTable->PropertyItemSize, sizeof(PCPROPERTY_ITEM)); + if (FilterDescription->AutomationTable->PropertyCount) + { + PropertyItem = (PPCPROPERTY_ITEM)FilterDescription->AutomationTable->Properties; + + for(Index = 0; Index < FilterDescription->AutomationTable->PropertyCount; Index++) + { + RtlStringFromGUID(*PropertyItem->Set, &GuidString); + DPRINT1("Index %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, PropertyItem->Id, PropertyItem->Flags); + + PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + FilterDescription->AutomationTable->PropertyItemSize); + } + } + } + + + DPRINT1("======================\n"); + DbgBreakPoint(); } NTSTATUS @@ -147,6 +305,9 @@ { /// FIXME /// handle driver properties + + //DumpFilterDescriptor(FilterDescription); + Descriptor->FilterPropertySet = (PKSPROPERTY_SET)AllocateItem(NonPagedPool, sizeof(KSPROPERTY_SET) * FilterPropertiesCount, TAG_PORTCLASS); if (! Descriptor->FilterPropertySet) goto cleanup;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009