Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[arty] 13014: Added forgotten .h ext2lib.h

by arty＠svn.reactos.com

Added forgotten .h ext2lib.h Added: branches/ext2/reactos/include/fslib/ext2lib.h _____ Added: branches/ext2/reactos/include/fslib/ext2lib.h --- branches/ext2/reactos/include/fslib/ext2lib.h 2005-01-13 02:39:38 UTC (rev 13013) +++ branches/ext2/reactos/include/fslib/ext2lib.h 2005-01-13 02:46:38 UTC (rev 13014) @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS EXT2 filesystem library + * FILE: include/fslib/ext2lib.h + * PURPOSE: Public definitions for ext2 filesystem library + */ +#ifndef __EXT2LIB_H +#define __EXT2LIB_H + +#include <fmifs.h> + +NTSTATUS +Ext2Initialize (VOID); + +NTSTATUS +Ext2Cleanup (VOID); + +NTSTATUS +Ext2Format (PUNICODE_STRING DriveRoot, + ULONG MediaFlag, + PUNICODE_STRING Label, + BOOLEAN QuickFormat, + ULONG ClusterSize, + PFMIFSCALLBACK Callback); + +#endif /*__EXT2LIB_H */

19 years, 10 months

[arty] 13013: Added forgotten ext2.c

by arty＠svn.reactos.com

Added forgotten ext2.c Added: branches/ext2/reactos/drivers/fs/fs_rec/ext2.c _____ Added: branches/ext2/reactos/drivers/fs/fs_rec/ext2.c --- branches/ext2/reactos/drivers/fs/fs_rec/ext2.c 2005-01-13 02:26:05 UTC (rev 13012) +++ branches/ext2/reactos/drivers/fs/fs_rec/ext2.c 2005-01-13 02:39:38 UTC (rev 13013) @@ -0,0 +1,136 @@ +/* + * ReactOS kernel + * Copyright (C) 2002,2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: fat.c 9284 2004-05-02 20:12:38Z hbirr $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/fs/fs_rec/ext2.c (based on vfat.c) + * PURPOSE: Filesystem recognizer driver + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include <ddk/ntddk.h> +#include <rosrtl/string.h> + +#define NDEBUG +#include <debug.h> + +#include "fs_rec.h" + + +/* FUNCTIONS ****************************************************************/ + +static NTSTATUS +FsRecIsExt2Volume(IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PARTITION_INFORMATION PartitionInfo; + DISK_GEOMETRY DiskGeometry; + ULONG Size; + BOOL RecognizedFS = FALSE; + Size = sizeof(DISK_GEOMETRY); + + Status = FsRecDeviceIoControl(DeviceObject, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); + return Status; + } + if (DiskGeometry.MediaType == FixedMedia || DiskGeometry.MediaType == RemovableMedia) + { + // We have found a hard disk + Size = sizeof(PARTITION_INFORMATION); + Status = FsRecDeviceIoControl(DeviceObject, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartitionInfo, + &Size); + if (!NT_SUCCESS(Status)) + { + DPRINT("FsRecDeviceIoControl faild (%x)\n", Status); + return Status; + } + + if (PartitionInfo.PartitionType) + { + if (PartitionInfo.PartitionType == PARTITION_EXT2) + { + RecognizedFS = TRUE; + } + } + } + + return RecognizedFS ? STATUS_SUCCESS : STATUS_UNRECOGNIZED_VOLUME; +} + + +NTSTATUS +FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + UNICODE_STRING RegistryPath; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + DPRINT("FAT: IRP_MN_MOUNT_VOLUME\n"); + Status = FsRecIsExt2Volume(Stack->Parameters.MountVolume.DeviceObject); + if (NT_SUCCESS(Status)) + { + DPRINT("Identified FAT volume\n"); + Status = STATUS_FS_DRIVER_REQUIRED; + } + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + DPRINT("FAT: IRP_MN_LOAD_FILE_SYSTEM\n"); + RtlRosInitUnicodeStringFromLiteral(&RegistryPath, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2"); + Status = ZwLoadDriver(&RegistryPath); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwLoadDriver failed (Status %x)\n", Status); + } + else + { + IoUnregisterFileSystem(DeviceObject); + } + break; + + default: + DPRINT("FAT: Unknown minor function %lx\n", Stack->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + return(Status); +} + +/* EOF */

19 years, 10 months

[royce] 13012: fix variable cases

by royce＠svn.reactos.com

fix variable cases Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-13 01:59:08 UTC (rev 13011) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-13 02:26:05 UTC (rev 13012) @@ -41,9 +41,9 @@ <file>rtlfunc.c</file> </directory> <directory name="dbg"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> - <if property="kdbg" value="1"> + <if property="KDBG" value="1"> <group> <file>i386-dis.c</file> <file>kdb_help.S</file> @@ -51,14 +51,14 @@ </if> </directory> </if> - <if property="kdbg" value="1"> + <if property="KDBG" value="1"> <file>kdb.c</file> <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> <file>rdebug.c</file> <file>profile.c</file> </if> - <if property="dbg_or_kdbg" value="true"> + <if property="DBG_OR_KDBG" value="true"> <file>kdb_stabs.c</file> <file>kdb_symbols.c</file> </if> @@ -68,7 +68,7 @@ <file>user.c</file> </directory> <directory name="ex"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> <file>interlck.c</file> </directory> @@ -171,7 +171,7 @@ <file>service.c</file> </directory> <directory name="ke"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> <file>bios.c</file> <file>brkpoint.c</file> @@ -243,7 +243,7 @@ <file>send.c</file> </directory> <directory name="mm"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> <file>memsafe.s</file> <file>page.c</file> @@ -314,7 +314,7 @@ <file>power.c</file> </directory> <directory name="ps"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> <file>continue.c</file> </directory> @@ -335,7 +335,7 @@ <file>win32.c</file> </directory> <directory name="rtl"> - <if property="arch" value="i386"> + <if property="ARCH" value="i386"> <directory name="i386"> <file>exception.c</file> </directory>

19 years, 10 months

[arty] 13011: fs_rec: add ext2 support

by arty＠svn.reactos.com

fs_rec: add ext2 support txtsetup: add ext2 hivesys: add ext2 usetup: add formatting and installing on ext2 (by filip navara) Modified: branches/ext2/reactos/bootdata/hivesys.inf Modified: branches/ext2/reactos/bootdata/txtsetup.sif Modified: branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.c Modified: branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.h Modified: branches/ext2/reactos/drivers/fs/fs_rec/makefile Modified: branches/ext2/reactos/subsys/system/usetup/bootsup.c Modified: branches/ext2/reactos/subsys/system/usetup/bootsup.h Modified: branches/ext2/reactos/subsys/system/usetup/format.c Modified: branches/ext2/reactos/subsys/system/usetup/format.h Modified: branches/ext2/reactos/subsys/system/usetup/fslist.c Modified: branches/ext2/reactos/subsys/system/usetup/fslist.h Modified: branches/ext2/reactos/subsys/system/usetup/makefile Modified: branches/ext2/reactos/subsys/system/usetup/partlist.c Modified: branches/ext2/reactos/subsys/system/usetup/usetup.c _____ Modified: branches/ext2/reactos/bootdata/hivesys.inf --- branches/ext2/reactos/bootdata/hivesys.inf 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/bootdata/hivesys.inf 2005-01-13 01:59:08 UTC (rev 13011) @@ -729,6 +729,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x000 00000 HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x0000 0002 +; EXT2 Filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x000100 01,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boo t File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000, "system32\drivers\ext2.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00 000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x000 00002 + ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0 x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save SVGA" _____ Modified: branches/ext2/reactos/bootdata/txtsetup.sif --- branches/ext2/reactos/bootdata/txtsetup.sif 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/bootdata/txtsetup.sif 2005-01-13 01:59:08 UTC (rev 13011) @@ -29,14 +29,15 @@ ntoskrnl.exe = 2 scsiport.sys = 3 vfatfs.sys = 3 +ext2.sys = 3 [Cabinets] Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS -OsLoadOptions = "/NOGUIBOOT /NODEBUG" -;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" +;OsLoadOptions = "/NOGUIBOOT /NODEBUG" +OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" _____ Modified: branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.c --- branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -27,9 +27,10 @@ /* INCLUDES *****************************************************************/ +#include <roscfg.h> #include <ddk/ntddk.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #include "fs_rec.h" @@ -81,6 +82,10 @@ Status = FsRecVfatFsControl(DeviceObject, Irp); break; + case FS_TYPE_EXT2: + Status = FsRecExt2FsControl(DeviceObject, Irp); + break; + case FS_TYPE_NTFS: Status = FsRecNtfsFsControl(DeviceObject, Irp); break; _____ Modified: branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.h --- branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.h 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/drivers/fs/fs_rec/fs_rec.h 2005-01-13 01:59:08 UTC (rev 13011) @@ -33,6 +33,7 @@ #define FS_TYPE_NTFS 2 #define FS_TYPE_CDFS 3 #define FS_TYPE_UDFS 4 +#define FS_TYPE_EXT2 5 typedef struct _DEVICE_EXTENSION @@ -91,6 +92,12 @@ IN PIRP Irp); +/* ext2.c */ + +NTSTATUS +FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* ntfs.c */ NTSTATUS _____ Modified: branches/ext2/reactos/drivers/fs/fs_rec/makefile --- branches/ext2/reactos/drivers/fs/fs_rec/makefile 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/drivers/fs/fs_rec/makefile 2005-01-13 01:59:08 UTC (rev 13011) @@ -11,6 +11,7 @@ fs_rec.o \ cdfs.o \ fat.o \ + ext2.o \ ntfs.o \ udfs.o _____ Modified: branches/ext2/reactos/subsys/system/usetup/bootsup.c --- branches/ext2/reactos/subsys/system/usetup/bootsup.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/bootsup.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -1542,6 +1542,424 @@ } +NTSTATUS +InstallExt2BootCodeToDisk(PWSTR SrcPath, + PWSTR RootPath) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + PUCHAR OrigBootSector; + PUCHAR NewBootSector; + LARGE_INTEGER FileOffset; + USHORT BackupBootSector; + + /* Allocate buffer for original bootsector */ + OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); + if (OrigBootSector == NULL) + return(STATUS_INSUFFICIENT_RESOURCES); + + /* Read current boot sector into buffer */ + RtlInitUnicodeString(&Name, + RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(Status); + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + OrigBootSector, + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(Status); + } + + + /* Allocate buffer for new bootsector (2 sectors) */ + NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + 0, + 2 * SECTORSIZE); + if (NewBootSector == NULL) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Read new bootsector from SrcPath */ + RtlInitUnicodeString(&Name, + SrcPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + 2 * SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Adjust bootsector (copy a part of the FAT32 BPB) */ + memcpy((NewBootSector + 3), + (OrigBootSector + 3), + 87); /* FAT32 BPB length */ + + /* Get the location of the backup boot sector */ + BackupBootSector = (OrigBootSector[0x33] << 8) + OrigBootSector[0x32]; + + /* Free the original boot sector */ + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + + /* Write the first sector of the new bootcode to DstPath */ + RtlInitUnicodeString(&Name, + RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Write sector 0 */ + FileOffset.QuadPart = 0ULL; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Write backup boot sector */ + if ((BackupBootSector != 0x0000) && (BackupBootSector != 0xFFFF)) + { + FileOffset.QuadPart = (ULONGLONG)((ULONG)BackupBootSector * SECTORSIZE); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + } + + /* Write sector 14 */ + FileOffset.QuadPart = (ULONGLONG)(14 * SECTORSIZE); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + (NewBootSector + SECTORSIZE), + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + } + NtClose(FileHandle); + + /* Free the new boot sector */ + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + + return(Status); +} + + +NTSTATUS +InstallExt2BootCodeToDisk(PWSTR SrcPath, + PWSTR RootPath) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + PUCHAR OrigBootSector; + PUCHAR NewBootSector; + LARGE_INTEGER FileOffset; + USHORT BackupBootSector; + + /* Allocate buffer for original bootsector */ + OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); + if (OrigBootSector == NULL) + return(STATUS_INSUFFICIENT_RESOURCES); + + /* Read current boot sector into buffer */ + RtlInitUnicodeString(&Name, + RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(Status); + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + OrigBootSector, + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(Status); + } + + + /* Allocate buffer for new bootsector (2 sectors) */ + NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + 0, + 2 * SECTORSIZE); + if (NewBootSector == NULL) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Read new bootsector from SrcPath */ + RtlInitUnicodeString(&Name, + SrcPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + 2 * SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Adjust bootsector (copy a part of the FAT32 BPB) */ + memcpy((NewBootSector + 3), + (OrigBootSector + 3), + 87); /* FAT32 BPB length */ + + /* Get the location of the backup boot sector */ + BackupBootSector = (OrigBootSector[0x33] << 8) + OrigBootSector[0x32]; + + /* Free the original boot sector */ + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + + /* Write the first sector of the new bootcode to DstPath */ + RtlInitUnicodeString(&Name, + RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Write sector 0 */ + FileOffset.QuadPart = 0ULL; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + + /* Write backup boot sector */ + if ((BackupBootSector != 0x0000) && (BackupBootSector != 0xFFFF)) + { + FileOffset.QuadPart = (ULONGLONG)((ULONG)BackupBootSector * SECTORSIZE); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return(Status); + } + } + + /* Write sector 14 */ + FileOffset.QuadPart = (ULONGLONG)(14 * SECTORSIZE); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + (NewBootSector + SECTORSIZE), + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + } + NtClose(FileHandle); + + /* Free the new boot sector */ + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + + return(Status); +} + + static NTSTATUS UnprotectBootIni(PWSTR FileName, PULONG Attributes) _____ Modified: branches/ext2/reactos/subsys/system/usetup/bootsup.h --- branches/ext2/reactos/subsys/system/usetup/bootsup.h 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/bootsup.h 2005-01-13 01:59:08 UTC (rev 13011) @@ -66,6 +66,14 @@ PWSTR RootPath); NTSTATUS +InstallExt2BootCodeToDisk(PWSTR SrcPath, + PWSTR RootPath); + +NTSTATUS +InstallExt2BootCodeToDisk(PWSTR SrcPath, + PWSTR RootPath); + +NTSTATUS UpdateBootIni(PWSTR BootIniPath, PWSTR EntryName, PWSTR EntryValue); _____ Modified: branches/ext2/reactos/subsys/system/usetup/format.c --- branches/ext2/reactos/subsys/system/usetup/format.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/format.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -29,10 +29,12 @@ #include "precomp.h" #include <ntdll/rtl.h> #include <fslib/vfatlib.h> +#include <fslib/ext2lib.h> #include "usetup.h" #include "console.h" #include "progress.h" +#include "fslist.h" #define NDEBUG #include <debug.h> @@ -96,7 +98,7 @@ NTSTATUS -FormatPartition (PUNICODE_STRING DriveRoot) +FormatPartition (PUNICODE_STRING DriveRoot, FILE_SYSTEM FsType) { NTSTATUS Status; SHORT xScreen; @@ -111,17 +113,27 @@ ProgressSetStepCount (ProgressBar, 100); - VfatInitialize (); + if (FsType == FsFat) + { + VfatInitialize (); + Status = VfatFormat (DriveRoot, + 0, /* MediaFlag */ + NULL, /* Label */ + TRUE, /* QuickFormat */ + 0, /* ClusterSize */ + FormatCallback); /* Callback */ + VfatCleanup (); + } + else if (FsType == FsExt2) + { + Status = Ext2Format (DriveRoot, + 0, /* MediaFlag */ + NULL, /* Label */ + TRUE, /* QuickFormat */ + 0, /* ClusterSize */ + FormatCallback); /* Callback */ + } - Status = VfatFormat (DriveRoot, - 0, /* MediaFlag */ - NULL, /* Label */ - TRUE, /* QuickFormat */ - 0, /* ClusterSize */ - (PFMIFSCALLBACK)FormatCallback); /* Callback */ - - VfatCleanup (); - DestroyProgressBar (ProgressBar); ProgressBar = NULL; @@ -130,4 +142,25 @@ return Status; } + +#if 0 +NTSTATUS STDCALL +InstallFileSystemDriver (PUNICODE_STRING Name) +{ + ULONG StartValue = 0; /* Boot start driver. */ + + Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, + Name, + L"Start", + REG_DWORD, + &StartValue, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } +} +#endif + /* EOF */ _____ Modified: branches/ext2/reactos/subsys/system/usetup/format.h --- branches/ext2/reactos/subsys/system/usetup/format.h 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/format.h 2005-01-13 01:59:08 UTC (rev 13011) @@ -28,7 +28,7 @@ #define __FORMAT_H__ NTSTATUS -FormatPartition(PUNICODE_STRING DriveRoot); +FormatPartition(PUNICODE_STRING DriveRoot, FILE_SYSTEM FsType); #endif /* __FILESUP_H__ */ _____ Modified: branches/ext2/reactos/subsys/system/usetup/fslist.c --- branches/ext2/reactos/subsys/system/usetup/fslist.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/fslist.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -52,7 +52,7 @@ List->Top = Top; List->ForceFormat = ForceFormat; - List->FileSystemCount = 1; + List->FileSystemCount = 2; if (ForceFormat) { List->CurrentFileSystem = ForceFileSystem; @@ -108,6 +108,20 @@ } Index++; + if (List->CurrentFileSystem == FsExt2) + { + SetInvertedTextXY (List->Left, + List->Top + Index, + " Format partition as EXT2 file system "); + } + else + { + SetTextXY (List->Left, + List->Top + Index, + " Format partition as EXT2 file system "); + } + Index++; + if (List->ForceFormat == FALSE) { coPos.X = List->Left; _____ Modified: branches/ext2/reactos/subsys/system/usetup/fslist.h --- branches/ext2/reactos/subsys/system/usetup/fslist.h 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/fslist.h 2005-01-13 01:59:08 UTC (rev 13011) @@ -31,7 +31,8 @@ typedef enum { FsFat = 0, - FsKeep = 1 + FsExt2 = 1, + FsKeep = 2 } FILE_SYSTEM; typedef struct _FILE_SYSTEM_LIST _____ Modified: branches/ext2/reactos/subsys/system/usetup/makefile --- branches/ext2/reactos/subsys/system/usetup/makefile 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/makefile 2005-01-13 01:59:08 UTC (rev 13011) @@ -14,7 +14,7 @@ TARGET_PCH = precomp.h -TARGET_SDKLIBS = zlib.a vfatlib.a ntdll.a +TARGET_SDKLIBS = zlib.a vfatlib.a ext2lib.a ntdll.a TARGET_INSTALLDIR = system32 _____ Modified: branches/ext2/reactos/subsys/system/usetup/partlist.c --- branches/ext2/reactos/subsys/system/usetup/partlist.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/partlist.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -297,6 +297,10 @@ #endif PartEntry->FormatState = Preformatted; } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartEntry->FormatState = Preformatted; + } else { PartEntry->FormatState = Unknown; @@ -812,6 +816,10 @@ { PartType = "FAT32"; } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartType = "EXT2"; + } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) { PartType = "NTFS"; /* FIXME: Not quite correct! */ _____ Modified: branches/ext2/reactos/subsys/system/usetup/usetup.c --- branches/ext2/reactos/subsys/system/usetup/usetup.c 2005-01-13 01:54:28 UTC (rev 13010) +++ branches/ext2/reactos/subsys/system/usetup/usetup.c 2005-01-13 01:59:08 UTC (rev 13011) @@ -34,6 +34,7 @@ #include <rosrtl/string.h> #include "usetup.h" +#include "bootsup.h" #include "console.h" #include "partlist.h" #include "inicache.h" @@ -42,8 +43,8 @@ #include "progress.h" #include "bootsup.h" #include "registry.h" +#include "fslist.h" #include "format.h" -#include "fslist.h" #include "cabinet.h" #include "filesup.h" #include "drivesup.h" @@ -2139,6 +2140,10 @@ { PartType = "FAT32"; } + else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2) + { + PartType = "FAT32"; + } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS) { PartType = "NTFS"; /* FIXME: Not quite correct! */ @@ -2301,6 +2306,7 @@ #ifndef NDEBUG ULONG Line; ULONG i; + PLIST_ENTRY Entry; #endif @@ -2386,6 +2392,10 @@ } break; + case FsExt2: + PartEntry->PartInfo[0].PartitionType = PARTITION_EXT2; + break; + case FsKeep: break; @@ -2477,27 +2487,24 @@ PathBuffer); DPRINT ("SystemRootPath: %wZ\n", &SystemRootPath); + if (FileSystemList->CurrentFileSystem != FsKeep) + { + Status = FormatPartition (&DestinationRootPath, + FileSystemList->CurrentFileSystem); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("FormatPartition() failed with status 0x%.08x\n", Status); + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + PartEntry->New = FALSE; + CheckActiveBootPartition (PartitionList); + } + switch (FileSystemList->CurrentFileSystem) { case FsFat: - Status = FormatPartition (&DestinationRootPath); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("FormatPartition() failed with status 0x%.08x\n", Status); - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - PartEntry->New = FALSE; - if (FileSystemList != NULL) - { - DestroyFileSystemList (FileSystemList); - FileSystemList = NULL; - } - - CheckActiveBootPartition (PartitionList); - /* FIXME: Install boot code. This is a hack! */ if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13) || (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32)) @@ -2534,13 +2541,34 @@ } break; + case FsExt2: + { + wcscpy (PathBuffer, SourceRootPath.Buffer); + wcscat (PathBuffer, L"\\loader\\ext2.bin"); + + DPRINT ("Install EXT2 bootcode: %S ==> %S\n", PathBuffer, + DestinationRootPath.Buffer); + Status = InstallExt2BootCodeToDisk (PathBuffer, + DestinationRootPath.Buffer); + if (!NT_SUCCESS (Status)) + { + DPRINT1 ("InstallExt2BootCodeToDisk() failed with status 0x%.08x\n", Status); + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + } + break; + case FsKeep: break; - default: - return QUIT_PAGE; + default: + return QUIT_PAGE; } + DestroyFileSystemList (FileSystemList); + FileSystemList = NULL; + #ifndef NDEBUG SetStatusText (" Done. Press any key ..."); ConInKey(Ir);

19 years, 10 months

[arty] 13010: Ext2lib import by filip navara for use by usetup.

by arty＠svn.reactos.com

Ext2lib import by filip navara for use by usetup. Added: branches/ext2/reactos/lib/fslib/ext2lib/ Added: branches/ext2/reactos/lib/fslib/ext2lib/.cvsignore Added: branches/ext2/reactos/lib/fslib/ext2lib/Badblock.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.h Added: branches/ext2/reactos/lib/fslib/ext2lib/Disk.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Disk.h Added: branches/ext2/reactos/lib/fslib/ext2lib/Group.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Inode.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Makefile Added: branches/ext2/reactos/lib/fslib/ext2lib/Memory.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Mke2fs.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Mke2fs.h Added: branches/ext2/reactos/lib/fslib/ext2lib/Super.c Added: branches/ext2/reactos/lib/fslib/ext2lib/Uuid.c Added: branches/ext2/reactos/lib/fslib/ext2lib/ext2_fs.h Added: branches/ext2/reactos/lib/fslib/ext2lib/types.h _____ Added: branches/ext2/reactos/lib/fslib/ext2lib/.cvsignore --- branches/ext2/reactos/lib/fslib/ext2lib/.cvsignore 2005-01-13 01:51:33 UTC (rev 13009) +++ branches/ext2/reactos/lib/fslib/ext2lib/.cvsignore 2005-01-13 01:54:28 UTC (rev 13010) @@ -0,0 +1,3 @@ +*.d +*.o +*.sym _____ Added: branches/ext2/reactos/lib/fslib/ext2lib/Badblock.c --- branches/ext2/reactos/lib/fslib/ext2lib/Badblock.c 2005-01-13 01:51:33 UTC (rev 13009) +++ branches/ext2/reactos/lib/fslib/ext2lib/Badblock.c 2005-01-13 01:54:28 UTC (rev 13010) @@ -0,0 +1,43 @@ +/* + * PROJECT: Mke2fs + * FILE: Badblock.c + * PROGRAMMER: Matt Wu <mattwu(a)163.com> + * HOMEPAGE: http://ext2.yeah.net + */ + +/* INCLUDES **************************************************************/ + +#include "Mke2fs.h" + +/* DEFINITIONS ***********************************************************/ + +/* FUNCTIONS *************************************************************/ + +bool create_bad_block_inode( PEXT2_FILESYS Ext2Sys, + PEXT2_BADBLK_LIST bb_list) +{ + bool retval; + EXT2_INODE inode; + LARGE_INTEGER SysTime; + + NtQuerySystemTime(&SysTime); + + ext2_mark_inode_bitmap(Ext2Sys->inode_map, EXT2_BAD_INO); + + Ext2Sys->group_desc[0].bg_free_inodes_count--; + Ext2Sys->ext2_sb->s_free_inodes_count--; + + memset(&inode, 0, sizeof(EXT2_INODE)); + inode.i_mode = (USHORT)((0777 & ~Ext2Sys->umask)); + inode.i_uid = inode.i_gid = 0; + inode.i_blocks = 0; + inode.i_block[0] = 0; + inode.i_links_count = 2; + RtlTimeToSecondsSince1970(&SysTime, &inode.i_mtime); + inode.i_ctime = inode.i_atime = inode.i_mtime; + inode.i_size = 0; + + retval = ext2_save_inode(Ext2Sys, EXT2_BAD_INO, &inode); + + return retval; +} _____ Added: branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.c --- branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.c 2005-01-13 01:51:33 UTC (rev 13009) +++ branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.c 2005-01-13 01:54:28 UTC (rev 13010) @@ -0,0 +1,499 @@ +/* + * PROJECT: Mke2fs + * FILE: Bitmap.c + * PROGRAMMER: Matt Wu <mattwu(a)163.com> + * HOMEPAGE: http://ext2.yeah.net + */ + +/* INCLUDES **************************************************************/ + +#include "Mke2fs.h" + +/* DEFINITIONS ***********************************************************/ + +/* FUNCTIONS *************************************************************/ + + +bool ext2_set_bit(int nr,void * addr) +{ + int mask; + unsigned char *ADDR = (unsigned char *) addr; + + ADDR += nr >> 3; + mask = 1 << (nr & 0x07); + *ADDR |= mask; + + return true; +} + +bool ext2_clear_bit(int nr, void * addr) +{ + int mask; + unsigned char *ADDR = (unsigned char *) addr; + + ADDR += nr >> 3; + mask = 1 << (nr & 0x07); + *ADDR &= ~mask; + return true; +} + +bool ext2_test_bit(int nr, void * addr) +{ + int mask; + const unsigned char *ADDR = (const unsigned char *) addr; + + ADDR += nr >> 3; + mask = 1 << (nr & 0x07); + + return ((mask & *ADDR) != 0); +} + +bool ext2_mark_bitmap(PEXT2_BITMAP bitmap, ULONG bitno) +{ + if ((bitno < bitmap->start) || (bitno > bitmap->end)) + { + return false; + } + + return ext2_set_bit(bitno - bitmap->start, bitmap->bitmap); +} + +bool ext2_unmark_bitmap(PEXT2_BITMAP bitmap, ULONG bitno) +{ + if ((bitno < bitmap->start) || (bitno > bitmap->end)) + { + return false; + } + + return ext2_clear_bit(bitno - bitmap->start, bitmap->bitmap); +} + + +bool ext2_test_block_bitmap(PEXT2_BLOCK_BITMAP bitmap, + ULONG block) +{ + return ext2_test_bit(block - bitmap->start, bitmap->bitmap); +} + + +bool ext2_test_block_bitmap_range(PEXT2_BLOCK_BITMAP bitmap, + ULONG block, int num) +{ + int i; + + for (i=0; i < num; i++) + { + if (ext2_test_block_bitmap(bitmap, block+i)) + return false; + } + return true; +} + +bool ext2_test_inode_bitmap(PEXT2_BLOCK_BITMAP bitmap, + ULONG inode) +{ + return ext2_test_bit(inode - bitmap->start, bitmap->bitmap); +} + + +bool ext2_allocate_block_bitmap(PEXT2_FILESYS Ext2Sys) +{ + ULONG size = 0; + + PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; + Ext2Sys->block_map = (PEXT2_BLOCK_BITMAP) + RtlAllocateHeap(GetProcessHeap(), 0, sizeof(EXT2_BLOCK_BITMAP)); + + if (!Ext2Sys->block_map) + { + KdPrint(("Mke2fs: error allocating block bitmap...\n")); + return false; + } + + memset(Ext2Sys->block_map, 0, sizeof(EXT2_BLOCK_BITMAP)); + + Ext2Sys->block_map->start = pExt2Sb->s_first_data_block; + Ext2Sys->block_map->end = pExt2Sb->s_blocks_count-1; + Ext2Sys->block_map->real_end = (EXT2_BLOCKS_PER_GROUP(pExt2Sb) + * Ext2Sys->group_desc_count) -1 + Ext2Sys->block_map->start; + + size = (((Ext2Sys->block_map->real_end - Ext2Sys->block_map->start) / 8) + 1); + + Ext2Sys->block_map->bitmap = + (char *)RtlAllocateHeap(GetProcessHeap(), 0, size); + + if (!Ext2Sys->block_map->bitmap) + { + RtlFreeHeap(GetProcessHeap(), 0, Ext2Sys->block_map); + Ext2Sys->block_map = NULL; + KdPrint(("Mke2fs: error allocating block bitmap...\n")); + return false; + } + + memset(Ext2Sys->block_map->bitmap, 0, size); + + return true; +} + + +bool ext2_allocate_inode_bitmap(PEXT2_FILESYS Ext2Sys) +{ + ULONG size = 0; + + PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; + + Ext2Sys->inode_map = (PEXT2_INODE_BITMAP) + RtlAllocateHeap(GetProcessHeap(), 0, sizeof(EXT2_INODE_BITMAP)); + + if (!Ext2Sys->inode_map) + { + KdPrint(("Mke2fs: error allocating inode bitmap...\n")); + return false; + } + + memset(Ext2Sys->inode_map, 0, sizeof(EXT2_INODE_BITMAP)); + + Ext2Sys->inode_map->start = 1; + Ext2Sys->inode_map->end = pExt2Sb->s_inodes_count; + Ext2Sys->inode_map->real_end = (EXT2_INODES_PER_GROUP(pExt2Sb) + * Ext2Sys->group_desc_count); + + size = (((Ext2Sys->inode_map->real_end - Ext2Sys->inode_map->start) / 8) + 1); + + Ext2Sys->inode_map->bitmap = + (char *)RtlAllocateHeap(GetProcessHeap(), 0, size); + + if (!Ext2Sys->inode_map->bitmap) + { + RtlFreeHeap(GetProcessHeap(), 0, Ext2Sys->inode_map); + Ext2Sys->inode_map = NULL; + KdPrint(("Mke2fs: error allocating block bitmap...\n")); + return false; + } + + memset(Ext2Sys->inode_map->bitmap, 0, size); + + return true; +} + +void ext2_free_generic_bitmap(PEXT2_GENERIC_BITMAP bitmap) +{ + if (!bitmap) + return; + + if (bitmap->bitmap) + { + RtlFreeHeap(GetProcessHeap(), 0, bitmap->bitmap); + bitmap->bitmap = 0; + } + + RtlFreeHeap(GetProcessHeap(), 0, bitmap); +} + +void ext2_free_inode_bitmap(PEXT2_FILESYS Ext2Sys) +{ + PEXT2_INODE_BITMAP bitmap = Ext2Sys->inode_map; + if (!bitmap) + return; + + ext2_free_generic_bitmap(bitmap); + + Ext2Sys->inode_map = NULL; +} + +void ext2_free_block_bitmap(PEXT2_FILESYS Ext2Sys) +{ + PEXT2_BLOCK_BITMAP bitmap = Ext2Sys->block_map; + if (!bitmap) + return; + + ext2_free_generic_bitmap(bitmap); + + Ext2Sys->block_map = NULL; +} + +bool ext2_write_inode_bitmap(PEXT2_FILESYS fs) +{ + ULONG i; + ULONG nbytes; + bool retval; + char *inode_bitmap = fs->inode_map->bitmap; + char *bitmap_block = NULL; + ULONG blk; + + if (!inode_bitmap) + return false; + + nbytes = (size_t) ((EXT2_INODES_PER_GROUP(fs->ext2_sb)+7) / 8); + + bitmap_block = (char *)RtlAllocateHeap(GetProcessHeap(), 0, fs->blocksize); + if (!bitmap_block) return false; + + memset(bitmap_block, 0xff, fs->blocksize); + + for (i = 0; i < fs->group_desc_count; i++) + { + memcpy(bitmap_block, inode_bitmap, nbytes); + blk = fs->group_desc[i].bg_inode_bitmap; + + if (blk) + { +/* +#ifdef EXT2_BIG_ENDIAN_BITMAPS + if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) || + (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))) + ext2_swap_bitmap(fs, bitmap_block, nbytes); +#endif +*/ + retval = NT_SUCCESS(Ext2WriteDisk( + fs, + ((ULONGLONG)blk * fs->blocksize), + fs->blocksize, + (unsigned char *)bitmap_block)); + + if (!retval) + { + RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + return false; + } + } + + inode_bitmap += nbytes; + } + + RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + + return true; +} + +bool ext2_write_block_bitmap (PEXT2_FILESYS fs) +{ + ULONG i; + int j; + int nbytes; + int nbits; + bool retval; + char *block_bitmap = fs->block_map->bitmap; + char *bitmap_block = NULL; + ULONG blk; + + if (!block_bitmap) + return false; + + nbytes = EXT2_BLOCKS_PER_GROUP(fs->ext2_sb) / 8; + + bitmap_block = (char *)RtlAllocateHeap(GetProcessHeap(), 0, fs->blocksize); + if (!bitmap_block) + return false; + + memset(bitmap_block, 0xff, fs->blocksize); + + for (i = 0; i < fs->group_desc_count; i++) + { + memcpy(bitmap_block, block_bitmap, nbytes); + + if (i == fs->group_desc_count - 1) + { + /* Force bitmap padding for the last group */ + nbits = (int) ((fs->ext2_sb->s_blocks_count + - fs->ext2_sb->s_first_data_block) + % EXT2_BLOCKS_PER_GROUP(fs->ext2_sb)); + + if (nbits) + { + for (j = nbits; j < fs->blocksize * 8; j++) + { + ext2_set_bit(j, bitmap_block); + } + } + } + + blk = fs->group_desc[i].bg_block_bitmap; + + if (blk) + { +#ifdef EXT2_BIG_ENDIAN_BITMAPS + if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) || + (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))) + ext2_swap_bitmap(fs, bitmap_block, nbytes); +#endif + retval = NT_SUCCESS(Ext2WriteDisk( + fs, + ((ULONGLONG)blk * fs->blocksize), + fs->blocksize, + (unsigned char *)bitmap_block)); + + if (!retval) + { + RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + return false; + } + } + + block_bitmap += nbytes; + } + + RtlFreeHeap(GetProcessHeap(), 0, bitmap_block); + + return true; +} + +bool ext2_write_bitmaps(PEXT2_FILESYS fs) +{ + bool retval; + + if (fs->block_map) // && ext2fs_test_bb_dirty(fs)) + { + retval = ext2_write_block_bitmap(fs); + if (!retval) + return retval; + } + + if (fs->inode_map) // && ext2fs_test_ib_dirty(fs)) + { + retval = ext2_write_inode_bitmap(fs); + if (!retval) + return retval; + } + + return true; +} + + +bool read_bitmaps(PEXT2_FILESYS fs, int do_inode, int do_block) +{ + ULONG i; + char *block_bitmap = 0, *inode_bitmap = 0; + bool retval = false; + ULONG block_nbytes = EXT2_BLOCKS_PER_GROUP(fs->ext2_sb) / 8; + ULONG inode_nbytes = EXT2_INODES_PER_GROUP(fs->ext2_sb) / 8; + ULONG blk; + +// fs->write_bitmaps = ext2_write_bitmaps; + + if (do_block) + { + if (fs->block_map) + ext2_free_block_bitmap(fs); + + retval = ext2_allocate_block_bitmap(fs); + + if (!retval) + goto cleanup; + + block_bitmap = fs->block_map->bitmap; + } + + if (do_inode) + { + if (fs->inode_map) + ext2_free_inode_bitmap(fs); + + retval = ext2_allocate_inode_bitmap(fs); + if (!retval) + goto cleanup; + + inode_bitmap = fs->inode_map->bitmap; + } + + for (i = 0; i < fs->group_desc_count; i++) + { + if (block_bitmap) + { + blk = fs->group_desc[i].bg_block_bitmap; + + if (blk) + { + retval = NT_SUCCESS(Ext2ReadDisk( + fs, + ((ULONGLONG)blk * fs->blocksize), + block_nbytes, + (unsigned char *) block_bitmap)); + + if (!retval) + { + goto cleanup; + } + +#ifdef EXT2_BIG_ENDIAN_BITMAPS + if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) || + (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))) + ext2_swap_bitmap(fs, block_bitmap, block_nbytes); +#endif + } + else + { + memset(block_bitmap, 0, block_nbytes); + } + + block_bitmap += block_nbytes; + } + + if (inode_bitmap) + { + blk = fs->group_desc[i].bg_inode_bitmap; + if (blk) + { + retval = NT_SUCCESS(Ext2ReadDisk( + fs, ((LONGLONG)blk * fs->blocksize), + inode_nbytes, + (unsigned char *)inode_bitmap)); + + if (!retval) + { + goto cleanup; + } + +#ifdef EXT2_BIG_ENDIAN_BITMAPS + if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) || + (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))) + ext2_swap_bitmap(fs, inode_bitmap, inode_nbytes); +#endif + } + else + { + memset(inode_bitmap, 0, inode_nbytes); + } + + inode_bitmap += inode_nbytes; + } + } + + return true; + +cleanup: + + if (do_block) + { + RtlFreeHeap(GetProcessHeap(), 0, fs->block_map); + fs->block_map = NULL; + } + + if (do_inode) + { + RtlFreeHeap(GetProcessHeap(), 0, fs->inode_map); + fs->inode_map = 0; + } + + return false; +} + +bool ext2_read_inode_bitmap (PEXT2_FILESYS fs) +{ + return read_bitmaps(fs, 1, 0); +} + +bool ext2_read_block_bitmap(PEXT2_FILESYS fs) +{ + return read_bitmaps(fs, 0, 1); +} + +bool ext2_read_bitmaps(PEXT2_FILESYS fs) +{ + + if (fs->inode_map && fs->block_map) + return 0; + + return read_bitmaps(fs, !fs->inode_map, !fs->block_map); +} + _____ Added: branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.h --- branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.h 2005-01-13 01:51:33 UTC (rev 13009) +++ branches/ext2/reactos/lib/fslib/ext2lib/Bitmap.h 2005-01-13 01:54:28 UTC (rev 13010) @@ -0,0 +1,12 @@ +#ifndef _BITMAP_H + +#include "time.h" +#include "stdio.h" +#include "stdlib.h" +#include "string.h" +#include "windows.h" + + + + +#endif // _BITMAP_H _____ Added: branches/ext2/reactos/lib/fslib/ext2lib/Disk.c --- branches/ext2/reactos/lib/fslib/ext2lib/Disk.c 2005-01-13 01:51:33 UTC (rev 13009) +++ branches/ext2/reactos/lib/fslib/ext2lib/Disk.c 2005-01-13 01:54:28 UTC (rev 13010) @@ -0,0 +1,1352 @@ +/* + * PROJECT: Mke2fs + * FILE: Disk.c + * PROGRAMMER: Matt Wu <mattwu(a)163.com> + * HOMEPAGE: http://ext2.yeah.net + */ + +/* INCLUDES **************************************************************/ + +#include "Mke2fs.h" + +/* DEFINITIONS ***********************************************************/ + + + +/* FUNCTIONS *************************************************************/ + +PUCHAR +Ext2StatusToString ( IN NTSTATUS Status ) +{ + switch (Status) + { + case 0x00000000: return "STATUS_SUCCESS"; + case 0x00000001: return "STATUS_WAIT_1"; + case 0x00000002: return "STATUS_WAIT_2"; + case 0x00000003: return "STATUS_WAIT_3"; + case 0x0000003F: return "STATUS_WAIT_63"; + case 0x00000080: return "STATUS_ABANDONED_WAIT_0"; + case 0x000000BF: return "STATUS_ABANDONED_WAIT_63"; + case 0x000000C0: return "STATUS_USER_APC"; + case 0x00000100: return "STATUS_KERNEL_APC"; + case 0x00000101: return "STATUS_ALERTED"; + case 0x00000102: return "STATUS_TIMEOUT"; + case 0x00000103: return "STATUS_PENDING"; + case 0x00000104: return "STATUS_REPARSE"; + case 0x00000105: return "STATUS_MORE_ENTRIES"; + case 0x00000106: return "STATUS_NOT_ALL_ASSIGNED"; + case 0x00000107: return "STATUS_SOME_NOT_MAPPED"; + case 0x00000108: return "STATUS_OPLOCK_BREAK_IN_PROGRESS"; + case 0x00000109: return "STATUS_VOLUME_MOUNTED"; + case 0x0000010A: return "STATUS_RXACT_COMMITTED"; + case 0x0000010B: return "STATUS_NOTIFY_CLEANUP"; + case 0x0000010C: return "STATUS_NOTIFY_ENUM_DIR"; + case 0x0000010D: return "STATUS_NO_QUOTAS_FOR_ACCOUNT"; + case 0x0000010E: return "STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED"; + case 0x00000110: return "STATUS_PAGE_FAULT_TRANSITION"; + case 0x00000111: return "STATUS_PAGE_FAULT_DEMAND_ZERO"; + case 0x00000112: return "STATUS_PAGE_FAULT_COPY_ON_WRITE"; + case 0x00000113: return "STATUS_PAGE_FAULT_GUARD_PAGE"; + case 0x00000114: return "STATUS_PAGE_FAULT_PAGING_FILE"; + case 0x00000115: return "STATUS_CACHE_PAGE_LOCKED"; + case 0x00000116: return "STATUS_CRASH_DUMP"; + case 0x00000117: return "STATUS_BUFFER_ALL_ZEROS"; + case 0x00000118: return "STATUS_REPARSE_OBJECT"; + case 0x00000119: return "STATUS_RESOURCE_REQUIREMENTS_CHANGED"; + case 0x00000120: return "STATUS_TRANSLATION_COMPLETE"; + case 0x00000121: return "STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY"; + case 0x00010001: return "DBG_EXCEPTION_HANDLED"; + case 0x00010002: return "DBG_CONTINUE"; + case 0x40000000: return "STATUS_OBJECT_NAME_EXISTS"; + case 0x40000001: return "STATUS_THREAD_WAS_SUSPENDED"; + case 0x40000002: return "STATUS_WORKING_SET_LIMIT_RANGE"; + case 0x40000003: return "STATUS_IMAGE_NOT_AT_BASE"; + case 0x40000004: return "STATUS_RXACT_STATE_CREATED"; + case 0x40000005: return "STATUS_SEGMENT_NOTIFICATION"; + case 0x40000006: return "STATUS_LOCAL_USER_SESSION_KEY"; + case 0x40000007: return "STATUS_BAD_CURRENT_DIRECTORY"; + case 0x40000008: return "STATUS_SERIAL_MORE_WRITES"; + case 0x40000009: return "STATUS_REGISTRY_RECOVERED"; + case 0x4000000A: return "STATUS_FT_READ_RECOVERY_FROM_BACKUP"; + case 0x4000000B: return "STATUS_FT_WRITE_RECOVERY"; + case 0x4000000C: return "STATUS_SERIAL_COUNTER_TIMEOUT"; + case 0x4000000D: return "STATUS_NULL_LM_PASSWORD"; + case 0x4000000E: return "STATUS_IMAGE_MACHINE_TYPE_MISMATCH"; + case 0x4000000F: return "STATUS_RECEIVE_PARTIAL"; + case 0x40000010: return "STATUS_RECEIVE_EXPEDITED"; + case 0x40000011: return "STATUS_RECEIVE_PARTIAL_EXPEDITED"; + case 0x40000012: return "STATUS_EVENT_DONE"; + case 0x40000013: return "STATUS_EVENT_PENDING"; + case 0x40000014: return "STATUS_CHECKING_FILE_SYSTEM"; + case 0x40000015: return "STATUS_FATAL_APP_EXIT"; + case 0x40000016: return "STATUS_PREDEFINED_HANDLE"; + case 0x40000017: return "STATUS_WAS_UNLOCKED"; + case 0x40000018: return "STATUS_SERVICE_NOTIFICATION"; + case 0x40000019: return "STATUS_WAS_LOCKED"; + case 0x4000001A: return "STATUS_LOG_HARD_ERROR"; + case 0x4000001B: return "STATUS_ALREADY_WIN32"; + case 0x4000001C: return "STATUS_WX86_UNSIMULATE"; + case 0x4000001D: return "STATUS_WX86_CONTINUE"; + case 0x4000001E: return "STATUS_WX86_SINGLE_STEP"; + case 0x4000001F: return "STATUS_WX86_BREAKPOINT"; + case 0x40000020: return "STATUS_WX86_EXCEPTION_CONTINUE"; + case 0x40000021: return "STATUS_WX86_EXCEPTION_LASTCHANCE"; + case 0x40000022: return "STATUS_WX86_EXCEPTION_CHAIN"; + case 0x40000023: return "STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE"; + case 0x40000024: return "STATUS_NO_YIELD_PERFORMED"; + case 0x40000025: return "STATUS_TIMER_RESUME_IGNORED"; + case 0x40000026: return "STATUS_ARBITRATION_UNHANDLED"; + case 0x40000027: return "STATUS_CARDBUS_NOT_SUPPORTED"; + case 0x40000028: return "STATUS_WX86_CREATEWX86TIB"; + case 0x40000029: return "STATUS_MP_PROCESSOR_MISMATCH"; + case 0x40010001: return "DBG_REPLY_LATER"; + case 0x40010002: return "DBG_UNABLE_TO_PROVIDE_HANDLE"; + case 0x40010003: return "DBG_TERMINATE_THREAD"; + case 0x40010004: return "DBG_TERMINATE_PROCESS"; + case 0x40010005: return "DBG_CONTROL_C"; + case 0x40010006: return "DBG_PRINTEXCEPTION_C"; + case 0x40010007: return "DBG_RIPEXCEPTION"; + case 0x40010008: return "DBG_CONTROL_BREAK"; + case 0x80000001: return "STATUS_GUARD_PAGE_VIOLATION"; + case 0x80000002: return "STATUS_DATATYPE_MISALIGNMENT"; + case 0x80000003: return "STATUS_BREAKPOINT"; + case 0x80000004: return "STATUS_SINGLE_STEP"; + case 0x80000005: return "STATUS_BUFFER_OVERFLOW"; + case 0x80000006: return "STATUS_NO_MORE_FILES"; + case 0x80000007: return "STATUS_WAKE_SYSTEM_DEBUGGER"; + case 0x8000000A: return "STATUS_HANDLES_CLOSED"; + case 0x8000000B: return "STATUS_NO_INHERITANCE"; + case 0x8000000C: return "STATUS_GUID_SUBSTITUTION_MADE"; + case 0x8000000D: return "STATUS_PARTIAL_COPY"; + case 0x8000000E: return "STATUS_DEVICE_PAPER_EMPTY"; + case 0x8000000F: return "STATUS_DEVICE_POWERED_OFF"; + case 0x80000010: return "STATUS_DEVICE_OFF_LINE"; + case 0x80000011: return "STATUS_DEVICE_BUSY"; + case 0x80000012: return "STATUS_NO_MORE_EAS"; + case 0x80000013: return "STATUS_INVALID_EA_NAME"; + case 0x80000014: return "STATUS_EA_LIST_INCONSISTENT"; + case 0x80000015: return "STATUS_INVALID_EA_FLAG"; + case 0x80000016: return "STATUS_VERIFY_REQUIRED"; + case 0x80000017: return "STATUS_EXTRANEOUS_INFORMATION"; + case 0x80000018: return "STATUS_RXACT_COMMIT_NECESSARY"; + case 0x8000001A: return "STATUS_NO_MORE_ENTRIES"; + case 0x8000001B: return "STATUS_FILEMARK_DETECTED"; + case 0x8000001C: return "STATUS_MEDIA_CHANGED"; + case 0x8000001D: return "STATUS_BUS_RESET"; + case 0x8000001E: return "STATUS_END_OF_MEDIA"; + case 0x8000001F: return "STATUS_BEGINNING_OF_MEDIA"; + case 0x80000020: return "STATUS_MEDIA_CHECK"; + case 0x80000021: return "STATUS_SETMARK_DETECTED"; + case 0x80000022: return "STATUS_NO_DATA_DETECTED"; + case 0x80000023: return "STATUS_REDIRECTOR_HAS_OPEN_HANDLES"; + case 0x80000024: return "STATUS_SERVER_HAS_OPEN_HANDLES"; + case 0x80000025: return "STATUS_ALREADY_DISCONNECTED"; + case 0x80000026: return "STATUS_LONGJUMP"; + case 0x80010001: return "DBG_EXCEPTION_NOT_HANDLED"; + case 0xC0000001: return "STATUS_UNSUCCESSFUL"; + case 0xC0000002: return "STATUS_NOT_IMPLEMENTED"; + case 0xC0000003: return "STATUS_INVALID_INFO_CLASS"; + case 0xC0000004: return "STATUS_INFO_LENGTH_MISMATCH"; + case 0xC0000005: return "STATUS_ACCESS_VIOLATION"; + case 0xC0000006: return "STATUS_IN_PAGE_ERROR"; + case 0xC0000007: return "STATUS_PAGEFILE_QUOTA"; + case 0xC0000008: return "STATUS_INVALID_HANDLE"; + case 0xC0000009: return "STATUS_BAD_INITIAL_STACK"; + case 0xC000000A: return "STATUS_BAD_INITIAL_PC"; + case 0xC000000B: return "STATUS_INVALID_CID"; + case 0xC000000C: return "STATUS_TIMER_NOT_CANCELED"; + case 0xC000000D: return "STATUS_INVALID_PARAMETER"; + case 0xC000000E: return "STATUS_NO_SUCH_DEVICE"; + case 0xC000000F: return "STATUS_NO_SUCH_FILE"; + case 0xC0000010: return "STATUS_INVALID_DEVICE_REQUEST"; + case 0xC0000011: return "STATUS_END_OF_FILE"; + case 0xC0000012: return "STATUS_WRONG_VOLUME"; + case 0xC0000013: return "STATUS_NO_MEDIA_IN_DEVICE"; + case 0xC0000014: return "STATUS_UNRECOGNIZED_MEDIA"; + case 0xC0000015: return "STATUS_NONEXISTENT_SECTOR"; + case 0xC0000016: return "STATUS_MORE_PROCESSING_REQUIRED"; + case 0xC0000017: return "STATUS_NO_MEMORY"; + case 0xC0000018: return "STATUS_CONFLICTING_ADDRESSES"; + case 0xC0000019: return "STATUS_NOT_MAPPED_VIEW"; + case 0xC000001A: return "STATUS_UNABLE_TO_FREE_VM"; + case 0xC000001B: return "STATUS_UNABLE_TO_DELETE_SECTION"; + case 0xC000001C: return "STATUS_INVALID_SYSTEM_SERVICE"; + case 0xC000001D: return "STATUS_ILLEGAL_INSTRUCTION"; + case 0xC000001E: return "STATUS_INVALID_LOCK_SEQUENCE"; + case 0xC000001F: return "STATUS_INVALID_VIEW_SIZE"; + case 0xC0000020: return "STATUS_INVALID_FILE_FOR_SECTION"; + case 0xC0000021: return "STATUS_ALREADY_COMMITTED"; + case 0xC0000022: return "STATUS_ACCESS_DENIED"; + case 0xC0000023: return "STATUS_BUFFER_TOO_SMALL"; + case 0xC0000024: return "STATUS_OBJECT_TYPE_MISMATCH"; + case 0xC0000025: return "STATUS_NONCONTINUABLE_EXCEPTION"; + case 0xC0000026: return "STATUS_INVALID_DISPOSITION"; + case 0xC0000027: return "STATUS_UNWIND"; + case 0xC0000028: return "STATUS_BAD_STACK"; + case 0xC0000029: return "STATUS_INVALID_UNWIND_TARGET"; + case 0xC000002A: return "STATUS_NOT_LOCKED"; + case 0xC000002B: return "STATUS_PARITY_ERROR"; + case 0xC000002C: return "STATUS_UNABLE_TO_DECOMMIT_VM"; + case 0xC000002D: return "STATUS_NOT_COMMITTED"; + case 0xC000002E: return "STATUS_INVALID_PORT_ATTRIBUTES"; + case 0xC000002F: return "STATUS_PORT_MESSAGE_TOO_LONG"; + case 0xC0000030: return "STATUS_INVALID_PARAMETER_MIX"; + case 0xC0000031: return "STATUS_INVALID_QUOTA_LOWER"; + case 0xC0000032: return "STATUS_DISK_CORRUPT_ERROR"; + case 0xC0000033: return "STATUS_OBJECT_NAME_INVALID"; + case 0xC0000034: return "STATUS_OBJECT_NAME_NOT_FOUND"; + case 0xC0000035: return "STATUS_OBJECT_NAME_COLLISION"; + case 0xC0000037: return "STATUS_PORT_DISCONNECTED"; + case 0xC0000038: return "STATUS_DEVICE_ALREADY_ATTACHED"; + case 0xC0000039: return "STATUS_OBJECT_PATH_INVALID"; + case 0xC000003A: return "STATUS_OBJECT_PATH_NOT_FOUND"; + case 0xC000003B: return "STATUS_OBJECT_PATH_SYNTAX_BAD"; + case 0xC000003C: return "STATUS_DATA_OVERRUN"; + case 0xC000003D: return "STATUS_DATA_LATE_ERROR"; + case 0xC000003E: return "STATUS_DATA_ERROR"; + case 0xC000003F: return "STATUS_CRC_ERROR"; + case 0xC0000040: return "STATUS_SECTION_TOO_BIG"; + case 0xC0000041: return "STATUS_PORT_CONNECTION_REFUSED"; + case 0xC0000042: return "STATUS_INVALID_PORT_HANDLE"; + case 0xC0000043: return "STATUS_SHARING_VIOLATION"; + case 0xC0000044: return "STATUS_QUOTA_EXCEEDED"; + case 0xC0000045: return "STATUS_INVALID_PAGE_PROTECTION"; + case 0xC0000046: return "STATUS_MUTANT_NOT_OWNED"; + case 0xC0000047: return "STATUS_SEMAPHORE_LIMIT_EXCEEDED"; + case 0xC0000048: return "STATUS_PORT_ALREADY_SET"; + case 0xC0000049: return "STATUS_SECTION_NOT_IMAGE"; + case 0xC000004A: return "STATUS_SUSPEND_COUNT_EXCEEDED"; + case 0xC000004B: return "STATUS_THREAD_IS_TERMINATING"; + case 0xC000004C: return "STATUS_BAD_WORKING_SET_LIMIT"; + case 0xC000004D: return "STATUS_INCOMPATIBLE_FILE_MAP"; + case 0xC000004E: return "STATUS_SECTION_PROTECTION"; + case 0xC000004F: return "STATUS_EAS_NOT_SUPPORTED"; + case 0xC0000050: return "STATUS_EA_TOO_LARGE"; + case 0xC0000051: return "STATUS_NONEXISTENT_EA_ENTRY"; + case 0xC0000052: return "STATUS_NO_EAS_ON_FILE"; + case 0xC0000053: return "STATUS_EA_CORRUPT_ERROR"; + case 0xC0000054: return "STATUS_FILE_LOCK_CONFLICT"; + case 0xC0000055: return "STATUS_LOCK_NOT_GRANTED"; + case 0xC0000056: return "STATUS_DELETE_PENDING"; + case 0xC0000057: return "STATUS_CTL_FILE_NOT_SUPPORTED"; + case 0xC0000058: return "STATUS_UNKNOWN_REVISION"; + case 0xC0000059: return "STATUS_REVISION_MISMATCH"; + case 0xC000005A: return "STATUS_INVALID_OWNER"; + case 0xC000005B: return "STATUS_INVALID_PRIMARY_GROUP"; + case 0xC000005C: return "STATUS_NO_IMPERSONATION_TOKEN"; + case 0xC000005D: return "STATUS_CANT_DISABLE_MANDATORY"; + case 0xC000005E: return "STATUS_NO_LOGON_SERVERS"; + case 0xC000005F: return "STATUS_NO_SUCH_LOGON_SESSION"; + case 0xC0000060: return "STATUS_NO_SUCH_PRIVILEGE"; + case 0xC0000061: return "STATUS_PRIVILEGE_NOT_HELD"; + case 0xC0000062: return "STATUS_INVALID_ACCOUNT_NAME"; + case 0xC0000063: return "STATUS_USER_EXISTS"; + case 0xC0000064: return "STATUS_NO_SUCH_USER"; + case 0xC0000065: return "STATUS_GROUP_EXISTS"; + case 0xC0000066: return "STATUS_NO_SUCH_GROUP"; + case 0xC0000067: return "STATUS_MEMBER_IN_GROUP"; + case 0xC0000068: return "STATUS_MEMBER_NOT_IN_GROUP"; + case 0xC0000069: return "STATUS_LAST_ADMIN"; + case 0xC000006A: return "STATUS_WRONG_PASSWORD"; + case 0xC000006B: return "STATUS_ILL_FORMED_PASSWORD"; + case 0xC000006C: return "STATUS_PASSWORD_RESTRICTION"; + case 0xC000006D: return "STATUS_LOGON_FAILURE"; + case 0xC000006E: return "STATUS_ACCOUNT_RESTRICTION"; + case 0xC000006F: return "STATUS_INVALID_LOGON_HOURS"; + case 0xC0000070: return "STATUS_INVALID_WORKSTATION"; + case 0xC0000071: return "STATUS_PASSWORD_EXPIRED"; + case 0xC0000072: return "STATUS_ACCOUNT_DISABLED"; + case 0xC0000073: return "STATUS_NONE_MAPPED"; + case 0xC0000074: return "STATUS_TOO_MANY_LUIDS_REQUESTED"; + case 0xC0000075: return "STATUS_LUIDS_EXHAUSTED"; + case 0xC0000076: return "STATUS_INVALID_SUB_AUTHORITY"; + case 0xC0000077: return "STATUS_INVALID_ACL"; + case 0xC0000078: return "STATUS_INVALID_SID"; + case 0xC0000079: return "STATUS_INVALID_SECURITY_DESCR"; + case 0xC000007A: return "STATUS_PROCEDURE_NOT_FOUND"; + case 0xC000007B: return "STATUS_INVALID_IMAGE_FORMAT"; + case 0xC000007C: return "STATUS_NO_TOKEN"; + case 0xC000007D: return "STATUS_BAD_INHERITANCE_ACL"; + case 0xC000007E: return "STATUS_RANGE_NOT_LOCKED"; + case 0xC000007F: return "STATUS_DISK_FULL"; + case 0xC0000080: return "STATUS_SERVER_DISABLED"; + case 0xC0000081: return "STATUS_SERVER_NOT_DISABLED"; + case 0xC0000082: return "STATUS_TOO_MANY_GUIDS_REQUESTED"; + case 0xC0000083: return "STATUS_GUIDS_EXHAUSTED"; + case 0xC0000084: return "STATUS_INVALID_ID_AUTHORITY"; + case 0xC0000085: return "STATUS_AGENTS_EXHAUSTED"; + case 0xC0000086: return "STATUS_INVALID_VOLUME_LABEL"; + case 0xC0000087: return "STATUS_SECTION_NOT_EXTENDED"; + case 0xC0000088: return "STATUS_NOT_MAPPED_DATA"; + case 0xC0000089: return "STATUS_RESOURCE_DATA_NOT_FOUND"; + case 0xC000008A: return "STATUS_RESOURCE_TYPE_NOT_FOUND"; + case 0xC000008B: return "STATUS_RESOURCE_NAME_NOT_FOUND"; + case 0xC000008C: return "STATUS_ARRAY_BOUNDS_EXCEEDED"; + case 0xC000008D: return "STATUS_FLOAT_DENORMAL_OPERAND"; + case 0xC000008E: return "STATUS_FLOAT_DIVIDE_BY_ZERO"; + case 0xC000008F: return "STATUS_FLOAT_INEXACT_RESULT"; + case 0xC0000090: return "STATUS_FLOAT_INVALID_OPERATION"; + case 0xC0000091: return "STATUS_FLOAT_OVERFLOW"; + case 0xC0000092: return "STATUS_FLOAT_STACK_CHECK"; + case 0xC0000093: return "STATUS_FLOAT_UNDERFLOW"; + case 0xC0000094: return "STATUS_INTEGER_DIVIDE_BY_ZERO"; + case 0xC0000095: return "STATUS_INTEGER_OVERFLOW"; + case 0xC0000096: return "STATUS_PRIVILEGED_INSTRUCTION"; + case 0xC0000097: return "STATUS_TOO_MANY_PAGING_FILES"; + case 0xC0000098: return "STATUS_FILE_INVALID"; + case 0xC0000099: return "STATUS_ALLOTTED_SPACE_EXCEEDED"; + case 0xC000009A: return "STATUS_INSUFFICIENT_RESOURCES"; + case 0xC000009B: return "STATUS_DFS_EXIT_PATH_FOUND"; + case 0xC000009C: return "STATUS_DEVICE_DATA_ERROR"; + case 0xC000009D: return "STATUS_DEVICE_NOT_CONNECTED"; + case 0xC000009E: return "STATUS_DEVICE_POWER_FAILURE"; + case 0xC000009F: return "STATUS_FREE_VM_NOT_AT_BASE"; + case 0xC00000A0: return "STATUS_MEMORY_NOT_ALLOCATED"; + case 0xC00000A1: return "STATUS_WORKING_SET_QUOTA"; + case 0xC00000A2: return "STATUS_MEDIA_WRITE_PROTECTED"; + case 0xC00000A3: return "STATUS_DEVICE_NOT_READY"; + case 0xC00000A4: return "STATUS_INVALID_GROUP_ATTRIBUTES"; + case 0xC00000A5: return "STATUS_BAD_IMPERSONATION_LEVEL"; + case 0xC00000A6: return "STATUS_CANT_OPEN_ANONYMOUS"; + case 0xC00000A7: return "STATUS_BAD_VALIDATION_CLASS"; + case 0xC00000A8: return "STATUS_BAD_TOKEN_TYPE"; + case 0xC00000A9: return "STATUS_BAD_MASTER_BOOT_RECORD"; + case 0xC00000AA: return "STATUS_INSTRUCTION_MISALIGNMENT"; + case 0xC00000AB: return "STATUS_INSTANCE_NOT_AVAILABLE"; + case 0xC00000AC: return "STATUS_PIPE_NOT_AVAILABLE"; + case 0xC00000AD: return "STATUS_INVALID_PIPE_STATE"; + case 0xC00000AE: return "STATUS_PIPE_BUSY"; + case 0xC00000AF: return "STATUS_ILLEGAL_FUNCTION"; + case 0xC00000B0: return "STATUS_PIPE_DISCONNECTED"; + case 0xC00000B1: return "STATUS_PIPE_CLOSING"; + case 0xC00000B2: return "STATUS_PIPE_CONNECTED"; + case 0xC00000B3: return "STATUS_PIPE_LISTENING"; + case 0xC00000B4: return "STATUS_INVALID_READ_MODE"; + case 0xC00000B5: return "STATUS_IO_TIMEOUT"; + case 0xC00000B6: return "STATUS_FILE_FORCED_CLOSED"; + case 0xC00000B7: return "STATUS_PROFILING_NOT_STARTED"; + case 0xC00000B8: return "STATUS_PROFILING_NOT_STOPPED"; + case 0xC00000B9: return "STATUS_COULD_NOT_INTERPRET"; + case 0xC00000BA: return "STATUS_FILE_IS_A_DIRECTORY"; + case 0xC00000BB: return "STATUS_NOT_SUPPORTED"; + case 0xC00000BC: return "STATUS_REMOTE_NOT_LISTENING"; + case 0xC00000BD: return "STATUS_DUPLICATE_NAME"; + case 0xC00000BE: return "STATUS_BAD_NETWORK_PATH"; + case 0xC00000BF: return "STATUS_NETWORK_BUSY"; + case 0xC00000C0: return "STATUS_DEVICE_DOES_NOT_EXIST"; + case 0xC00000C1: return "STATUS_TOO_MANY_COMMANDS"; + case 0xC00000C2: return "STATUS_ADAPTER_HARDWARE_ERROR"; + case 0xC00000C3: return "STATUS_INVALID_NETWORK_RESPONSE"; + case 0xC00000C4: return "STATUS_UNEXPECTED_NETWORK_ERROR"; + case 0xC00000C5: return "STATUS_BAD_REMOTE_ADAPTER"; + case 0xC00000C6: return "STATUS_PRINT_QUEUE_FULL"; + case 0xC00000C7: return "STATUS_NO_SPOOL_SPACE"; + case 0xC00000C8: return "STATUS_PRINT_CANCELLED"; + case 0xC00000C9: return "STATUS_NETWORK_NAME_DELETED"; + case 0xC00000CA: return "STATUS_NETWORK_ACCESS_DENIED"; + case 0xC00000CB: return "STATUS_BAD_DEVICE_TYPE"; + case 0xC00000CC: return "STATUS_BAD_NETWORK_NAME"; + case 0xC00000CD: return "STATUS_TOO_MANY_NAMES"; + case 0xC00000CE: return "STATUS_TOO_MANY_SESSIONS"; + case 0xC00000CF: return "STATUS_SHARING_PAUSED"; + case 0xC00000D0: return "STATUS_REQUEST_NOT_ACCEPTED"; + case 0xC00000D1: return "STATUS_REDIRECTOR_PAUSED"; + case 0xC00000D2: return "STATUS_NET_WRITE_FAULT"; + case 0xC00000D3: return "STATUS_PROFILING_AT_LIMIT"; + case 0xC00000D4: return "STATUS_NOT_SAME_DEVICE"; + case 0xC00000D5: return "STATUS_FILE_RENAMED"; + case 0xC00000D6: return "STATUS_VIRTUAL_CIRCUIT_CLOSED"; + case 0xC00000D7: return "STATUS_NO_SECURITY_ON_OBJECT"; + case 0xC00000D8: return "STATUS_CANT_WAIT"; + case 0xC00000D9: return "STATUS_PIPE_EMPTY"; + case 0xC00000DA: return "STATUS_CANT_ACCESS_DOMAIN_INFO"; + case 0xC00000DB: return "STATUS_CANT_TERMINATE_SELF"; + case 0xC00000DC: return "STATUS_INVALID_SERVER_STATE"; + case 0xC00000DD: return "STATUS_INVALID_DOMAIN_STATE"; + case 0xC00000DE: return "STATUS_INVALID_DOMAIN_ROLE"; + case 0xC00000DF: return "STATUS_NO_SUCH_DOMAIN"; + case 0xC00000E0: return "STATUS_DOMAIN_EXISTS"; + case 0xC00000E1: return "STATUS_DOMAIN_LIMIT_EXCEEDED"; + case 0xC00000E2: return "STATUS_OPLOCK_NOT_GRANTED"; + case 0xC00000E3: return "STATUS_INVALID_OPLOCK_PROTOCOL"; + case 0xC00000E4: return "STATUS_INTERNAL_DB_CORRUPTION"; + case 0xC00000E5: return "STATUS_INTERNAL_ERROR"; + case 0xC00000E6: return "STATUS_GENERIC_NOT_MAPPED"; + case 0xC00000E7: return "STATUS_BAD_DESCRIPTOR_FORMAT"; + case 0xC00000E8: return "STATUS_INVALID_USER_BUFFER"; + case 0xC00000E9: return "STATUS_UNEXPECTED_IO_ERROR"; + case 0xC00000EA: return "STATUS_UNEXPECTED_MM_CREATE_ERR"; + case 0xC00000EB: return "STATUS_UNEXPECTED_MM_MAP_ERROR"; + case 0xC00000EC: return "STATUS_UNEXPECTED_MM_EXTEND_ERR"; + case 0xC00000ED: return "STATUS_NOT_LOGON_PROCESS"; + case 0xC00000EE: return "STATUS_LOGON_SESSION_EXISTS"; + case 0xC00000EF: return "STATUS_INVALID_PARAMETER_1"; + case 0xC00000F0: return "STATUS_INVALID_PARAMETER_2"; + case 0xC00000F1: return "STATUS_INVALID_PARAMETER_3"; + case 0xC00000F2: return "STATUS_INVALID_PARAMETER_4"; + case 0xC00000F3: return "STATUS_INVALID_PARAMETER_5"; + case 0xC00000F4: return "STATUS_INVALID_PARAMETER_6"; + case 0xC00000F5: return "STATUS_INVALID_PARAMETER_7"; + case 0xC00000F6: return "STATUS_INVALID_PARAMETER_8"; + case 0xC00000F7: return "STATUS_INVALID_PARAMETER_9"; + case 0xC00000F8: return "STATUS_INVALID_PARAMETER_10"; + case 0xC00000F9: return "STATUS_INVALID_PARAMETER_11"; + case 0xC00000FA: return "STATUS_INVALID_PARAMETER_12"; + case 0xC00000FB: return "STATUS_REDIRECTOR_NOT_STARTED"; + case 0xC00000FC: return "STATUS_REDIRECTOR_STARTED"; + case 0xC00000FD: return "STATUS_STACK_OVERFLOW"; + case 0xC00000FE: return "STATUS_NO_SUCH_PACKAGE"; + case 0xC00000FF: return "STATUS_BAD_FUNCTION_TABLE"; + case 0xC0000100: return "STATUS_VARIABLE_NOT_FOUND"; + case 0xC0000101: return "STATUS_DIRECTORY_NOT_EMPTY"; + case 0xC0000102: return "STATUS_FILE_CORRUPT_ERROR"; + case 0xC0000103: return "STATUS_NOT_A_DIRECTORY"; + case 0xC0000104: return "STATUS_BAD_LOGON_SESSION_STATE"; + case 0xC0000105: return "STATUS_LOGON_SESSION_COLLISION"; + case 0xC0000106: return "STATUS_NAME_TOO_LONG"; + case 0xC0000107: return "STATUS_FILES_OPEN"; + case 0xC0000108: return "STATUS_CONNECTION_IN_USE"; + case 0xC0000109: return "STATUS_MESSAGE_NOT_FOUND"; + case 0xC000010A: return "STATUS_PROCESS_IS_TERMINATING"; + case 0xC000010B: return "STATUS_INVALID_LOGON_TYPE"; + case 0xC000010C: return "STATUS_NO_GUID_TRANSLATION"; + case 0xC000010D: return "STATUS_CANNOT_IMPERSONATE"; + case 0xC000010E: return "STATUS_IMAGE_ALREADY_LOADED"; + case 0xC000010F: return "STATUS_ABIOS_NOT_PRESENT"; + case 0xC0000110: return "STATUS_ABIOS_LID_NOT_EXIST"; + case 0xC0000111: return "STATUS_ABIOS_LID_ALREADY_OWNED"; + case 0xC0000112: return "STATUS_ABIOS_NOT_LID_OWNER"; [truncated at 1000 lines; 5088 more skipped]

19 years, 10 months

[arty] 13009: ext2 import by filip navara with minor editing by arty.

by arty＠svn.reactos.com

ext2 import by filip navara with minor editing by arty. Deleted: branches/ext2/reactos/drivers/fs/ext2/attr.c Deleted: branches/ext2/reactos/drivers/fs/ext2/blockdev.c Deleted: branches/ext2/reactos/drivers/fs/ext2/dir.c Deleted: branches/ext2/reactos/drivers/fs/ext2/ext2fs.h Deleted: branches/ext2/reactos/drivers/fs/ext2/file.c Added: branches/ext2/reactos/drivers/fs/ext2/inc/ Added: branches/ext2/reactos/drivers/fs/ext2/inc/errmsg.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/ext2_fs.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/ext2fsd.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/ext2metadata.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/protos.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/resource.h Added: branches/ext2/reactos/drivers/fs/ext2/inc/struct.h Deleted: branches/ext2/reactos/drivers/fs/ext2/inode.c Modified: branches/ext2/reactos/drivers/fs/ext2/makefile Deleted: branches/ext2/reactos/drivers/fs/ext2/quota.c Deleted: branches/ext2/reactos/drivers/fs/ext2/rw.c Deleted: branches/ext2/reactos/drivers/fs/ext2/security.c Added: branches/ext2/reactos/drivers/fs/ext2/src/ Added: branches/ext2/reactos/drivers/fs/ext2/src/.cvsignore Added: branches/ext2/reactos/drivers/fs/ext2/src/DiskIO.c Added: branches/ext2/reactos/drivers/fs/ext2/src/cleanup.c Added: branches/ext2/reactos/drivers/fs/ext2/src/close.c Added: branches/ext2/reactos/drivers/fs/ext2/src/create.c Added: branches/ext2/reactos/drivers/fs/ext2/src/devcntrl.c Added: branches/ext2/reactos/drivers/fs/ext2/src/dircntrl.c Added: branches/ext2/reactos/drivers/fs/ext2/src/ext2.rc Added: branches/ext2/reactos/drivers/fs/ext2/src/ext2init.c Added: branches/ext2/reactos/drivers/fs/ext2/src/fastio.c Added: branches/ext2/reactos/drivers/fs/ext2/src/fileinfo.c Added: branches/ext2/reactos/drivers/fs/ext2/src/flush.c Added: branches/ext2/reactos/drivers/fs/ext2/src/fsctrl.c Added: branches/ext2/reactos/drivers/fs/ext2/src/io.c Added: branches/ext2/reactos/drivers/fs/ext2/src/metadata.c Added: branches/ext2/reactos/drivers/fs/ext2/src/misc.c Added: branches/ext2/reactos/drivers/fs/ext2/src/read.c Added: branches/ext2/reactos/drivers/fs/ext2/src/shutdown.c Added: branches/ext2/reactos/drivers/fs/ext2/src/volinfo.c Added: branches/ext2/reactos/drivers/fs/ext2/src/write.c Deleted: branches/ext2/reactos/drivers/fs/ext2/super.c _____ Deleted: branches/ext2/reactos/drivers/fs/ext2/attr.c --- branches/ext2/reactos/drivers/fs/ext2/attr.c 2005-01-13 01:21:47 UTC (rev 13008) +++ branches/ext2/reactos/drivers/fs/ext2/attr.c 2005-01-13 01:51:33 UTC (rev 13009) @@ -1,136 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/ext2/attr.c - * PURPOSE: Set/Get file attributes support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> -#include <wchar.h> -#include <string.h> - -//#define NDEBUG -#include <debug.h> - -#include "ext2fs.h" - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS STDCALL -Ext2SetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - DPRINT("Ext2SetInformation(DeviceObject %x Irp %x)\n",DeviceObject,Irp); - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(STATUS_UNSUCCESSFUL); -} - -NTSTATUS STDCALL -Ext2QueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - NTSTATUS Status; - PIO_STACK_LOCATION Param; - PFILE_OBJECT FileObject; - PDEVICE_EXTENSION DeviceExt; - ULONG Length; - PFILE_BASIC_INFORMATION PFileBasicInformation; - PFILE_STANDARD_INFORMATION PFileStandardInformation; - PFILE_INTERNAL_INFORMATION PFileInternalInformation; - PFILE_EA_INFORMATION PFileEaInformation; - PFILE_ACCESS_INFORMATION PFileAccessInformation; - PFILE_NAME_INFORMATION PFileNameInformation; - PFILE_POSITION_INFORMATION PFilePositionInformation; - PVOID Buffer; - - DPRINT("Ext2QueryInformation(DeviceObject %x Irp %x)\n", DeviceObject, Irp); - - Param = IoGetCurrentIrpStackLocation(Irp); - FileObject = Param->FileObject; - DeviceExt = DeviceObject->DeviceExtension; - Length = Param->Parameters.QueryFile.Length; - Buffer = Irp->AssociatedIrp.SystemBuffer; - - switch (Param->Parameters.QueryFile.FileInformationClass) - { - case FileDirectoryInformation: - case FileFullDirectoryInformation: - case FileBothDirectoryInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case FileBasicInformation: - PFileBasicInformation = (PFILE_BASIC_INFORMATION)Buffer; - memset(PFileBasicInformation, 0, sizeof(FILE_BASIC_INFORMATION)); - Status = STATUS_SUCCESS; - break; - - case FileStandardInformation: - PFileStandardInformation = (PFILE_STANDARD_INFORMATION)Buffer; - memset(PFileStandardInformation, 0, sizeof(FILE_STANDARD_INFORMATION)); - Status = STATUS_SUCCESS; - break; - - case FileInternalInformation: - PFileInternalInformation = (PFILE_INTERNAL_INFORMATION)Buffer; - memset(PFileInternalInformation, 0, sizeof(FILE_INTERNAL_INFORMATION)); - Status = STATUS_SUCCESS; - break; - - case FileEaInformation: - PFileEaInformation = (PFILE_EA_INFORMATION)Buffer; - memset(PFileEaInformation, 0, sizeof(FILE_EA_INFORMATION)); - PFileEaInformation->EaSize = 0; - Status = STATUS_SUCCESS; - break; - - case FileAccessInformation: - PFileAccessInformation = (PFILE_ACCESS_INFORMATION)Buffer; - memset(PFileAccessInformation, 0, sizeof(FILE_ACCESS_INFORMATION)); - PFileAccessInformation->AccessFlags = 0; - Status = STATUS_SUCCESS; - break; - - case FileNameInformation: - PFileNameInformation = (PFILE_NAME_INFORMATION)Buffer; - memset(PFileNameInformation, 0, sizeof(FILE_NAME_INFORMATION)); - Status = STATUS_SUCCESS; - break; - - case FilePositionInformation: - PFilePositionInformation = (PFILE_POSITION_INFORMATION)Buffer; - memcpy(PFilePositionInformation, - &FileObject->CurrentByteOffset, - sizeof(FileObject->CurrentByteOffset)); - Status = STATUS_SUCCESS; - break; - - case FileRenameInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - Status = STATUS_NOT_SUPPORTED; - } - - - - - Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) - Irp->IoStatus.Information = - Param->Parameters.QueryFile.Length - Length; - else - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(Status); -} _____ Deleted: branches/ext2/reactos/drivers/fs/ext2/blockdev.c --- branches/ext2/reactos/drivers/fs/ext2/blockdev.c 2005-01-13 01:21:47 UTC (rev 13008) +++ branches/ext2/reactos/drivers/fs/ext2/blockdev.c 2005-01-13 01:51:33 UTC (rev 13009) @@ -1,155 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/ext2/blockdev.c - * PURPOSE: Temporary sector reading support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> - -//#define NDEBUG -#include <debug.h> - -#include "ext2fs.h" - -/* FUNCTIONS ***************************************************************/ - -BOOLEAN -Ext2ReadSectors(IN PDEVICE_OBJECT pDeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN PVOID Buffer) -{ - LARGE_INTEGER sectorNumber; - PIRP irp; - IO_STATUS_BLOCK ioStatus; - KEVENT event; - NTSTATUS status; - ULONG sectorSize; - int j; - - DPRINT("VFATReadSector(pDeviceObject %x, DiskSector %d, Buffer %x)\n", - pDeviceObject,DiskSector,Buffer); - - sectorNumber.u.HighPart = 0; - sectorNumber.u.LowPart = DiskSector * BLOCKSIZE; - - DPRINT("DiskSector:%ld BLKSZ:%ld sectorNumber:%ld:%ld\n", - (unsigned long) DiskSector, - (unsigned long) BLOCKSIZE, - (unsigned long) sectorNumber.u.HighPart, - (unsigned long) sectorNumber.u.LowPart); - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - sectorSize = BLOCKSIZE*SectorCount; - - - DPRINT("Building synchronous FSD Request...\n"); - irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - pDeviceObject, - Buffer, - sectorSize, - &sectorNumber, - &event, - &ioStatus ); - - if (!irp) - { - DbgPrint("READ failed!!!\n"); - return FALSE; - } - - DPRINT("Calling IO Driver...\n"); - status = IoCallDriver(pDeviceObject, irp); - - DPRINT("Waiting for IO Operation...\n"); - if (status == STATUS_PENDING) - { - KeWaitForSingleObject(&event, - Suspended, - KernelMode, - FALSE, - NULL); - DPRINT("Getting IO Status...\n"); - status = ioStatus.Status; - } - - if (!NT_SUCCESS(status)) - { - DbgPrint("IO failed!!! Error code: %d(%x)\n", status, status); - return FALSE; - } - - return TRUE; -} - -BOOLEAN VFATWriteSectors(IN PDEVICE_OBJECT pDeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN UCHAR* Buffer) -{ - LARGE_INTEGER sectorNumber; - PIRP irp; - IO_STATUS_BLOCK ioStatus; - KEVENT event; - NTSTATUS status; - ULONG sectorSize; - PULONG mbr; - int j; - - DPRINT("VFATWriteSector(pDeviceObject %x, DiskSector %d, Buffer %x)\n", - pDeviceObject,DiskSector,Buffer); - - sectorNumber.u.HighPart = 0; - sectorNumber.u.LowPart = DiskSector * BLOCKSIZE; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - sectorSize = BLOCKSIZE*SectorCount; - - - DPRINT("Building synchronous FSD Request...\n"); - irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE, - pDeviceObject, - Buffer, - sectorSize, - &sectorNumber, - &event, - &ioStatus ); - - if (!irp) { - DbgPrint("WRITE failed!!!\n"); - return FALSE; - } - - DPRINT("Calling IO Driver...\n"); - status = IoCallDriver(pDeviceObject, - irp); - - DPRINT("Waiting for IO Operation...\n"); - if (status == STATUS_PENDING) { - KeWaitForSingleObject(&event, - Suspended, - KernelMode, - FALSE, - NULL); - DPRINT("Getting IO Status...\n"); - status = ioStatus.Status; - } - - if (!NT_SUCCESS(status)) { - DbgPrint("IO failed!!! Error code: %d(%x)\n", status, status); - return FALSE; - } - - - ExFreePool(mbr); - DPRINT("Block request succeeded\n"); - return TRUE; -} - _____ Deleted: branches/ext2/reactos/drivers/fs/ext2/dir.c --- branches/ext2/reactos/drivers/fs/ext2/dir.c 2005-01-13 01:21:47 UTC (rev 13008) +++ branches/ext2/reactos/drivers/fs/ext2/dir.c 2005-01-13 01:51:33 UTC (rev 13009) @@ -1,338 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/ext2/dir.c - * PURPOSE: ext2 filesystem - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> -#include <wchar.h> -#include <string.h> - -//#define NDEBUG -#include <debug.h> - -#include "ext2fs.h" - -/* FUNCTIONS *****************************************************************/ - - -static VOID Ext2ConvertName(PWSTR Out, PCH In, ULONG Len) -{ - ULONG i; - - for (i=0; i<Len; i++) - { - *Out = *In; - Out++; - In++; - } - *Out = 0; -} - -PVOID Ext2ProcessDirEntry(PDEVICE_EXTENSION DeviceExt, - struct ext2_dir_entry* dir_entry, - PIO_STACK_LOCATION IoStack, - PVOID Buffer, - ULONG FileIndex) -{ - PFILE_DIRECTORY_INFORMATION FDI; - PFILE_NAMES_INFORMATION FNI; - PFILE_BOTH_DIRECTORY_INFORMATION FBI; - struct ext2_inode inode; - - DPRINT("FileIndex %d\n",FileIndex); - DPRINT("Buffer %x\n",Buffer); - - Ext2ReadInode(DeviceExt, - dir_entry->inode, - &inode); - - switch (IoStack->Parameters.QueryDirectory.FileInformationClass) - { - case FileNamesInformation: - FNI = (PFILE_NAMES_INFORMATION)Buffer; - FNI->NextEntryOffset = sizeof(FileDirectoryInformation) + - dir_entry->name_len + 1; - FNI->FileNameLength = dir_entry->name_len; - Ext2ConvertName(FNI->FileName, dir_entry->name, dir_entry->name_len); - Buffer = Buffer + FNI->NextEntryOffset; - break; - - case FileDirectoryInformation: - FDI = (PFILE_DIRECTORY_INFORMATION)Buffer; - FDI->NextEntryOffset = sizeof(FileDirectoryInformation) + - dir_entry->name_len + 1; - FDI->FileIndex = FileIndex; -// FDI->CreationTime = 0; -// FDI->LastAccessTime = 0; -// FDI->LastWriteTime = 0; -// FDI->ChangeTime = 0; - FDI->AllocationSize.QuadPart = FDI->EndOfFile.QuadPart = inode.i_size; - FDI->FileAttributes = 0; - FDI->FileNameLength = dir_entry->name_len; - Ext2ConvertName(FDI->FileName, dir_entry->name, dir_entry->name_len); - Buffer = Buffer + FDI->NextEntryOffset; - break; - - case FileBothDirectoryInformation: - FBI = (PFILE_BOTH_DIRECTORY_INFORMATION)Buffer; - FBI->NextEntryOffset = sizeof(FileBothDirectoryInformation) + - dir_entry->name_len + 1; - FBI->FileIndex = FileIndex; - FBI->AllocationSize.QuadPart = FBI->EndOfFile.QuadPart = inode.i_size; - FBI->FileAttributes = 0; - FBI->FileNameLength = dir_entry->name_len; - Ext2ConvertName(FBI->FileName, dir_entry->name, dir_entry->name_len); - memset(FBI->ShortName, 0, sizeof(FBI->ShortName)); - Buffer = Buffer + FBI->NextEntryOffset; - break; - - default: - UNIMPLEMENTED; - } - return(Buffer); -} - - -NTSTATUS Ext2QueryDirectory(PDEVICE_EXTENSION DeviceExt, - PEXT2_FCB Fcb, - PIRP Irp, - PIO_STACK_LOCATION IoStack) -{ - ULONG Max; - ULONG i; - ULONG StartIndex; - PVOID Buffer = NULL; - struct ext2_dir_entry dir_entry; - - Buffer = Irp->UserBuffer; - DPRINT("Buffer %x\n",Buffer); - DPRINT("IoStack->Flags %x\n",IoStack->Flags); - - if (IoStack->Flags & SL_RETURN_SINGLE_ENTRY) - { - Max = 1; - } - else - { - UNIMPLEMENTED; - } - - DPRINT("Buffer->FileIndex %d\n", - ((PFILE_DIRECTORY_INFORMATION)Buffer)->FileIndex); - if (IoStack->Flags & SL_INDEX_SPECIFIED) - { - StartIndex = ((PFILE_DIRECTORY_INFORMATION)Buffer)->FileIndex; - } - else - { - StartIndex = 0; - } - - if (IoStack->Flags & SL_RESTART_SCAN) - { - StartIndex = 0; - } - - DPRINT("StartIndex %d\n",StartIndex); - - for (i=0; i<Max ;i++) - { - if (!Ext2ScanDir(DeviceExt,&Fcb->inode,"*",&dir_entry,&StartIndex)) - { - ((PFILE_DIRECTORY_INFORMATION)Buffer)->NextEntryOffset = 0; - return(STATUS_NO_MORE_FILES); - } - Buffer = Ext2ProcessDirEntry(DeviceExt, - &dir_entry, - IoStack, - Buffer, - StartIndex); - } - return(STATUS_SUCCESS); -} - -NTSTATUS STDCALL -Ext2DirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - PFILE_OBJECT FileObject = Stack->FileObject; - PEXT2_FCB Fcb = (PVOID)FileObject->FsContext; - NTSTATUS Status; - PDEVICE_EXTENSION DeviceExt; - - DPRINT("Ext2DirectoryControl(DeviceObject %x, Irp %x)\n",DeviceObject,Irp); - - DeviceExt = DeviceObject->DeviceExtension; - - switch (Stack->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - Status = Ext2QueryDirectory(DeviceExt, Fcb, Irp, Stack); - break; - - default: - Status = STATUS_UNSUCCESSFUL; - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); -} - -BOOL Ext2ScanDir(PDEVICE_EXTENSION DeviceExt, - struct ext2_inode* dir, - PCH filename, - struct ext2_dir_entry* ret, - PULONG StartIndex) -{ - ULONG i; - char* buffer; - ULONG offset; - char name[255]; - struct ext2_dir_entry* current; - ULONG block; - BOOL b; - - DPRINT("Ext2ScanDir(dir %x, filename %s, ret %x)\n",dir,filename,ret); - - buffer = ExAllocatePool(NonPagedPool, BLOCKSIZE); - - for (i=0; i<((*StartIndex)/BLOCKSIZE); i++); - for (; (block = Ext2BlockMap(DeviceExt, dir, i)) != 0; i++) - { - DPRINT("block %d\n",block); - b = Ext2ReadSectors(DeviceExt->StorageDevice, - block, - 1, - buffer); - if (!b) - { - DbgPrint("ext2fs:%s:%d: Disk io failed\n", __FILE__, __LINE__); - return(FALSE); - } - - offset = (*StartIndex)%BLOCKSIZE; - while (offset < BLOCKSIZE) - { - current = &buffer[offset]; - - strncpy(name,current->name,current->name_len); - name[current->name_len]=0; - - DPRINT("Scanning offset %d inode %d name %s\n", - offset,current->inode,name); - - DPRINT("Comparing %s %s\n",name,filename); - if (strcmp(name,filename)==0 || strcmp(filename,"*")==0) - { - DPRINT("Match found\n"); - *StartIndex = (i*BLOCKSIZE) + offset + current->rec_len; - memcpy(ret,current,sizeof(struct ext2_dir_entry)); - ExFreePool(buffer); - return(TRUE); - } - - offset = offset + current->rec_len; - ASSERT(current->rec_len != 0); - DPRINT("offset %d\n",offset); - } - DPRINT("Onto next block\n"); - } - DPRINT("No match\n"); - ExFreePool(buffer); - return(FALSE); -} - -void unicode_to_ansi(PCH StringA, PWSTR StringW) -{ - while((*StringW)!=0) - { - *StringA = *StringW; - StringA++; - StringW++; - } - *StringA = 0; -} - -NTSTATUS Ext2OpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PWSTR FileName) -/* - * FUNCTION: Opens a file - */ -{ - EXT2_INODE parent_inode; - struct ext2_dir_entry entry; - char name[255]; - ULONG current_inode = 2; - char* current_segment; - PEXT2_FCB Fcb; - ULONG StartIndex = 0; - - DPRINT("Ext2OpenFile(DeviceExt %x, FileObject %x, FileName %S)\n", - DeviceExt,FileObject,FileName); - - Fcb = ExAllocatePool(NonPagedPool, sizeof(EXT2_FCB)); - - unicode_to_ansi(name,FileName); - DPRINT("name %s\n",name); - DPRINT("strtok %x\n",strtok); - current_segment = strtok(name,"\\"); - DPRINT("current_segment %x\n", current_segment); - while (current_segment!=NULL) - { - Ext2LoadInode(DeviceExt, - current_inode, - &parent_inode); - if (!Ext2ScanDir(DeviceExt, - parent_inode.inode, - current_segment, - &entry, - &StartIndex)) - { - Ext2ReleaseInode(DeviceExt, - &parent_inode); - ExFreePool(Fcb); - return(STATUS_UNSUCCESSFUL); - } - current_inode = entry.inode; - current_segment = strtok(NULL,"\\"); - StartIndex = 0; - Ext2ReleaseInode(DeviceExt, - &parent_inode); - } - DPRINT("Found file\n"); - - Fcb->inode = current_inode; - CcRosInitializeFileCache(FileObject, &Fcb->Bcb, PAGE_SIZE*3); - FileObject->FsContext = Fcb; - - return(STATUS_SUCCESS); -} - -NTSTATUS STDCALL -Ext2Create(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); - PFILE_OBJECT FileObject = Stack->FileObject; - NTSTATUS Status; - PDEVICE_EXTENSION DeviceExt; - - DPRINT("Ext2Create(DeviceObject %x, Irp %x)\n",DeviceObject,Irp); - - DeviceExt = DeviceObject->DeviceExtension; - Status = Ext2OpenFile(DeviceExt,FileObject,FileObject->FileName.Buffer); - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); -} _____ Deleted: branches/ext2/reactos/drivers/fs/ext2/ext2fs.h --- branches/ext2/reactos/drivers/fs/ext2/ext2fs.h 2005-01-13 01:21:47 UTC (rev 13008) +++ branches/ext2/reactos/drivers/fs/ext2/ext2fs.h 2005-01-13 01:51:33 UTC (rev 13009) @@ -1,289 +0,0 @@ -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> - -BOOLEAN Ext2ReadSectors(IN PDEVICE_OBJECT pDeviceObject, - IN ULONG DiskSector, - IN ULONG SectorCount, - IN PVOID Buffer); - -#define BLOCKSIZE (1024) - -struct ext2_super_block { - ULONG s_inodes_count; /* Inodes count */ - ULONG s_blocks_count; /* Blocks count */ - ULONG s_r_blocks_count; /* Reserved blocks count */ - ULONG s_free_blocks_count; /* Free blocks count */ - ULONG s_free_inodes_count; /* Free inodes count */ - ULONG s_first_data_block; /* First Data Block */ - ULONG s_log_block_size; /* Block size */ - LONG s_log_frag_size; /* Fragment size */ - ULONG s_blocks_per_group; /* # Blocks per group */ - ULONG s_frags_per_group; /* # Fragments per group */ - ULONG s_inodes_per_group; /* # Inodes per group */ - ULONG s_mtime; /* Mount time */ - ULONG s_wtime; /* Write time */ - USHORT s_mnt_count; /* Mount count */ - SHORT s_max_mnt_count; /* Maximal mount count */ - USHORT s_magic; /* Magic signature */ - USHORT s_state; /* File system state */ - USHORT s_errors; /* Behaviour when detecting errors */ - USHORT s_minor_rev_level; /* minor revision level */ - ULONG s_lastcheck; /* time of last check */ - ULONG s_checkinterval; /* max. time between checks */ - ULONG s_creator_os; /* OS */ - ULONG s_rev_level; /* Revision level */ - USHORT s_def_resuid; /* Default uid for reserved blocks */ - USHORT s_def_resgid; /* Default gid for reserved blocks */ - /* - * These fields are for EXT2_DYNAMIC_REV superblocks only. - * - * Note: the difference between the compatible feature set and - * the incompatible feature set is that if there is a bit set - * in the incompatible feature set that the kernel doesn't - * know about, it should refuse to mount the filesystem. - * - * e2fsck's requirements are more strict; if it doesn't know - * about a feature in either the compatible or incompatible - * feature set, it must abort and not try to meddle with - * things it doesn't understand... - */ - ULONG s_first_ino; /* First non-reserved inode */ - USHORT s_inode_size; /* size of inode structure */ - USHORT s_block_group_nr; /* block group # of this superblock */ - ULONG s_feature_compat; /* compatible feature set */ - ULONG s_feature_incompat; /* incompatible feature set */ - ULONG s_feature_ro_compat; /* readonly-compatible feature set */ - ULONG s_reserved[230]; /* Padding to the end of the block */ -}; - -/* - * Codes for operating systems - */ -#define EXT2_OS_LINUX 0 -#define EXT2_OS_HURD 1 -#define EXT2_OS_MASIX 2 -#define EXT2_OS_FREEBSD 3 -#define EXT2_OS_LITES 4 - -/* - * Revision levels - */ -#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ -#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ - -#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV -#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV - -/* - * The second extended file system magic number - */ -#define EXT2_SUPER_MAGIC 0xEF53 - -/* - * Constants relative to the data blocks - */ -#define EXT2_NDIR_BLOCKS 12 -#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS -#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) -#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) -#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - - -/* - * Structure of an inode on the disk - */ -struct ext2_inode { - USHORT i_mode; /* File mode */ - USHORT i_uid; /* Owner Uid */ - ULONG i_size; /* Size in bytes */ - ULONG i_atime; /* Access time */ - ULONG i_ctime; /* Creation time */ - ULONG i_mtime; /* Modification time */ - ULONG i_dtime; /* Deletion Time */ - USHORT i_gid; /* Group Id */ - USHORT i_links_count; /* Links count */ - ULONG i_blocks; /* Blocks count */ - ULONG i_flags; /* File flags */ - union { - struct { - ULONG l_i_reserved1; - } linux1; - struct { - ULONG h_i_translator; - } hurd1; - struct { - ULONG m_i_reserved1; - } masix1; - } osd1; /* OS dependent 1 */ - ULONG i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ - ULONG i_version; /* File version (for NFS) */ - ULONG i_file_acl; /* File ACL */ - ULONG i_dir_acl; /* Directory ACL */ - ULONG i_faddr; /* Fragment address */ - union { - struct { - UCHAR l_i_frag; /* Fragment number */ - UCHAR l_i_fsize; /* Fragment size */ - USHORT i_pad1; - ULONG l_i_reserved2[2]; - } linux2; - struct { - UCHAR h_i_frag; /* Fragment number */ - UCHAR h_i_fsize; /* Fragment size */ - USHORT h_i_mode_high; - USHORT h_i_uid_high; - USHORT h_i_gid_high; - ULONG h_i_author; - } hurd2; - struct { - UCHAR m_i_frag; /* Fragment number */ - UCHAR m_i_fsize; /* Fragment size */ - USHORT m_pad1; - ULONG m_i_reserved2[2]; - } masix2; - } osd2; /* OS dependent 2 */ -}; - -#if defined(__KERNEL__) || defined(__linux__) -#define i_reserved1 osd1.linux1.l_i_reserved1 -#define i_frag osd2.linux2.l_i_frag -#define i_fsize osd2.linux2.l_i_fsize -#define i_reserved2 osd2.linux2.l_i_reserved2 -#endif - -#ifdef __hurd__ -#define i_translator osd1.hurd1.h_i_translator -#define i_frag osd2.hurd2.h_i_frag; -#define i_fsize osd2.hurd2.h_i_fsize; -#define i_uid_high osd2.hurd2.h_i_uid_high -#define i_gid_high osd2.hurd2.h_i_gid_high -#define i_author osd2.hurd2.h_i_author -#endif - -#ifdef __masix__ -#define i_reserved1 osd1.masix1.m_i_reserved1 -#define i_frag osd2.masix2.m_i_frag -#define i_fsize osd2.masix2.m_i_fsize -#define i_reserved2 osd2.masix2.m_i_reserved2 -#endif - -/* - * Constants relative to the data blocks - */ -#define EXT2_NDIR_BLOCKS 12 -#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS -#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) -#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) -#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -/* - * Inode flags - */ -#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */ -#define EXT2_UNRM_FL 0x00000002 /* Undelete */ -#define EXT2_COMPR_FL 0x00000004 /* Compress file */ -#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ -#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ -#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ -#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ -#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ - - -/* - * Structure of a blocks group descriptor - */ -struct ext2_group_desc -{ - ULONG bg_block_bitmap; /* Blocks bitmap block */ - ULONG bg_inode_bitmap; /* Inodes bitmap block */ - ULONG bg_inode_table; /* Inodes table block */ - USHORT bg_free_blocks_count; /* Free blocks count */ - USHORT bg_free_inodes_count; /* Free inodes count */ - USHORT bg_used_dirs_count; /* Directories count */ - USHORT bg_pad; - ULONG bg_reserved[3]; -}; - -#define EXT2_NAME_LEN 255 - -struct ext2_dir_entry { - ULONG inode; /* Inode number */ - USHORT rec_len; /* Directory entry length */ - USHORT name_len; /* Name length */ - char name[EXT2_NAME_LEN]; /* File name */ -}; - -typedef struct -{ - PDEVICE_OBJECT StorageDevice; - struct ext2_super_block* superblock; - PFILE_OBJECT FileObject; - PBCB Bcb; -} DEVICE_EXTENSION, *PDEVICE_EXTENSION; - -typedef struct _EXT2_GROUP_DESC -{ - ERESOURCE Lock; - struct ext2_group_desc* desc; - PCACHE_SEGMENT CacheSeg; - PVOID BaseAddress; -} EXT2_GROUP_DESC, *PEXT2_GROUP_DESC; - -PEXT2_GROUP_DESC Ext2LoadGroup(PDEVICE_EXTENSION DeviceExt, - ULONG BlockGrp); -VOID Ext2ReleaseGroup(PDEVICE_EXTENSION DeviceExt, - PEXT2_GROUP_DESC GrpDesc); - -VOID Ext2ReadInode(PDEVICE_EXTENSION DeviceExt, - ULONG ino, - struct ext2_inode* inode); -struct ext2_group_desc* Ext2LoadGroupDesc(PDEVICE_EXTENSION DeviceExt, - ULONG block_group); - -typedef struct _EXT2_INODE -{ - struct ext2_inode* inode; - PVOID BaseAddress; - PCACHE_SEGMENT CacheSeg; -} EXT2_INODE, *PEXT2_INODE; - -typedef struct _EXT2_FCB -{ - ULONG inode; - EXT2_INODE i; - PBCB Bcb; -} EXT2_FCB, *PEXT2_FCB; - -ULONG Ext2BlockMap(PDEVICE_EXTENSION DeviceExt, - struct ext2_inode* inode, - ULONG offset); -NTSTATUS Ext2OpenFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PWSTR FileName); -NTSTATUS Ext2ReadFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject, - PVOID Buffer, - ULONG Length, - LARGE_INTEGER Offset); -NTSTATUS STDCALL Ext2Create(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2DirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2QueryQuota(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2SetQuota(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2SetSecurity(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2QuerySecurity(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2SetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2QueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2Read(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2Write(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2Cleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2FlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL Ext2Shutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS Ext2ReadPage(PDEVICE_EXTENSION DeviceExt, - PEXT2_FCB Fcb, - PVOID Buffer, - ULONG Offset); -VOID Ext2LoadInode(PDEVICE_EXTENSION DeviceExt, - ULONG ino, - PEXT2_INODE Inode); -VOID Ext2ReleaseInode(PDEVICE_EXTENSION DeviceExt, - PEXT2_INODE Inode); - _____ Deleted: branches/ext2/reactos/drivers/fs/ext2/file.c --- branches/ext2/reactos/drivers/fs/ext2/file.c 2005-01-13 01:21:47 UTC (rev 13008) +++ branches/ext2/reactos/drivers/fs/ext2/file.c 2005-01-13 01:51:33 UTC (rev 13009) @@ -1,61 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: services/fs/ext2/super.c - * PURPOSE: ext2 filesystem - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> - -#define NDEBUG -#include <debug.h> - -#include "ext2fs.h" - -/* FUNCTIONS ****************************************************************/ - -#define addr_per_block (BLOCKSIZE / sizeof(ULONG)) - -ULONG Ext2BlockMap(PDEVICE_EXTENSION DeviceExt, - struct ext2_inode* inode, - ULONG offset) -{ - ULONG block; - PULONG TempBuffer; - BOOL b; - - DPRINT("Ext2BlockMap(DeviceExt %x, inode %x, offset %d)\n", - DeviceExt,inode,offset); - if (offset < EXT2_NDIR_BLOCKS) - { - block = inode->i_block[offset]; - DPRINT("block %d\n",block); - return(block); - } - offset = offset - EXT2_NDIR_BLOCKS; - if (offset < addr_per_block) - { - block = inode->i_block[EXT2_IND_BLOCK]; - TempBuffer = ExAllocatePool(NonPagedPool, BLOCKSIZE); - b = Ext2ReadSectors(DeviceExt->StorageDevice, - block, - 1, - TempBuffer); - if (!b) - { - DbgPrint("ext2fs:%s:%d: Disk io failed\n", __FILE__, __LINE__); - return(0); - } - block = TempBuffer[offset]; - ExFreePool(TempBuffer); - return(block); - } - offset = offset - addr_per_block; [truncated at 1000 lines; 21006 more skipped]

19 years, 10 months

[arty] 13008: Create ext2 branch

by arty＠svn.reactos.com

Create ext2 branch Added: branches/ext2/ _____ Copied: branches/ext2 (from rev 13007, trunk)

19 years, 10 months

[gvg] 13007: Tag Wine-20050111

by gvg＠svn.reactos.com

Tag Wine-20050111 Added: tags/Wine-20050111-sync/ _____ Copied: tags/Wine-20050111-sync (from rev 13006, trunk/reactos)

19 years, 10 months

[gvg] 13006: Sync to Wine-20050111:

by gvg＠svn.reactos.com

Sync to Wine-20050111: Eric Pouech <pouech-eric(a)wanadoo.fr> Filip Navara <xnavara(a)volny.cz> - 32 bit low level drivers now use a Unicode interface (used to be ANSI): - Send the *_GETDEVCAPS messages in unicode format from the *GetDevCapsW function and call the *GetDevCapsW from their respective Ansi versions. - Modify all low level drivers to correctly process the *_GETDEVCAPS messages as unicode. - *_GETDEVCAPS messages are now mapped from/to unicode for 16 bit code. - Removed all SoundBlaster naming oldies. Better use of some unicode functions (instead of Ansi) in winmm. Alexandre Julliard <julliard(a)winehq.org> - Fixed header dependencies to be fully compatible with the Windows headers (with help from Dimitrie O. Paun). - Get rid of the ThunkData stubs, these are not functions. Jeff Smith <whydoubt(a)hotmail.com> - Fix for MIDI Mapper. Robert Reif <reif(a)earthlink.net> - Return actual result on error. - Return flag for DRVM_MAPPER_PREFERRED_GET. Michael Stefaniuc <mstefani(a)redhat.de> - Do not check for non NULL pointer before HeapFree'ing it. It's redundant. Ge van Geldorp <gvg(a)reactos.com> - Match PSDK definitions for LPCWAVEFORMATEX. Modified: trunk/reactos/lib/winmm/driver.c Modified: trunk/reactos/lib/winmm/joystick.c Modified: trunk/reactos/lib/winmm/lolvldrv.c Modified: trunk/reactos/lib/winmm/mci.c Modified: trunk/reactos/lib/winmm/message16.c Deleted: trunk/reactos/lib/winmm/midimap/.cvsignore Modified: trunk/reactos/lib/winmm/midimap/midimap.c Modified: trunk/reactos/lib/winmm/mmio.c Modified: trunk/reactos/lib/winmm/mmsystem.c Modified: trunk/reactos/lib/winmm/playsound.c Deleted: trunk/reactos/lib/winmm/wavemap/.cvsignore Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c Modified: trunk/reactos/lib/winmm/winemm.h Modified: trunk/reactos/lib/winmm/winmm.c Modified: trunk/reactos/lib/winmm/winmm.spec _____ Modified: trunk/reactos/lib/winmm/driver.c --- trunk/reactos/lib/winmm/driver.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/driver.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -368,8 +368,8 @@ ret = OpenDriverA(dn, sn, lParam); - if (dn) HeapFree(GetProcessHeap(), 0, dn); - if (sn) HeapFree(GetProcessHeap(), 0, sn); + HeapFree(GetProcessHeap(), 0, dn); + HeapFree(GetProcessHeap(), 0, sn); return ret; } _____ Modified: trunk/reactos/lib/winmm/joystick.c --- trunk/reactos/lib/winmm/joystick.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/joystick.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -138,9 +138,9 @@ } /*********************************************************************** *** - * joyGetDevCapsA [WINMM.@] + * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) { if (wID >= MAXJOYSTICK) return JOYERR_PARMS; if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; @@ -152,43 +152,49 @@ } /*********************************************************************** *** - * joyGetDevCapsW [WINMM.@] + * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) { - JOYCAPSA jca; - MMRESULT ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + JOYCAPSW jcw; + MMRESULT ret; - if (ret != JOYERR_NOERROR) return ret; - lpCaps->wMid = jca.wMid; - lpCaps->wPid = jca.wPid; - MultiByteToWideChar( CP_ACP, 0, jca.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname)/sizeof(WCHAR) ); - lpCaps->wXmin = jca.wXmin; - lpCaps->wXmax = jca.wXmax; - lpCaps->wYmin = jca.wYmin; - lpCaps->wYmax = jca.wYmax; - lpCaps->wZmin = jca.wZmin; - lpCaps->wZmax = jca.wZmax; - lpCaps->wNumButtons = jca.wNumButtons; - lpCaps->wPeriodMin = jca.wPeriodMin; - lpCaps->wPeriodMax = jca.wPeriodMax; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - if (wSize >= sizeof(JOYCAPSW)) { /* Win95 extensions ? */ - lpCaps->wRmin = jca.wRmin; - lpCaps->wRmax = jca.wRmax; - lpCaps->wUmin = jca.wUmin; - lpCaps->wUmax = jca.wUmax; - lpCaps->wVmin = jca.wVmin; - lpCaps->wVmax = jca.wVmax; - lpCaps->wCaps = jca.wCaps; - lpCaps->wMaxAxes = jca.wMaxAxes; - lpCaps->wNumAxes = jca.wNumAxes; - lpCaps->wMaxButtons = jca.wMaxButtons; - MultiByteToWideChar( CP_ACP, 0, jca.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, jca.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD)/sizeof(WCHAR) ); + ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); + + if (ret == JOYERR_NOERROR) + { + lpCaps->wMid = jcw.wMid; + lpCaps->wPid = jcw.wPid; + WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, + sizeof(lpCaps->szPname), NULL, NULL ); + lpCaps->wXmin = jcw.wXmin; + lpCaps->wXmax = jcw.wXmax; + lpCaps->wYmin = jcw.wYmin; + lpCaps->wYmax = jcw.wYmax; + lpCaps->wZmin = jcw.wZmin; + lpCaps->wZmax = jcw.wZmax; + lpCaps->wNumButtons = jcw.wNumButtons; + lpCaps->wPeriodMin = jcw.wPeriodMin; + lpCaps->wPeriodMax = jcw.wPeriodMax; + + if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ + lpCaps->wRmin = jcw.wRmin; + lpCaps->wRmax = jcw.wRmax; + lpCaps->wUmin = jcw.wUmin; + lpCaps->wUmax = jcw.wUmax; + lpCaps->wVmin = jcw.wVmin; + lpCaps->wVmax = jcw.wVmax; + lpCaps->wCaps = jcw.wCaps; + lpCaps->wMaxAxes = jcw.wMaxAxes; + lpCaps->wNumAxes = jcw.wNumAxes; + lpCaps->wMaxButtons = jcw.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, + sizeof(lpCaps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, + sizeof(lpCaps->szOEMVxD), NULL, NULL ); + } } return ret; _____ Modified: trunk/reactos/lib/winmm/lolvldrv.c --- trunk/reactos/lib/winmm/lolvldrv.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/lolvldrv.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -504,6 +504,7 @@ case DRVM_MAPPER_PREFERRED_GET: /* FIXME: get from registry someday */ *((LPDWORD)dwParam1) = -1; /* No preferred device */ + *((LPDWORD)dwParam2) = 0; break; case DRV_QUERYDEVICEINTERFACE: _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/mci.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -415,10 +415,8 @@ return FALSE; S_MciCmdTable[uTbl].lpTable = NULL; - if (S_MciCmdTable[uTbl].aVerbs) { - HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTbl].aVerbs); - S_MciCmdTable[uTbl].aVerbs = 0; - } + HeapFree(GetProcessHeap(), 0, S_MciCmdTable[uTbl].aVerbs); + S_MciCmdTable[uTbl].aVerbs = 0; return TRUE; } @@ -1090,7 +1088,7 @@ if (lpwstrRet) MultiByteToWideChar( CP_ACP, 0, lpstrRet, -1, lpwstrRet, uRetLen ); HeapFree(GetProcessHeap(), 0, lpstrCommand); - if (lpstrRet) HeapFree(GetProcessHeap(), 0, lpstrRet); + HeapFree(GetProcessHeap(), 0, lpstrRet); return ret; } _____ Modified: trunk/reactos/lib/winmm/message16.c --- trunk/reactos/lib/winmm/message16.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/message16.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -1,7 +1,7 @@ /* -*- tab-width: 8; c-basic-offset: 4 -*- */ /* - * MMSYTEM MCI and low level mapping functions + * MMSYSTEM MCI and low level mapping functions * * Copyright 1999 Eric Pouech * @@ -297,14 +297,14 @@ case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPS16) + sizeof(MIDIOUTCAPSA)); + LPMIDIOUTCAPSW moc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPS16) + sizeof(MIDIOUTCAPSW)); LPMIDIOUTCAPS16 moc16 = MapSL(*lpParam1); if (moc32) { *(LPMIDIOUTCAPS16*)moc32 = moc16; - moc32 = (LPMIDIOUTCAPSA)((LPSTR)moc32 + sizeof(LPMIDIOUTCAPS16)); + moc32 = (LPMIDIOUTCAPSW)((LPSTR)moc32 + sizeof(LPMIDIOUTCAPS16)); *lpParam1 = (DWORD)moc32; - *lpParam2 = sizeof(MIDIOUTCAPSA); + *lpParam2 = sizeof(MIDIOUTCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -390,13 +390,14 @@ case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = (LPMIDIOUTCAPSA)(*lpParam1); + LPMIDIOUTCAPSW moc32 = (LPMIDIOUTCAPSW)(*lpParam1); LPMIDIOUTCAPS16 moc16 = *(LPMIDIOUTCAPS16*)((LPSTR)moc32 - sizeof(LPMIDIOUTCAPS16)); moc16->wMid = moc32->wMid; moc16->wPid = moc32->wPid; moc16->vDriverVersion = moc32->vDriverVersion; - strcpy(moc16->szPname, moc32->szPname); + WideCharToMultiByte( CP_ACP, 0, moc32->szPname, -1, moc16->szPname, + sizeof(moc16->szPname), NULL, NULL ); moc16->wTechnology = moc32->wTechnology; moc16->wVoices = moc32->wVoices; moc16->wNotes = moc32->wNotes; @@ -455,16 +456,16 @@ break; case MODM_GETDEVCAPS: { - LPMIDIOUTCAPSA moc32 = (LPMIDIOUTCAPSA)*lpParam1; - LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPSA)+sizeof(MIDIOUTCAPS16)); + LPMIDIOUTCAPSW moc32 = (LPMIDIOUTCAPSW)*lpParam1; + LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPMIDIOUTCAPSW)+sizeof(MIDIOUTCAPS16)); if (ptr) { - *(LPMIDIOUTCAPSA*)ptr = moc32; + *(LPMIDIOUTCAPSW*)ptr = moc32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = (DWORD)MapLS(ptr) + sizeof(LPMIDIOUTCAPSA); + *lpParam1 = (DWORD)MapLS(ptr) + sizeof(LPMIDIOUTCAPSW); *lpParam2 = sizeof(MIDIOUTCAPS16); } break; @@ -596,13 +597,14 @@ case MODM_GETDEVCAPS: { LPMIDIOUTCAPS16 moc16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)moc16 - sizeof(LPMIDIOUTCAPSA); - LPMIDIOUTCAPSA moc32 = *(LPMIDIOUTCAPSA*)ptr; + LPSTR ptr = (LPSTR)moc16 - sizeof(LPMIDIOUTCAPSW); + LPMIDIOUTCAPSW moc32 = *(LPMIDIOUTCAPSW*)ptr; moc32->wMid = moc16->wMid; moc32->wPid = moc16->wPid; moc32->vDriverVersion = moc16->vDriverVersion; - strcpy(moc32->szPname, moc16->szPname); + WideCharToMultiByte( CP_ACP, 0, moc32->szPname, -1, moc16->szPname, + sizeof(moc16->szPname), NULL, NULL ); moc32->wTechnology = moc16->wTechnology; moc32->wVoices = moc16->wVoices; moc32->wNotes = moc16->wNotes; @@ -723,14 +725,14 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEINCAPS16) + sizeof(WAVEINCAPSA)); + LPWAVEINCAPSW wic32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEINCAPS16) + sizeof(WAVEINCAPSW)); LPWAVEINCAPS16 wic16 = MapSL(*lpParam1); if (wic32) { *(LPWAVEINCAPS16*)wic32 = wic16; - wic32 = (LPWAVEINCAPSA)((LPSTR)wic32 + sizeof(LPWAVEINCAPS16)); + wic32 = (LPWAVEINCAPSW)((LPSTR)wic32 + sizeof(LPWAVEINCAPS16)); *lpParam1 = (DWORD)wic32; - *lpParam2 = sizeof(WAVEINCAPSA); + *lpParam2 = sizeof(WAVEINCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -833,13 +835,14 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = (LPWAVEINCAPSA)(*lpParam1); + LPWAVEINCAPSW wic32 = (LPWAVEINCAPSW)(*lpParam1); LPWAVEINCAPS16 wic16 = *(LPWAVEINCAPS16*)((LPSTR)wic32 - sizeof(LPWAVEINCAPS16)); wic16->wMid = wic32->wMid; wic16->wPid = wic32->wPid; wic16->vDriverVersion = wic32->vDriverVersion; - strcpy(wic16->szPname, wic32->szPname); + WideCharToMultiByte( CP_ACP, 0, wic32->szPname, -1, wic16->szPname, + sizeof(wic16->szPname), NULL, NULL ); wic16->dwFormats = wic32->dwFormats; wic16->wChannels = wic32->wChannels; HeapFree(GetProcessHeap(), 0, (LPSTR)wic32 - sizeof(LPWAVEINCAPS16)); @@ -1010,16 +1013,16 @@ break; case WIDM_GETDEVCAPS: { - LPWAVEINCAPSA wic32 = (LPWAVEINCAPSA)*lpParam1; - LPSTR ptr = HeapAlloc( GetProcessHeap(), 0 ,sizeof(LPWAVEINCAPSA) + sizeof(WAVEINCAPS16)); + LPWAVEINCAPSW wic32 = (LPWAVEINCAPSW)*lpParam1; + LPSTR ptr = HeapAlloc( GetProcessHeap(), 0 ,sizeof(LPWAVEINCAPSW) + sizeof(WAVEINCAPS16)); if (ptr) { - *(LPWAVEINCAPSA*)ptr = wic32; + *(LPWAVEINCAPSW*)ptr = wic32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = MapLS(ptr) + sizeof(LPWAVEINCAPSA); + *lpParam1 = MapLS(ptr) + sizeof(LPWAVEINCAPSW); *lpParam2 = sizeof(WAVEINCAPS16); } break; @@ -1109,13 +1112,14 @@ case WIDM_GETDEVCAPS: { LPWAVEINCAPS16 wic16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)wic16 - sizeof(LPWAVEINCAPSA); - LPWAVEINCAPSA wic32 = *(LPWAVEINCAPSA*)ptr; + LPSTR ptr = (LPSTR)wic16 - sizeof(LPWAVEINCAPSW); + LPWAVEINCAPSW wic32 = *(LPWAVEINCAPSW*)ptr; wic32->wMid = wic16->wMid; wic32->wPid = wic16->wPid; wic32->vDriverVersion = wic16->vDriverVersion; - strcpy(wic32->szPname, wic16->szPname); + WideCharToMultiByte( CP_ACP, 0, wic32->szPname, -1, wic16->szPname, + sizeof(wic16->szPname), NULL, NULL ); wic32->dwFormats = wic16->dwFormats; wic32->wChannels = wic16->wChannels; UnMapLS( *lpParam1 ); @@ -1222,14 +1226,14 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEOUTCAPS16) + sizeof(WAVEOUTCAPSA)); + LPWAVEOUTCAPSW woc32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWAVEOUTCAPS16) + sizeof(WAVEOUTCAPSW)); LPWAVEOUTCAPS16 woc16 = MapSL(*lpParam1); if (woc32) { *(LPWAVEOUTCAPS16*)woc32 = woc16; - woc32 = (LPWAVEOUTCAPSA)((LPSTR)woc32 + sizeof(LPWAVEOUTCAPS16)); + woc32 = (LPWAVEOUTCAPSW)((LPSTR)woc32 + sizeof(LPWAVEOUTCAPS16)); *lpParam1 = (DWORD)woc32; - *lpParam2 = sizeof(WAVEOUTCAPSA); + *lpParam2 = sizeof(WAVEOUTCAPSW); ret = WINMM_MAP_OKMEM; } else { @@ -1341,13 +1345,14 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = (LPWAVEOUTCAPSA)(*lpParam1); + LPWAVEOUTCAPSW woc32 = (LPWAVEOUTCAPSW)(*lpParam1); LPWAVEOUTCAPS16 woc16 = *(LPWAVEOUTCAPS16*)((LPSTR)woc32 - sizeof(LPWAVEOUTCAPS16)); woc16->wMid = woc32->wMid; woc16->wPid = woc32->wPid; woc16->vDriverVersion = woc32->vDriverVersion; - strcpy(woc16->szPname, woc32->szPname); + WideCharToMultiByte( CP_ACP, 0, woc32->szPname, -1, woc16->szPname, + sizeof(woc16->szPname), NULL, NULL ); woc16->dwFormats = woc32->dwFormats; woc16->wChannels = woc32->wChannels; woc16->dwSupport = woc32->dwSupport; @@ -1416,17 +1421,17 @@ case WODM_GETDEVCAPS: { - LPWAVEOUTCAPSA woc32 = (LPWAVEOUTCAPSA)*lpParam1; + LPWAVEOUTCAPSW woc32 = (LPWAVEOUTCAPSW)*lpParam1; LPSTR ptr = HeapAlloc( GetProcessHeap(), 0, - sizeof(LPWAVEOUTCAPSA) + sizeof(WAVEOUTCAPS16)); + sizeof(LPWAVEOUTCAPSW) + sizeof(WAVEOUTCAPS16)); if (ptr) { - *(LPWAVEOUTCAPSA*)ptr = woc32; + *(LPWAVEOUTCAPSW*)ptr = woc32; ret = WINMM_MAP_OKMEM; } else { ret = WINMM_MAP_NOMEM; } - *lpParam1 = MapLS(ptr) + sizeof(LPWAVEOUTCAPSA); + *lpParam1 = MapLS(ptr) + sizeof(LPWAVEOUTCAPSW); *lpParam2 = sizeof(WAVEOUTCAPS16); } break; @@ -1606,13 +1611,14 @@ case WODM_GETDEVCAPS: { LPWAVEOUTCAPS16 woc16 = MapSL(*lpParam1); - LPSTR ptr = (LPSTR)woc16 - sizeof(LPWAVEOUTCAPSA); - LPWAVEOUTCAPSA woc32 = *(LPWAVEOUTCAPSA*)ptr; + LPSTR ptr = (LPSTR)woc16 - sizeof(LPWAVEOUTCAPSW); + LPWAVEOUTCAPSW woc32 = *(LPWAVEOUTCAPSW*)ptr; woc32->wMid = woc16->wMid; woc32->wPid = woc16->wPid; woc32->vDriverVersion = woc16->vDriverVersion; - strcpy(woc32->szPname, woc16->szPname); + WideCharToMultiByte( CP_ACP, 0, woc32->szPname, -1, woc16->szPname, + sizeof(woc16->szPname), NULL, NULL ); woc32->dwFormats = woc16->dwFormats; woc32->wChannels = woc16->wChannels; woc32->dwSupport = woc16->dwSupport; _____ Deleted: trunk/reactos/lib/winmm/midimap/.cvsignore --- trunk/reactos/lib/winmm/midimap/.cvsignore 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/midimap/.cvsignore 2005-01-12 23:33:10 UTC (rev 13006) @@ -1,2 +0,0 @@ -Makefile -midimap.drv.dbg.c _____ Modified: trunk/reactos/lib/winmm/midimap/midimap.c --- trunk/reactos/lib/winmm/midimap/midimap.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/midimap/midimap.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -32,6 +32,7 @@ #include "winuser.h" #include "mmddk.h" #include "winreg.h" +#include "wine/unicode.h" #include "wine/debug.h" /* @@ -80,7 +81,7 @@ typedef struct tagMIDIOUTPORT { - char name[MAXPNAMELEN]; + WCHAR name[MAXPNAMELEN]; int loaded; HMIDIOUT hMidi; unsigned short uDevID; @@ -105,31 +106,36 @@ return TRUE; } -static BOOL MIDIMAP_FindPort(const char* name, unsigned* dev) +static BOOL MIDIMAP_FindPort(const WCHAR* name, unsigned* dev) { for (*dev = 0; *dev < numMidiOutPorts; (*dev)++) { - TRACE("%s\n", midiOutPorts[*dev].name); - if (strcmp(midiOutPorts[*dev].name, name) == 0) + TRACE("%s\n", wine_dbgstr_w(midiOutPorts[*dev].name)); + if (strcmpW(midiOutPorts[*dev].name, name) == 0) return TRUE; } /* try the form #nnn */ if (*name == '#' && isdigit(name[1])) { - *dev = atoi(name + 1); + const WCHAR* ptr = name + 1; + *dev = 0; + do + { + *dev = *dev * 10 + *ptr - '0'; + } while (isdigit(*++ptr)); if (*dev < numMidiOutPorts) return TRUE; } return FALSE; } -static BOOL MIDIMAP_LoadSettingsDefault(MIDIMAPDATA* mom, const char* port) +static BOOL MIDIMAP_LoadSettingsDefault(MIDIMAPDATA* mom, const WCHAR* port) { unsigned i, dev = 0; if (port != NULL && !MIDIMAP_FindPort(port, &dev)) { - ERR("Registry glitch: couldn't find midi out (%s)\n", port); + ERR("Registry glitch: couldn't find midi out (%s)\n", wine_dbgstr_w(port)); dev = 0; } @@ -142,11 +148,11 @@ return TRUE; } -static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const char* scheme) +static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) { HKEY hSchemesKey, hKey, hPortKey; unsigned i, idx, dev; - char buffer[256], port[256]; + WCHAR buffer[256], port[256]; DWORD type, size, mask; for (i = 0; i < 16; i++) mom->ChannelMap[i] = NULL; @@ -157,18 +163,18 @@ { return FALSE; } - if (RegOpenKeyA(hSchemesKey, scheme, &hKey)) + if (RegOpenKeyW(hSchemesKey, scheme, &hKey)) { RegCloseKey(hSchemesKey); return FALSE; } - for (idx = 0; !RegEnumKeyA(hKey, idx, buffer, sizeof(buffer)); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)); idx++) { - if (RegOpenKeyA(hKey, buffer, &hPortKey)) continue; + if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; size = sizeof(port); - if (RegQueryValueExA(hPortKey, NULL, 0, &type, port, &size)) continue; + if (RegQueryValueExW(hPortKey, NULL, 0, &type, (void*)port, &size)) continue; if (!MIDIMAP_FindPort(port, &dev)) continue; @@ -206,14 +212,15 @@ else { DWORD type, size, out; - char buffer[256]; + WCHAR buffer[256]; ret = 2; size = sizeof(out); if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { + static const WCHAR cs[] = {'C','u','r','r','e','n','t','S','c','h','e','m','e',0}; size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentScheme", 0, &type, buffer, &size)) + if (!RegQueryValueExW(hKey, cs, 0, &type, (void*)buffer, &size)) { if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) ret = MIDIMAP_LoadSettingsDefault(mom, NULL); @@ -225,8 +232,9 @@ } if (ret == 2) { + static const WCHAR ci[] = {'C','u','r','r','e','n','t','I','n','s','t','r','u','m','e','n','t',0}; size = sizeof(buffer); - if (!RegQueryValueExA(hKey, "CurrentInstrument", 0, &type, buffer, &size) && *buffer) + if (!RegQueryValueExW(hKey, ci, 0, &type, (void*)buffer, &size) && *buffer) { ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } @@ -404,12 +412,13 @@ return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSA lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) { + static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; lpMidiCaps->wPid = 0x0001; lpMidiCaps->vDriverVersion = 0x0100; - strcpy(lpMidiCaps->szPname, "Wine midi out mapper"); + lstrcpyW(lpMidiCaps->szPname, name); lpMidiCaps->wTechnology = MOD_MAPPER; lpMidiCaps->wVoices = 0; lpMidiCaps->wNotes = 0; @@ -465,7 +474,7 @@ case MODM_UNPREPARE: return modUnprepare ((MIDIMAPDATA*)dwUser, (LPMIDIHDR)dwParam1, dwParam2); case MODM_RESET: return modReset ((MIDIMAPDATA*)dwUser); - case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSA)dwParam1,dwParam2); + case MODM_GETDEVCAPS: return modGetDevCaps (wDevID, (MIDIMAPDATA*)dwUser, (LPMIDIOUTCAPSW)dwParam1,dwParam2); case MODM_GETNUMDEVS: return 1; case MODM_GETVOLUME: return MMSYSERR_NOTSUPPORTED; case MODM_SETVOLUME: return MMSYSERR_NOTSUPPORTED; @@ -484,7 +493,7 @@ */ static DWORD MIDIMAP_drvOpen(LPSTR str) { - MIDIOUTCAPSA moc; + MIDIOUTCAPSW moc; unsigned dev, i; if (midiOutPorts) @@ -495,9 +504,9 @@ numMidiOutPorts * sizeof(MIDIOUTPORT)); for (dev = 0; dev < numMidiOutPorts; dev++) { - if (midiOutGetDevCapsA(dev, &moc, sizeof(moc)) == 0L) + if (midiOutGetDevCapsW(dev, &moc, sizeof(moc)) == 0L) { - strcpy(midiOutPorts[dev].name, moc.szPname); + strcpyW(midiOutPorts[dev].name, moc.szPname); midiOutPorts[dev].loaded = 0; midiOutPorts[dev].hMidi = 0; midiOutPorts[dev].uDevID = dev; _____ Modified: trunk/reactos/lib/winmm/mmio.c --- trunk/reactos/lib/winmm/mmio.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/mmio.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -703,7 +703,7 @@ { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); szFn = HeapAlloc( GetProcessHeap(), 0, len ); - if (!szFn) return (HMMIO)NULL; + if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); } _____ Modified: trunk/reactos/lib/winmm/mmsystem.c --- trunk/reactos/lib/winmm/mmsystem.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/mmsystem.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -1940,7 +1940,7 @@ lpMMThd->hTask = 0; if ((dwFlags & 1) == 0 && (GetProcessFlags(GetCurrentThreadId()) & 8) == 0) { - lpMMThd->hEvent = CreateEventA(0, 0, 1, 0); + lpMMThd->hEvent = CreateEventW(NULL, FALSE, TRUE, NULL); TRACE("Let's go crazy... trying new MM thread. lpMMThd=%p\n", lpMMThd); if (lpMMThd->dwFlags & 2) { @@ -2712,7 +2712,6 @@ mmioInfo16.adwInfo[0] = lpmmioinfo->adwInfo[0]; mmioInfo16.adwInfo[1] = lpmmioinfo->adwInfo[1]; mmioInfo16.adwInfo[2] = lpmmioinfo->adwInfo[2]; - mmioInfo16.adwInfo[3] = lpmmioinfo->adwInfo[3]; /* map (lParam1, lParam2) into (lp1, lp2) 32=>16 */ if ((result = MMIO_Map32To16(uMessage, &lp1, &lp2)) != MMSYSERR_NOERROR) return result; @@ -2733,7 +2732,6 @@ lpmmioinfo->adwInfo[0] = mmioInfo16.adwInfo[0]; lpmmioinfo->adwInfo[1] = mmioInfo16.adwInfo[1]; lpmmioinfo->adwInfo[2] = mmioInfo16.adwInfo[2]; - lpmmioinfo->adwInfo[3] = mmioInfo16.adwInfo[3]; return result; } @@ -2777,7 +2775,6 @@ mmioinfo.adwInfo[0] = (DWORD)DosFileHandleToWin32Handle(mmioinfo.adwInfo[0]); mmioinfo.adwInfo[1] = lpmmioinfo16->adwInfo[1]; mmioinfo.adwInfo[2] = lpmmioinfo16->adwInfo[2]; - mmioinfo.adwInfo[3] = lpmmioinfo16->adwInfo[3]; ret = MMIO_Open(szFileName, &mmioinfo, dwOpenFlags, MMIO_PROC_16); MMIO_SetSegmentedBuffer(mmioinfo.hmmio, (SEGPTR)lpmmioinfo16->pchBuffer, FALSE); @@ -2856,7 +2853,6 @@ lpmmioinfo->adwInfo[0] = mmioinfo.adwInfo[0]; lpmmioinfo->adwInfo[1] = mmioinfo.adwInfo[1]; lpmmioinfo->adwInfo[2] = mmioinfo.adwInfo[2]; - lpmmioinfo->adwInfo[3] = mmioinfo.adwInfo[3]; lpmmioinfo->dwReserved1 = 0; lpmmioinfo->dwReserved2 = 0; lpmmioinfo->hmmio = HMMIO_16(mmioinfo.hmmio); @@ -3065,8 +3061,12 @@ MMRESULT16 WINAPI joyGetDevCaps16(UINT16 wID, LPJOYCAPS16 lpCaps, UINT16 wSize) { JOYCAPSA jca; - MMRESULT ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + MMRESULT ret; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + + ret = joyGetDevCapsA(wID, &jca, sizeof(jca)); + if (ret != JOYERR_NOERROR) return ret; lpCaps->wMid = jca.wMid; lpCaps->wPid = jca.wPid; _____ Modified: trunk/reactos/lib/winmm/playsound.c --- trunk/reactos/lib/winmm/playsound.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/playsound.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -352,7 +352,7 @@ TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize); - s.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, (DWORD)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -374,9 +374,9 @@ } s.dwEventCount = 1L; /* for first buffer */ + index = 0; do { - index = 0; left = mmckInfo.cksize; mmioSeek(hmmio, mmckInfo.dwDataOffset, SEEK_SET); @@ -410,8 +410,8 @@ errCleanUp: TRACE("Done playing='%s' => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); CloseHandle(s.hEvent); - if (waveHdr) HeapFree(GetProcessHeap(), 0, waveHdr); - if (lpWaveFormat) HeapFree(GetProcessHeap(), 0, lpWaveFormat); + HeapFree(GetProcessHeap(), 0, waveHdr); + HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hmmio) mmioClose(hmmio, 0); _____ Deleted: trunk/reactos/lib/winmm/wavemap/.cvsignore --- trunk/reactos/lib/winmm/wavemap/.cvsignore 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/wavemap/.cvsignore 2005-01-12 23:33:10 UTC (rev 13006) @@ -1,2 +0,0 @@ -Makefile -msacm.drv.dbg.c _____ Modified: trunk/reactos/lib/winmm/wavemap/wavemap.c --- trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/wavemap/wavemap.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -37,6 +37,7 @@ #include "mmddk.h" #include "mmreg.h" #include "msacm.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wavemap); @@ -269,8 +270,8 @@ WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = MMSYSERR_ERROR\n"); - return MMSYSERR_ERROR; + WARN("ret = 0x%08lx\n", res); + return res; } static DWORD wodClose(WAVEMAPDATA* wom) @@ -422,13 +423,15 @@ return val; } -static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSA lpWaveCaps, DWORD dwParam2) +static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { + static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; + TRACE("(%04x %p %p %08lx)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wom)) - return waveOutGetDevCapsA((UINT)wom->u.out.hInnerWave, lpWaveCaps, dwParam2); + return waveOutGetDevCapsW((UINT)wom->u.out.hInnerWave, lpWaveCaps, dwParam2); /* else if no drivers, nothing to map so return bad device */ if (waveOutGetNumDevs() == 0) { WARN("bad device id\n"); @@ -436,11 +439,11 @@ } /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { - WAVEOUTCAPSA woc; + WAVEOUTCAPSW woc; woc.wMid = 0x00FF; woc.wPid = 0x0001; woc.vDriverVersion = 0x0100; - strcpy(woc.szPname, "Wine wave out mapper"); + lstrcpyW(woc.szPname, name); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -556,7 +559,7 @@ case WODM_BREAKLOOP: return wodBreakLoop ((WAVEMAPDATA*)dwUser); case WODM_PREPARE: return wodPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WODM_UNPREPARE: return wodUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); - case WODM_GETDEVCAPS: return wodGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEOUTCAPSA)dwParam1,dwParam2); + case WODM_GETDEVCAPS: return wodGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEOUTCAPSW)dwParam1,dwParam2); case WODM_GETNUMDEVS: return 1; case WODM_GETPITCH: return MMSYSERR_NOTSUPPORTED; case WODM_SETPITCH: return MMSYSERR_NOTSUPPORTED; @@ -778,8 +781,8 @@ WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = MMSYSERR_ERROR\n"); - return MMSYSERR_ERROR; + WARN("ret = 0x%08lx\n", res); + return res; } static DWORD widClose(WAVEMAPDATA* wim) @@ -916,13 +919,13 @@ return val; } -static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSA lpWaveCaps, DWORD dwParam2) +static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCaps, DWORD dwParam2) { TRACE("(%04x, %p %p %08lx)\n", wDevID, wim, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wim)) - return waveInGetDevCapsA((UINT)wim->u.in.hInnerWave, lpWaveCaps, dwParam2); + return waveInGetDevCapsW((UINT)wim->u.in.hInnerWave, lpWaveCaps, dwParam2); /* else if no drivers, nothing to map so return bad device */ if (waveInGetNumDevs() == 0) { WARN("bad device id\n"); @@ -930,11 +933,12 @@ } /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { - WAVEINCAPSA wic; + WAVEINCAPSW wic; + static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - strcpy(wic.szPname, "Wine wave in mapper"); + strcpyW(wic.szPname, init); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -1023,7 +1027,7 @@ case WIDM_ADDBUFFER: return widAddBuffer ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WIDM_PREPARE: return widPrepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); case WIDM_UNPREPARE: return widUnprepare ((WAVEMAPDATA*)dwUser, (LPWAVEHDR)dwParam1, dwParam2); - case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEINCAPSA)dwParam1, dwParam2); + case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (WAVEMAPDATA*)dwUser, (LPWAVEINCAPSW)dwParam1, dwParam2); case WIDM_GETNUMDEVS: return 1; case WIDM_GETPOS: return widGetPosition ((WAVEMAPDATA*)dwUser, (LPMMTIME)dwParam1, dwParam2); case WIDM_RESET: return widReset ((WAVEMAPDATA*)dwUser); _____ Modified: trunk/reactos/lib/winmm/winemm.h --- trunk/reactos/lib/winmm/winemm.h 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/winemm.h 2005-01-12 23:33:10 UTC (rev 13006) @@ -268,7 +268,7 @@ DWORD cMidi, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32); UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, - const LPWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, + LPCWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32); HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, _____ Modified: trunk/reactos/lib/winmm/winmm.c --- trunk/reactos/lib/winmm/winmm.c 2005-01-12 23:25:02 UTC (rev 13005) +++ trunk/reactos/lib/winmm/winmm.c 2005-01-12 23:33:10 UTC (rev 13006) @@ -97,8 +97,8 @@ /* FIXME crashes in ReactOS WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; */ - WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); - WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + WINMM_IData->psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + WINMM_IData->psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created IData (%p)\n", WINMM_IData); return TRUE; } @@ -295,14 +295,25 @@ */ UINT WINAPI mixerGetDevCapsA(UINT_PTR uDeviceID, LPMIXERCAPSA lpCaps, UINT uSize) { - LPWINE_MLD wmld; + MIXERCAPSW micW; + UINT ret; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIXER, TRUE)) == NULL) - return MMSYSERR_BADDEVICEID; + ret = mixerGetDevCapsW(uDeviceID, &micW, sizeof(micW)); - return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize, TRUE); + if (ret == MMSYSERR_NOERROR) { + MIXERCAPSA micA; + micA.wMid = micW.wMid; + micA.wPid = micW.wPid; + micA.vDriverVersion = micW.vDriverVersion; + WideCharToMultiByte( CP_ACP, 0, micW.szPname, -1, micA.szPname, + sizeof(micA.szPname), NULL, NULL ); + micA.fdwSupport = micW.fdwSupport; + micA.cDestinations = micW.cDestinations; + memcpy(lpCaps, &micA, min(uSize, sizeof(micA))); + } + return ret; } /*********************************************************************** *** @@ -310,24 +321,14 @@ */ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize) { - MIXERCAPSA micA; - UINT ret; + LPWINE_MLD wmld; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - ret = mixerGetDevCapsA(uDeviceID, &micA, sizeof(micA)); - if (ret == MMSYSERR_NOERROR) { - MIXERCAPSW micW; - micW.wMid = micA.wMid; - micW.wPid = micA.wPid; - micW.vDriverVersion = micA.vDriverVersion; - MultiByteToWideChar( CP_ACP, 0, micA.szPname, -1, micW.szPname, - sizeof(micW.szPname)/sizeof(WCHAR) ); - micW.fdwSupport = micA.fdwSupport; - micW.cDestinations = micA.cDestinations; - memcpy(lpCaps, &micW, min(uSize, sizeof(micW))); - } - return ret; + if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_MIXER, TRUE)) == NULL) + return MMSYSERR_BADDEVICEID; + + return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize, TRUE); } UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, @@ -408,75 +409,76 @@ } /*********************************************************************** *** - * mixerGetControlDetailsA [WINMM.@] + * mixerGetControlDetailsW [WINMM.@] */ -UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA, +UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW, DWORD fdwDetails) { LPWINE_MIXER lpwm; UINT uRet = MMSYSERR_NOERROR; - TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdW, fdwDetails); if ((uRet = MIXER_GetDev(hmix, fdwDetails, &lpwm)) != MMSYSERR_NOERROR) return uRet; - if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) + if (lpmcdW == NULL || lpmcdW->cbStruct != sizeof(*lpmcdW)) return MMSYSERR_INVALPARAM; - return MMDRV_Message(&lpwm->mld, MXDM_GETCONTROLDETAILS, (DWORD_PTR)lpmcdA, + return MMDRV_Message(&lpwm->mld, MXDM_GETCONTROLDETAILS, (DWORD_PTR)lpmcdW, fdwDetails, TRUE); } /*********************************************************************** *** - * mixerGetControlDetailsW [WINMM.@] + * mixerGetControlDetailsA [WINMM.@] */ -UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) +UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA, + DWORD fdwDetails) { DWORD ret = MMSYSERR_NOTENABLED; - TRACE("(%p, %p, %08lx)\n", hmix, lpmcd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); - if (lpmcd == NULL || lpmcd->cbStruct != sizeof(*lpmcd)) + if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) return MMSYSERR_INVALPARAM; switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) { case MIXER_GETCONTROLDETAILSF_VALUE: - /* can savely use W structure as it is, no string inside */ - ret = mixerGetControlDetailsA(hmix, lpmcd, fdwDetails); + /* can savely use A structure as it is, no string inside */ + ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); break; case MIXER_GETCONTROLDETAILSF_LISTTEXT: { - MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)lpmcd->paDetails; - MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA; - int size = max(1, lpmcd->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTA); + MIXERCONTROLDETAILS_LISTTEXTA *pDetailsA = (MIXERCONTROLDETAILS_LISTTEXTA *)lpmcdA->paDetails; + MIXERCONTROLDETAILS_LISTTEXTW *pDetailsW; + int size = max(1, lpmcdA->cChannels) * sizeof(MIXERCONTROLDETAILS_LISTTEXTW); unsigned int i; - if (lpmcd->u.cMultipleItems != 0) { - size *= lpmcd->u.cMultipleItems; + if (lpmcdA->u.cMultipleItems != 0) { + size *= lpmcdA->u.cMultipleItems; } - pDetailsA = (MIXERCONTROLDETAILS_LISTTEXTA *)HeapAlloc(GetProcessHeap(), 0, size); - lpmcd->paDetails = pDetailsA; - lpmcd->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTA); + pDetailsW = (MIXERCONTROLDETAILS_LISTTEXTW *)HeapAlloc(GetProcessHeap(), 0, size); + lpmcdA->paDetails = pDetailsW; + lpmcdA->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTW); /* set up lpmcd->paDetails */ - ret = mixerGetControlDetailsA(hmix, lpmcd, fdwDetails); + ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); /* copy from lpmcd->paDetails back to paDetailsW; */ - if(ret == MMSYSERR_NOERROR) { - for(i=0;i<lpmcd->u.cMultipleItems*lpmcd->cChannels;i++) { - pDetailsW->dwParam1 = pDetailsA->dwParam1; - pDetailsW->dwParam2 = pDetailsA->dwParam2; - MultiByteToWideChar( CP_ACP, 0, pDetailsA->szName, -1, - pDetailsW->szName, - sizeof(pDetailsW->szName)/sizeof(WCHAR) ); + if (ret == MMSYSERR_NOERROR) { + for (i = 0; i < lpmcdA->u.cMultipleItems * lpmcdA->cChannels; i++) { + pDetailsA->dwParam1 = pDetailsW->dwParam1; + pDetailsA->dwParam2 = pDetailsW->dwParam2; + WideCharToMultiByte( CP_ACP, 0, pDetailsW->szName, -1, + pDetailsA->szName, + sizeof(pDetailsA->szName), NULL, NULL ); pDetailsA++; pDetailsW++; } - pDetailsA -= lpmcd->u.cMultipleItems*lpmcd->cChannels; - pDetailsW -= lpmcd->u.cMultipleItems*lpmcd->cChannels; + pDetailsA -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; + pDetailsW -= lpmcdA->u.cMultipleItems * lpmcdA->cChannels; } - HeapFree(GetProcessHeap(), 0, pDetailsA); - lpmcd->paDetails = pDetailsW; - lpmcd->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTW); + HeapFree(GetProcessHeap(), 0, pDetailsW); + lpmcdA->paDetails = pDetailsA; + lpmcdA->cbDetails = sizeof(MIXERCONTROLDETAILS_LISTTEXTA); } break; default: @@ -492,19 +494,59 @@ [truncated at 1000 lines; 651 more skipped]

19 years, 10 months

[gvg] 13005: Add some WAVE_FORMATs

by gvg＠svn.reactos.com

Add some WAVE_FORMATs Modified: trunk/reactos/w32api/include/mmsystem.h _____ Modified: trunk/reactos/w32api/include/mmsystem.h --- trunk/reactos/w32api/include/mmsystem.h 2005-01-12 23:18:20 UTC (rev 13004) +++ trunk/reactos/w32api/include/mmsystem.h 2005-01-12 23:25:02 UTC (rev 13005) @@ -190,6 +190,14 @@ #define WAVE_FORMAT_4S08 512 #define WAVE_FORMAT_4M16 1024 #define WAVE_FORMAT_4S16 2048 +#define WAVE_FORMAT_48M08 4096 +#define WAVE_FORMAT_48S08 8192 +#define WAVE_FORMAT_48M16 16384 +#define WAVE_FORMAT_48S16 32768 +#define WAVE_FORMAT_96M08 65536 +#define WAVE_FORMAT_96S08 131072 +#define WAVE_FORMAT_96M16 262144 +#define WAVE_FORMAT_96S16 524288 #define WAVE_FORMAT_PCM 1 #define MIDIERR_UNPREPARED MIDIERR_BASE #define MIDIERR_STILLPLAYING (MIDIERR_BASE+1)

19 years, 10 months

← Newer
1
...
34
35
36
37
38
39
40
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005