Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[hpoussin] 43006: Implement GetFileInformation() on disks for i386 architecture
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 22:00:23 2009 New Revision: 43006 URL: http://svn.reactos.org/svn/reactos?rev=43006&view=rev Log: Implement GetFileInformation() on disks for i386 architecture Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Sep 6 22:00:23 2009 @@ -402,6 +402,7 @@ ULONG DriveNumber; ULONG SectorSize; ULONGLONG SectorOffset; + ULONGLONG SectorCount; ULONGLONG SectorNumber; } DISKCONTEXT; @@ -415,7 +416,13 @@ static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { - return EINVAL; + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; + Information->CurrentAddress.LowPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; + + return ESUCCESS; } static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) @@ -423,6 +430,7 @@ DISKCONTEXT* Context; ULONG DriveNumber, DrivePartition, SectorSize; ULONGLONG SectorOffset = 0; + ULONGLONG SectorCount = 0; PARTITION_TABLE_ENTRY PartitionTableEntry; CHAR FileName[1]; @@ -434,6 +442,11 @@ if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) return EINVAL; SectorOffset = PartitionTableEntry.SectorCountBeforePartition; + SectorCount = PartitionTableEntry.PartitionSectorCount; + } + else + { + SectorCount = 0; /* FIXME */ } Context = MmHeapAlloc(sizeof(DISKCONTEXT)); @@ -442,6 +455,7 @@ Context->DriveNumber = DriveNumber; Context->SectorSize = SectorSize; Context->SectorOffset = SectorOffset; + Context->SectorCount = SectorCount; Context->SectorNumber = 0; FsSetDeviceSpecific(*FileId, Context);

1 0

[hpoussin] 43005: Remove code dealing with FAT cache. It is never used
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 18:43:03 2009 New Revision: 43005 URL: http://svn.reactos.org/svn/reactos?rev=43005&view=rev Log: Remove code dealing with FAT cache. It is never used Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun Sep 6 18:43:03 2009 @@ -16,7 +16,6 @@ PVOID gRamDiskBase; ULONG gRamDiskSize; -extern BOOLEAN gCacheEnabled; /* FUNCTIONS ******************************************************************/ @@ -174,11 +173,6 @@ MachVtbl.DiskGetCacheableBlockCount = RamDiskGetCacheableBlockCount; // - // Also disable cached FAT reads - // - gCacheEnabled = FALSE; - - // // Switch to ramdisk boot partition // BootDrive = 0x49; 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] Sun Sep 6 18:43:03 2009 @@ -35,8 +35,6 @@ 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); - -BOOLEAN gCacheEnabled = FALSE; ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -350,30 +348,6 @@ } MmHeapFree(FatVolumeBootSector); - if (gCacheEnabled) - { - // - // Initialize the disk cache for this drive - // - if (!CacheInitializeDrive(DriveNumber)) - { - return FALSE; - } - - // - // Force the FAT sectors into the cache - // as long as it is FAT12 or FAT16. FAT32 can - // have a multi-megabyte FAT so we don't want that. - // - if (FatType != FAT32 && FatType != FATX32) - { - if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) - { - return FALSE; - } - } - } - else { GEOMETRY DriveGeometry; ULONG BlockSize; @@ -1379,24 +1353,17 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { - if (gCacheEnabled) - { - return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); - } - else - { - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { - return FALSE; - } - - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); - - // Return success - return TRUE; - } + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; } LONG FatClose(ULONG FileId)

1 0

[hpoussin] 43004: For now, some filesystems still need to use DiskGetBootVolume()...
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 18:07:08 2009 New Revision: 43004 URL: http://svn.reactos.org/svn/reactos?rev=43004&view=rev Log: For now, some filesystems still need to use DiskGetBootVolume()... Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sun Sep 6 18:07:08 2009 @@ -1290,7 +1290,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; Ext2OpenVolume(DriveNumber, StartSector, SectorCount); return &Ext2FuncTable; 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] Sun Sep 6 18:07:08 2009 @@ -1535,7 +1535,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; FatOpenVolume(DriveNumber, StartSector, SectorCount); return &FatFuncTable; Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Sun Sep 6 18:07:08 2009 @@ -905,7 +905,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; NtfsOpenVolume(DriveNumber, StartSector, SectorCount); return &NtfsFuncTable;

1 0

[hpoussin] 43003: Remove support for machine specific versions of DiskGetBootVolume and DiskGetSystemVolume
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 17:59:16 2009 New Revision: 43003 URL: http://svn.reactos.org/svn/reactos?rev=43003&view=rev Log: Remove support for machine specific versions of DiskGetBootVolume and DiskGetSystemVolume 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/include/machine.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 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] Sun Sep 6 17:59:16 2009 @@ -201,8 +201,6 @@ // // Now set default disk handling routines -- we don't need to override // - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; 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] Sun Sep 6 17:59:16 2009 @@ -44,8 +44,6 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; 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] Sun Sep 6 17:59:16 2009 @@ -47,8 +47,6 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; 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] Sun Sep 6 17:59:16 2009 @@ -245,36 +245,6 @@ slots, total / 1024, regdata[1] / 1024 ); return slots; -} - -/* Strategy: - * - * For now, it'll be easy enough to use the boot command line as our boot path. - * Treat it as the path of a disk partition. We might even be able to get - * away with grabbing a partition image by tftp in this scenario. - */ - -BOOLEAN PpcDiskGetBootVolume( PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType ) { - *DriveNumber = 0; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_FAT; - return TRUE; -} - -BOOLEAN PpcDiskGetSystemVolume( char *SystemPath, - char *RemainingPath, - PULONG Device ) { - char *remain = strchr(SystemPath, '\\'); - if( remain ) { - strcpy( RemainingPath, remain+1 ); - } else { - RemainingPath[0] = 0; - } - *Device = 0; - // Hack to be a bit easier on ram - CacheSizeLimit = 64 * 1024; - return TRUE; } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { @@ -523,8 +493,6 @@ MachVtbl.GetMemoryMap = PpcGetMemoryMap; MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; - MachVtbl.DiskGetBootVolume = PpcDiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = PpcDiskGetSystemVolume; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; MachVtbl.DiskGetBootDevice = PpcDiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = PpcDiskBootingFromFloppy; @@ -566,6 +534,8 @@ } void PpcInit( of_proxy the_ofproxy ) { + // Hack to be a bit easier on ram + CacheSizeLimit = 64 * 1024; ofproxy = the_ofproxy; PpcDefaultMachVtbl(); if(ofproxy) PpcOfwInit(); 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] Sun Sep 6 17:59:16 2009 @@ -62,8 +62,6 @@ MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(MEMORY_DESCRIPTOR* Current); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - BOOLEAN (*DiskGetBootVolume)(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); - BOOLEAN (*DiskGetSystemVolume)(char *SystemPath, char *RemainingPath, PULONG Device); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); VOID (*DiskGetBootDevice)(PULONG BootDevice); BOOLEAN (*DiskBootingFromFloppy)(VOID); @@ -100,11 +98,6 @@ VOID MachVideoSync(VOID); VOID MachBeep(VOID); MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); -BOOLEAN MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); -BOOLEAN -MachDiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); VOID MachDiskGetBootDevice(PULONG BootDevice); BOOLEAN MachDiskBootingFromFloppy(); @@ -135,8 +128,6 @@ #define MachVideoSync() MachVtbl.VideoSync() #define MachBeep() MachVtbl.Beep() #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) -#define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) -#define MachDiskGetSystemVolume(SysPath, RemPath, Dev) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev)) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) #define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -73,11 +73,6 @@ UiMessageBox("Invalid boot path"); goto LinuxBootFailed; } - if (!MachDiskGetSystemVolume(LinuxBootPath, NULL, NULL)) - { - UiMessageBox("Failed to get system volume."); - goto LinuxBootFailed; - } // Open the kernel LinuxKernel = FsOpenFile(LinuxKernelName); 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] Sun Sep 6 17:59:16 2009 @@ -36,8 +36,6 @@ #undef MachVideoSync #undef MachBeep #undef MachPrepareForReactOS -#undef MachDiskGetBootVolume -#undef MachDiskGetSystemVolume #undef MachDiskGetBootPath #undef MachDiskGetBootDevice #undef MachDiskBootingFromFloppy @@ -325,20 +323,6 @@ } BOOLEAN -MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - return MachVtbl.DiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); -} - -BOOLEAN -MachDiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device) -{ - return MachVtbl.DiskGetSystemVolume(SystemPath, RemainingPath, Device); -} - -BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size) { return MachVtbl.DiskGetBootPath(BootPath, Size); Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -51,12 +51,6 @@ return; } - if (!MachDiskGetSystemVolume(FileName, FileName, NULL)) - { - UiMessageBox("Failed to get system volume."); - return; - } - FilePointer = FsOpenFile(FileName); if (!FilePointer) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -758,7 +758,7 @@ /* * Try to get system volume */ - if (!MachDiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) + if (!DiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) { UiMessageBox("Failed to get system volume."); return;

1 0

[hpoussin] 43002: Do not leak device descriptors in case of error
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 16:21:00 2009 New Revision: 43002 URL: http://svn.reactos.org/svn/reactos?rev=43002&view=rev Log: Do not leak device descriptors in case of error Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun Sep 6 16:21:00 2009 @@ -332,6 +332,7 @@ if (!FileData[DeviceId].FileFuncTable) { /* Error, unable to detect file system */ + pDevice->FuncTable->Close(DeviceId); FileData[DeviceId].FuncTable = NULL; return ENODEV; }

1 0

[spetreolle] 43001: reenable kernel32:pipe test try and comment out test_read_write() in kernel32:file test, it causes MDL PROBE FAILED errors
by spetreolle＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: spetreolle Date: Sun Sep 6 15:11:11 2009 New Revision: 43001 URL: http://svn.reactos.org/svn/reactos?rev=43001&view=rev Log: reenable kernel32:pipe test try and comment out test_read_write() in kernel32:file test, it causes MDL PROBE FAILED errors Modified: trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/testlist.c Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… ============================================================================== --- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Sun Sep 6 15:11:11 2009 @@ -2811,7 +2811,7 @@ test_MapFile(); test_GetFileType(); test_async_file_errors(); - test_read_write(); + //test_read_write(); test_OpenFile(); test_overlapped(); test_RemoveDirectory(); Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… ============================================================================== --- trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] Sun Sep 6 15:11:11 2009 @@ -64,7 +64,7 @@ { "module", func_module }, { "mailslot", func_mailslot }, { "path", func_path }, - //{ "pipe", func_pipe }, + { "pipe", func_pipe }, { "process", func_process }, { "profile", func_profile }, { "resource", func_resource },

1 0

[spetreolle] 43000: forgot the header update part.
by spetreolle＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: spetreolle Date: Sun Sep 6 13:22:47 2009 New Revision: 43000 URL: http://svn.reactos.org/svn/reactos?rev=43000&view=rev Log: forgot the header update part. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Sep 6 13:22:47 2009 @@ -2973,6 +2973,7 @@ UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,UINT,PIXELFORMATDESCRIPTOR*); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); +DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET); DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);

1 0

[spetreolle] 42999: sync mlang winetest with wine 1.1.29
by spetreolle＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: spetreolle Date: Sun Sep 6 13:05:14 2009 New Revision: 42999 URL: http://svn.reactos.org/svn/reactos?rev=42999&view=rev Log: sync mlang winetest with wine 1.1.29 Modified: trunk/rostests/winetests/mlang/mlang.c Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… ============================================================================== --- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Sun Sep 6 13:05:14 2009 @@ -280,44 +280,6 @@ str2++; } *str1 = '\0'; -} - -#define DEBUGSTR_W_MAXLEN 64 - -static CHAR * debugstr_w(const WCHAR * strW) -{ - static CHAR buffers[DEBUGSTR_W_MAXLEN * 2]; - static DWORD pos = 0; - CHAR * strA; - DWORD len = DEBUGSTR_W_MAXLEN - 4; - - strA = &buffers[pos]; - - *strA++ = 'L'; - *strA++ = '"'; - - while (*strW && (len > 4)) { - if ((*strW < ' ') || (*strW > 126)) { - sprintf(strA, "\\%04x", *strW); - strA +=5; - len -=5; - } - else - { - *strA++ = *strW; - len--; - } - strW++; - } - *strA++ = '"'; - *strA = '\0'; - - strA = &buffers[pos]; - pos += DEBUGSTR_W_MAXLEN; - if (pos >= sizeof(buffers)) pos = 0; - - return strA; - } static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) @@ -1296,14 +1258,14 @@ broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, - debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); + wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } else ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, - debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); + wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); }

1 0

[spetreolle] 42998: - Sync mlang with Wine 1.1.29
by spetreolle＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: spetreolle Date: Sun Sep 6 13:05:11 2009 New Revision: 42998 URL: http://svn.reactos.org/svn/reactos?rev=42998&view=rev Log: - Sync mlang with Wine 1.1.29 Modified: trunk/reactos/dll/win32/mlang/mlang.c Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Sun Sep 6 13:05:11 2009 @@ -4,6 +4,7 @@ * Copyright 2002 Lionel Ulmer * Copyright 2003,2004 Mike McCormack * Copyright 2004,2005 Dmitry Timoshkov + * Copyright 2009 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -454,13 +455,13 @@ { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, "Courier","Arial", sidArabic }, /* FIXME */ { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidHan }, /* FIXME */ { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidBopomofo }, /* FIXME */ { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, "Courier","Arial", sidCyrillic }, /* FIXME */ { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, @@ -468,17 +469,17 @@ { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, "Courier","Arial", sidHebrew }, /* FIXME */ { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, - "MS Gothic","MS PGothic" }, + "MS Gothic","MS PGothic", sidKana }, { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidHangul }, /* FIXME */ { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, "Courier","Arial", sidThai }, /* FIXME */ { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, - "Courier","Arial", sidLatin }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, "Courier","Arial" } /* FIXME */ }; @@ -1135,33 +1136,58 @@ return S_FALSE; } -static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) -{ - INT n = GetLocaleInfoA( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); +static inline HRESULT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) +{ + CHAR buffer[MAX_RFC1766_NAME]; + INT n = GetLocaleInfoA(lcid, LOCALE_SISO639LANGNAME, buffer, MAX_RFC1766_NAME); + INT i; + if (n) { - rfc1766[n - 1] = '-'; - n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); - LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; - } - return 0; -} - -static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) -{ - INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); - INT save = n; + i = PRIMARYLANGID(lcid); + if ((((i == LANG_ENGLISH) || (i == LANG_CHINESE) || (i == LANG_ARABIC)) && + (SUBLANGID(lcid) == SUBLANG_DEFAULT)) || + (SUBLANGID(lcid) > SUBLANG_DEFAULT)) { + + buffer[n - 1] = '-'; + i = GetLocaleInfoA(lcid, LOCALE_SISO3166CTRYNAME, buffer + n, MAX_RFC1766_NAME - n); + if (!i) + buffer[n - 1] = '\0'; + } + else + i = 0; + + LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, buffer, n + i, rfc1766, len ); + return ((n + i) > len) ? E_INVALIDARG : S_OK; + } + return E_FAIL; +} + +static inline HRESULT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) +{ + WCHAR buffer[MAX_RFC1766_NAME]; + INT n = GetLocaleInfoW(lcid, LOCALE_SISO639LANGNAME, buffer, MAX_RFC1766_NAME); + INT i; + if (n) { - rfc1766[n - 1] = '-'; - n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); - if (n == save) - rfc1766[n - 1] = '\0'; - LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; - } - return 0; + i = PRIMARYLANGID(lcid); + if ((((i == LANG_ENGLISH) || (i == LANG_CHINESE) || (i == LANG_ARABIC)) && + (SUBLANGID(lcid) == SUBLANG_DEFAULT)) || + (SUBLANGID(lcid) > SUBLANG_DEFAULT)) { + + buffer[n - 1] = '-'; + i = GetLocaleInfoW(lcid, LOCALE_SISO3166CTRYNAME, buffer + n, MAX_RFC1766_NAME - n); + if (!i) + buffer[n - 1] = '\0'; + } + else + i = 0; + + LCMapStringW(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, buffer, n + i, rfc1766, len); + return ((n + i) > len) ? E_INVALIDARG : S_OK; + } + return E_FAIL; } HRESULT WINAPI LcidToRfc1766A( @@ -1170,11 +1196,10 @@ INT nChar) { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - - if (lcid_to_rfc1766A( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + if (!pszRfc1766) + return E_INVALIDARG; + + return lcid_to_rfc1766A(lcid, pszRfc1766, nChar); } HRESULT WINAPI LcidToRfc1766W( @@ -1183,11 +1208,10 @@ INT nChar) { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - - if (lcid_to_rfc1766W( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + if (!pszRfc1766) + return E_INVALIDARG; + + return lcid_to_rfc1766W(lcid, pszRfc1766, nChar); } static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc1766) @@ -1197,7 +1221,7 @@ while (IEnumRfc1766_Next(iface, 1, &info, &num) == S_OK) { - if (!strcmpW(info.wszRfc1766, rfc1766)) + if (!strcmpiW(info.wszRfc1766, rfc1766)) { *lcid = info.lcid; return S_OK; @@ -1222,8 +1246,6 @@ if (!pLocale || !pszRfc1766) return E_INVALIDARG; - *pLocale = 0; - hr = EnumRfc1766_create(0, &enumrfc1766); if (FAILED(hr)) return hr; @@ -1237,6 +1259,9 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) { WCHAR rfc1766W[MAX_RFC1766_NAME + 1]; + + if (!rfc1766A) + return E_INVALIDARG; MultiByteToWideChar(CP_ACP, 0, rfc1766A, -1, rfc1766W, MAX_RFC1766_NAME); rfc1766W[MAX_RFC1766_NAME] = 0; @@ -2116,8 +2141,14 @@ IMultiLanguage* iface, UINT* pcCodePage) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage( iface ); + + TRACE("(%p, %p)\n", This, pcCodePage); + + if (!pcCodePage) return E_INVALIDARG; + + *pcCodePage = This->total_cp; + return S_OK; } static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( @@ -2237,8 +2268,10 @@ WCHAR buf[MAX_RFC1766_NAME]; TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!pbstrRfc1766) + return E_INVALIDARG; + + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK; @@ -2463,7 +2496,7 @@ rfc->total = 0; data.total = 0; - data.allocated = 32; + data.allocated = 160; data.info = HeapAlloc(GetProcessHeap(), 0, data.allocated * sizeof(RFC1766INFO)); if (!data.info) { @@ -2509,8 +2542,38 @@ LCID Locale, PRFC1766INFO pRfc1766Info) { - FIXME("\n"); - return E_NOTIMPL; + LCTYPE type = LOCALE_SLANGUAGE; + + TRACE("(%p, 0x%04x, %p)\n", iface, Locale, pRfc1766Info); + + if (!pRfc1766Info) + return E_INVALIDARG; + + if ((PRIMARYLANGID(Locale) == LANG_ENGLISH) || + (PRIMARYLANGID(Locale) == LANG_CHINESE) || + (PRIMARYLANGID(Locale) == LANG_ARABIC)) { + + if (!SUBLANGID(Locale)) + type = LOCALE_SENGLANGUAGE; /* suppress country */ + } + else + { + if (!SUBLANGID(Locale)) { + TRACE("SUBLANGID missing in 0x%04x\n", Locale); + return E_FAIL; + } + } + + pRfc1766Info->lcid = Locale; + pRfc1766Info->wszRfc1766[0] = 0; + pRfc1766Info->wszLocaleName[0] = 0; + + if ((!lcid_to_rfc1766W(Locale, pRfc1766Info->wszRfc1766, MAX_RFC1766_NAME)) && + (GetLocaleInfoW(Locale, type, pRfc1766Info->wszLocaleName, MAX_LOCALE_NAME) > 0)) + return S_OK; + + /* Locale not supported */ + return E_INVALIDARG; } static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset( @@ -2583,7 +2646,7 @@ TRACE("%p, %p\n", This, pcCodePage); - if (!pcCodePage) return S_FALSE; + if (!pcCodePage) return E_INVALIDARG; *pcCodePage = This->total_cp; return S_OK; @@ -2792,8 +2855,10 @@ WCHAR buf[MAX_RFC1766_NAME]; TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!pbstrRfc1766) + return E_INVALIDARG; + + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK; @@ -2842,8 +2907,45 @@ LANGID LangId, PRFC1766INFO pRfc1766Info) { - FIXME("\n"); - return E_NOTIMPL; + static LANGID last_lang = -1; + LCTYPE type = LOCALE_SLANGUAGE; + + TRACE("(%p, 0x%04x, 0x%04x, %p)\n", iface, Locale, LangId, pRfc1766Info); + + if (!pRfc1766Info) + return E_INVALIDARG; + + if ((PRIMARYLANGID(Locale) == LANG_ENGLISH) || + (PRIMARYLANGID(Locale) == LANG_CHINESE) || + (PRIMARYLANGID(Locale) == LANG_ARABIC)) { + + if (!SUBLANGID(Locale)) + type = LOCALE_SENGLANGUAGE; /* suppress country */ + } + else + { + if (!SUBLANGID(Locale)) { + TRACE("SUBLANGID missing in 0x%04x\n", Locale); + return E_FAIL; + } + } + + pRfc1766Info->lcid = Locale; + pRfc1766Info->wszRfc1766[0] = 0; + pRfc1766Info->wszLocaleName[0] = 0; + + if ((PRIMARYLANGID(LangId) != LANG_ENGLISH) && + (last_lang != LangId)) { + FIXME("Only english names supported (requested: 0x%04x)\n", LangId); + last_lang = LangId; + } + + if ((!lcid_to_rfc1766W(Locale, pRfc1766Info->wszRfc1766, MAX_RFC1766_NAME)) && + (GetLocaleInfoW(Locale, type, pRfc1766Info->wszLocaleName, MAX_LOCALE_NAME) > 0)) + return S_OK; + + /* Locale not supported */ + return E_INVALIDARG; } static HRESULT WINAPI fnIMultiLanguage2_CreateConvertCharset( @@ -3023,8 +3125,10 @@ IMultiLanguage3* iface, UINT uiCodePage) { - FIXME("%u\n", uiCodePage); - return E_NOTIMPL; + TRACE("%u\n", uiCodePage); + + /* FIXME: the installable set is usually larger than the set of valid codepages */ + return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource( @@ -3255,8 +3359,30 @@ static HRESULT WINAPI fnIMLangFontLink2_GetFontUnicodeRanges(IMLangFontLink2* This, HDC hDC, UINT *puiRanges, UNICODERANGE *pUranges) { - FIXME("(%p)->%p %p %p\n",This, hDC, puiRanges, pUranges); - return E_NOTIMPL; + DWORD size; + GLYPHSET *gs; + + TRACE("(%p)->%p %p %p\n", This, hDC, puiRanges, pUranges); + + if (!puiRanges) return E_INVALIDARG; + if (!(size = GetFontUnicodeRanges(hDC, NULL))) return E_FAIL; + if (!(gs = HeapAlloc(GetProcessHeap(), 0, size))) return E_OUTOFMEMORY; + + GetFontUnicodeRanges(hDC, gs); + *puiRanges = gs->cRanges; + if (pUranges) + { + UINT i; + for (i = 0; i < gs->cRanges; i++) + { + if (i >= *puiRanges) break; + pUranges[i].wcFrom = gs->ranges[i].wcLow; + pUranges[i].wcTo = gs->ranges[i].wcLow + gs->ranges[i].cGlyphs; + } + *puiRanges = i; + } + HeapFree(GetProcessHeap(), 0, gs); + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, @@ -3299,8 +3425,21 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This, UINT uiCodePage, SCRIPT_ID *pSid) { - FIXME("(%p)->%i %p\n",This, uiCodePage, pSid); - return E_NOTIMPL; + UINT i; + + TRACE("(%p)->%i %p\n", This, uiCodePage, pSid); + + if (uiCodePage == CP_UNICODE) return E_FAIL; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + if (uiCodePage == mlang_data[i].family_codepage) + { + if (pSid) *pSid = mlang_data[i].sid; + return S_OK; + } + } + return E_FAIL; } static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl =

1 0

[dchapyshev] 42997: - Handle memory allocation failures. Found by Amine Khaldi
by dchapyshev＠svn.reactos.org 05 Sep '09

05 Sep '09

Author: dchapyshev Date: Sat Sep 5 17:07:13 2009 New Revision: 42997 URL: http://svn.reactos.org/svn/reactos?rev=42997&view=rev Log: - Handle memory allocation failures. Found by Amine Khaldi Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -386,6 +386,8 @@ { PULONG buf; buf = usb_alloc_mem(NonPagedPool, 32); + if (!buf) return; + buf[0] = (ULONG) pdev_ext; buf[1] = (ULONG) purb->endp_handle; @@ -548,6 +550,8 @@ pdev_ext->retry = FALSE; buf = usb_alloc_mem(NonPagedPool, 32); + if (!buf) return; + buf[0] = (ULONG) pdev_ext; buf[1] = (ULONG) purb->endp_handle; @@ -714,6 +718,8 @@ pdev_ext->retry = TRUE; cbw = usb_alloc_mem(NonPagedPool, sizeof(COMMAND_BLOCK_WRAPPER)); + if (!cbw) return STATUS_NO_MEMORY; + RtlZeroMemory(cbw, sizeof(COMMAND_BLOCK_WRAPPER)); pdev_ext->io_packet.flags &= ~IOP_FLAG_STAGE_MASK; pdev_ext->io_packet.flags |= IOP_FLAG_STAGE_SENSE; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -41,6 +41,8 @@ UNREFERENCED_PARAMETER(dir); purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + if (!purb) return STATUS_NO_MEMORY; + // Build URB for the ADSC command UsbBuildVendorRequest(purb, pdev_ext->dev_handle | 0xffff, Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -26,6 +26,10 @@ PBYTE data_buf;\ int i;\ data_buf = usb_alloc_mem( NonPagedPool, ( pdEV )->desc_buf_size += 1024 );\ + if (!data_buf)\ + {\ + goto LBL_OUT;\ + }\ RtlZeroMemory( data_buf, ( pdEV )->desc_buf_size );\ for( i = 0; i < ( LONG )( puRB )->context; i++ )\ {\ @@ -798,7 +802,7 @@ //first, get device descriptor purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); data_buf = usb_alloc_mem(NonPagedPool, 512); - if (purb == NULL) + if (purb == NULL || data_buf == NULL) { unlock_dev(pdev, TRUE); return FALSE; @@ -1011,8 +1015,11 @@ } LBL_OUT: - usb_free_mem(purb); - purb = NULL; + if (purb) + { + usb_free_mem(purb); + purb = NULL; + } lock_dev(pdev, TRUE); if (dev_state(pdev) != USB_DEV_STATE_ZOMB) @@ -1245,6 +1252,8 @@ pif->altif_count++; paltif = usb_alloc_mem(NonPagedPool, sizeof(USB_INTERFACE)); + if (!paltif) return FALSE; + RtlZeroMemory(paltif, sizeof(USB_INTERFACE)); InsertTailList(&pif->altif_list, &paltif->altif_list); paltif->pif_drv = NULL; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -1202,6 +1202,12 @@ } pending_endp = alloc_pending_endp(&ehci->pending_endp_pool, 1); + if (!pending_endp) + { + unlock_dev(pdev, TRUE); + KeReleaseSpinLockFromDpcLevel(&ehci->pending_endp_list_lock); + return; + } pending_endp->pendp = pendp; InsertTailList(&ehci->pending_endp_list, &pending_endp->endp_link); @@ -3113,6 +3119,12 @@ i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } + ptimer->threshold = 0; // within [ 50ms, 60ms ], one tick is 10 ms ptimer->context = (ULONG) purb; ptimer->pdev = pdev; @@ -3136,6 +3148,11 @@ case USB_ENDPOINT_XFER_INT: { ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } ptimer->threshold = RH_INTERVAL; ptimer->context = (ULONG) purb; ptimer->pdev = pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -142,6 +142,12 @@ pdriver->driver_desc.dev_protocol = 0; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(GENDRV_DRVR_EXTENSION)); + if (!pdriver->driver_ext) + { + usb_dbg_print(DBGLVL_MAXIMUM, ("gendrv_driver_init(): memory allocation failed!\n")); + return FALSE; + } + pdriver->driver_ext_size = sizeof(GENDRV_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, pdriver->driver_ext_size); @@ -345,6 +351,12 @@ pdev_ext = (PGENDRV_DEVICE_EXTENSION) pdev_obj->DeviceExtension; pdev_ext->desc_buf = usb_alloc_mem(NonPagedPool, 512); + if (!pdev_ext->desc_buf) + { + usb_dbg_print(DBGLVL_MAXIMUM, ("gendrv_event_select_driver(): memory allocation failed!\n")); + goto ERROR_OUT; + } + RtlCopyMemory(pdev_ext->desc_buf, pconfig_desc, 512); // insert the device to the dev_list @@ -440,6 +452,7 @@ { unlock_dev(pdev, TRUE); KeReleaseSpinLockFromDpcLevel(&dev_mgr->event_list_lock); + return; } pevent->flags = USB_EVENT_FLAG_ACTIVE; @@ -815,6 +828,12 @@ pdev_ext = (PGENDRV_DEVICE_EXTENSION) pdev_obj->DeviceExtension; pdev_ext->desc_buf = usb_alloc_mem(NonPagedPool, 512); + if (!pdev_ext->desc_buf) + { + usb_dbg_print(DBGLVL_MAXIMUM, ("gendrv_if_connect(): memory allocation failed!\n")); + goto ERROR_OUT; + } + RtlCopyMemory(pdev_ext->desc_buf, pconfig_desc, 512); pdev_ext->if_ctx.pif_desc = (PUSB_INTERFACE_DESC) & pdev_ext->desc_buf[(PBYTE) pif_desc - (PBYTE) pconfig_desc]; @@ -988,6 +1007,8 @@ pdriver->disp_tbl.dev_reserved = NULL; pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(GENDRV_DRVR_EXTENSION)); + if (!pdriver->driver_ext) return FALSE; + pdriver->driver_ext_size = sizeof(GENDRV_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, pdriver->driver_ext_size); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -432,13 +432,14 @@ return STATUS_DEVICE_DOES_NOT_EXIST; } purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); - RtlZeroMemory(purb, sizeof(URB)); if (purb == NULL) { unlock_dev(pdev, FALSE); return STATUS_NO_MEMORY; } + + RtlZeroMemory(purb, sizeof(URB)); purb->flags = 0; purb->status = STATUS_SUCCESS; @@ -1242,6 +1243,7 @@ //Let's start a reset port request InsertHeadList(&dev_mgr->event_list, &pevent->event_link); purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + if (!purb) goto LBL_OUT; RtlZeroMemory(purb, sizeof(URB)); purb->data_buffer = NULL; @@ -1632,6 +1634,15 @@ } purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + if (!purb) + { + if (from_dpc) + KeReleaseSpinLockFromDpcLevel(&dev_mgr->event_list_lock); + else + KeReleaseSpinLock(&dev_mgr->event_list_lock, old_irql); + return FALSE; + } + RtlZeroMemory(purb, sizeof(URB)); purb->data_buffer = NULL; @@ -1707,6 +1718,7 @@ dev_mgr = dev_mgr_from_dev(pdev); pevent = alloc_event(&dev_mgr->event_pool, 1); + if (!pevent) return; pevent->event = USB_EVENT_DEFAULT; pevent->process_queue = event_list_default_process_queue; pevent->process_event = pe; @@ -2507,13 +2519,14 @@ return FALSE; } purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); - RtlZeroMemory(purb, sizeof(URB)); if (purb == NULL) { unlock_dev(pdev, FALSE); return FALSE; } + + RtlZeroMemory(purb, sizeof(URB)); purb->flags = 0; purb->status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -79,6 +79,7 @@ pdriver->driver_desc.dev_protocol = 1; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(KEYBOARD_DRVR_EXTENSION)); + if (!pdriver->driver_ext) return FALSE; pdriver->driver_ext_size = sizeof(KEYBOARD_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, sizeof(KEYBOARD_DRVR_EXTENSION)); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -40,11 +40,7 @@ pdriver->driver_desc.dev_protocol = 2; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(MOUSE_DRVR_EXTENSION)); - if (!pdriver->driver_ext) - { - usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): memory allocation failed!\n")); - return FALSE; - } + if (!pdriver->driver_ext) return FALSE; pdriver->driver_ext_size = sizeof(MOUSE_DRVR_EXTENSION); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -1177,6 +1177,12 @@ } ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } + ptimer->threshold = 0; // within [ 50ms, 60ms ], one tick is 10 ms ptimer->context = (ULONG) purb; ptimer->pdev = pdev; @@ -1202,6 +1208,12 @@ case USB_ENDPOINT_XFER_INT: { ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } + ptimer->threshold = RH_INTERVAL; ptimer->context = (ULONG) purb; ptimer->pdev = pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -400,6 +400,7 @@ return NULL; ptd = alloc_td(pool_list); + if (!ptd) return NULL; for(i = 1; i < count; i++) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -1747,6 +1747,13 @@ } pending_endp = alloc_pending_endp(&uhci->pending_endp_pool, 1); + if (!pending_endp) + { + unlock_dev(pdev, TRUE); + KeReleaseSpinLockFromDpcLevel(&uhci->pending_endp_list_lock); + return; + } + pending_endp->pendp = pendp; InsertTailList(&uhci->pending_endp_list, &pending_endp->endp_link); @@ -3400,6 +3407,12 @@ } ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } + ptimer->threshold = 0; // within [ 50ms, 60ms ], one tick is 10 ms ptimer->context = (ULONG) purb; ptimer->pdev = pdev; @@ -3423,6 +3436,12 @@ case USB_ENDPOINT_XFER_INT: { ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + if (!ptimer) + { + purb->status = STATUS_NO_MEMORY; + break; + } + ptimer->threshold = RH_INTERVAL; ptimer->context = (ULONG) purb; ptimer->pdev = pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] Sat Sep 5 17:07:13 2009 @@ -250,6 +250,7 @@ pdriver->driver_desc.dev_protocol = 0; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(UMSS_DRVR_EXTENSION)); + if (!pdriver->driver_ext) return FALSE; pdriver->driver_ext_size = sizeof(UMSS_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, sizeof(UMSS_DRVR_EXTENSION)); @@ -1815,6 +1816,8 @@ pdriver->driver_desc.dev_protocol = 0; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(UMSS_DRVR_EXTENSION)); + if (!pdriver->driver_ext) return FALSE; + pdriver->driver_ext_size = sizeof(UMSS_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, sizeof(UMSS_DRVR_EXTENSION)); @@ -1946,10 +1949,11 @@ PUMSS_WORKER_PACKET worker_packet; worker_packet = usb_alloc_mem(NonPagedPool, sizeof(WORK_QUEUE_ITEM) + sizeof(UMSS_WORKER_PACKET)); - RtlZeroMemory(worker_packet, sizeof(WORK_QUEUE_ITEM) + sizeof(UMSS_WORKER_PACKET)); if (worker_packet) { + RtlZeroMemory(worker_packet, sizeof(WORK_QUEUE_ITEM) + sizeof(UMSS_WORKER_PACKET)); + workitem = (PWORK_QUEUE_ITEM) & worker_packet[1]; worker_packet->completion = completion; worker_packet->context = context;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2009