Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43211: Correction to 36917: EPROFILE/KPROFILE.Segment is pointer sized, not a pointer.
by sginsberg＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: sginsberg Date: Mon Sep 28 20:27:06 2009 New Revision: 43211 URL: http://svn.reactos.org/svn/reactos?rev=43211&view=rev Log: Correction to 36917: EPROFILE/KPROFILE.Segment is pointer sized, not a pointer. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Mon Sep 28 20:27:06 2009 @@ -531,7 +531,7 @@ PKPROFILE ProfileObject; PVOID LockedBufferAddress; PMDL Mdl; - PVOID Segment; + ULONG_PTR Segment; KPROFILE_SOURCE ProfileSource; KAFFINITY Affinity; } EPROFILE, *PEPROFILE; Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Mon Sep 28 20:27:06 2009 @@ -626,7 +626,7 @@ PVOID RangeLimit; ULONG BucketShift; PVOID Buffer; - PVOID Segment; + ULONG_PTR Segment; KAFFINITY Affinity; KPROFILE_SOURCE Source; BOOLEAN Started; Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Mon Sep 28 20:27:06 2009 @@ -104,7 +104,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; ULONG Log2 = 0; - PVOID Segment = NULL; + ULONG_PTR Segment = 0; PAGED_CODE(); /* Easy way out */ @@ -117,7 +117,7 @@ if (BufferSize < sizeof(ULONG)) return STATUS_INVALID_PARAMETER_7; /* This will become a segmented profile object */ - Segment = RangeBase; + Segment = (ULONG_PTR)RangeBase; RangeBase = 0; /* Recalculate the bucket size */

1 0

[fireball] 43210: - Tag FullFAT vendor drop.
by fireball＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: fireball Date: Mon Sep 28 20:13:41 2009 New Revision: 43210 URL: http://svn.reactos.org/svn/reactos?rev=43210&view=rev Log: - Tag FullFAT vendor drop. Added: vendor/fullfat/fullfat-1.0.0/ - copied from r43208, vendor/fullfat/current/

1 0

[janderwald] 43209: - Add ks.inf - ATM, only german is available, and is also the default
by janderwald＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: janderwald Date: Mon Sep 28 20:12:40 2009 New Revision: 43209 URL: http://svn.reactos.org/svn/reactos?rev=43209&view=rev Log: - Add ks.inf - ATM, only german is available, and is also the default Added: trunk/reactos/media/inf/ks.inf (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Sep 28 20:12:40 2009 @@ -631,6 +631,7 @@ media\inf\machine.inf 6 media\inf\msmouse.inf 6 media\inf\keyboard.inf 6 +media\inf\ks.inf 6 media\inf\NET_NIC.inf 6 media\inf\netamd.inf 6 media\inf\netisa.inf 6 Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=4… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Mon Sep 28 20:12:40 2009 @@ -9,6 +9,7 @@ <installfile installbase="inf">hdc.inf</installfile> <installfile installbase="inf">intl.inf</installfile> <installfile installbase="inf">keyboard.inf</installfile> + <installfile installbase="inf">ks.inf</installfile> <installfile installbase="inf">layout.inf</installfile> <installfile installbase="inf">machine.inf</installfile> <installfile installbase="inf">msmouse.inf</installfile> Added: trunk/reactos/media/inf/ks.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ks.inf?rev=43209… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/ks.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[fireball] 43208: - Vendor drop FullFAT library 1.0.0 release by James Walmsley.
by fireball＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: fireball Date: Mon Sep 28 20:10:46 2009 New Revision: 43208 URL: http://svn.reactos.org/svn/reactos?rev=43208&view=rev Log: - Vendor drop FullFAT library 1.0.0 release by James Walmsley. Added: vendor/fullfat/ vendor/fullfat/current/ vendor/fullfat/current/fat.h (with props) vendor/fullfat/current/ff_blk.c (with props) vendor/fullfat/current/ff_blk.h (with props) vendor/fullfat/current/ff_config.h (with props) vendor/fullfat/current/ff_crc.c (with props) vendor/fullfat/current/ff_crc.h (with props) vendor/fullfat/current/ff_dir.c (with props) vendor/fullfat/current/ff_dir.h (with props) vendor/fullfat/current/ff_error.c (with props) vendor/fullfat/current/ff_error.h (with props) vendor/fullfat/current/ff_fat.c (with props) vendor/fullfat/current/ff_fat.h (with props) vendor/fullfat/current/ff_file.c (with props) vendor/fullfat/current/ff_file.h (with props) vendor/fullfat/current/ff_hash.c (with props) vendor/fullfat/current/ff_hash.h (with props) vendor/fullfat/current/ff_ioman.c (with props) vendor/fullfat/current/ff_ioman.h (with props) vendor/fullfat/current/ff_memory.c (with props) vendor/fullfat/current/ff_memory.h (with props) vendor/fullfat/current/ff_safety.c (with props) vendor/fullfat/current/ff_safety.h (with props) vendor/fullfat/current/ff_string.c (with props) vendor/fullfat/current/ff_string.h (with props) vendor/fullfat/current/ff_time.c (with props) vendor/fullfat/current/ff_time.h (with props) vendor/fullfat/current/ff_types.h (with props) vendor/fullfat/current/fullfat.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/fullfat/current/fat.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/fat.h?rev=43208&v… Added: vendor/fullfat/current/ff_blk.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_blk.c?rev=4320… Added: vendor/fullfat/current/ff_blk.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_blk.h?rev=4320… Added: vendor/fullfat/current/ff_config.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_config.h?rev=4… Added: vendor/fullfat/current/ff_crc.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_crc.c?rev=4320… Added: vendor/fullfat/current/ff_crc.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_crc.h?rev=4320… Added: vendor/fullfat/current/ff_dir.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_dir.c?rev=4320… Added: vendor/fullfat/current/ff_dir.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_dir.h?rev=4320… Added: vendor/fullfat/current/ff_error.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_error.c?rev=43… Added: vendor/fullfat/current/ff_error.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_error.h?rev=43… Added: vendor/fullfat/current/ff_fat.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_fat.c?rev=4320… Added: vendor/fullfat/current/ff_fat.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_fat.h?rev=4320… Added: vendor/fullfat/current/ff_file.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_file.c?rev=432… Added: vendor/fullfat/current/ff_file.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_file.h?rev=432… Added: vendor/fullfat/current/ff_hash.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_hash.c?rev=432… Added: vendor/fullfat/current/ff_hash.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_hash.h?rev=432… Added: vendor/fullfat/current/ff_ioman.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_ioman.c?rev=43… Added: vendor/fullfat/current/ff_ioman.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_ioman.h?rev=43… Added: vendor/fullfat/current/ff_memory.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_memory.c?rev=4… Added: vendor/fullfat/current/ff_memory.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_memory.h?rev=4… Added: vendor/fullfat/current/ff_safety.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_safety.c?rev=4… Added: vendor/fullfat/current/ff_safety.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_safety.h?rev=4… Added: vendor/fullfat/current/ff_string.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_string.c?rev=4… Added: vendor/fullfat/current/ff_string.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_string.h?rev=4… Added: vendor/fullfat/current/ff_time.c URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_time.c?rev=432… Added: vendor/fullfat/current/ff_time.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_time.h?rev=432… Added: vendor/fullfat/current/ff_types.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/ff_types.h?rev=43… Added: vendor/fullfat/current/fullfat.h URL: http://svn.reactos.org/svn/reactos/vendor/fullfat/current/fullfat.h?rev=432…

1 0

[fireball] 43207: [fastfat_new] - Create root DCB when mounting a volume.
by fireball＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: fireball Date: Mon Sep 28 20:04:31 2009 New Revision: 43207 URL: http://svn.reactos.org/svn/reactos?rev=43207&view=rev Log: [fastfat_new] - Create root DCB when mounting a volume. Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Mon Sep 28 20:04:31 2009 @@ -21,4 +21,107 @@ return STATUS_NOT_IMPLEMENTED; } +VOID +NTAPI +FatCreateRootDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb) +{ + PFCB Dcb; + + /* Make sure it's not already created */ + ASSERT(!Vcb->RootDcb); + + /* Allocate the DCB */ + Dcb = FsRtlAllocatePoolWithTag(NonPagedPool, + sizeof(FCB), + TAG_FCB); + + /* Zero it */ + RtlZeroMemory(Dcb, sizeof(FCB)); + + /* Assign it to the VCB */ + Vcb->RootDcb = Dcb; + + /* Set its header */ + Dcb->Header.NodeTypeCode = FAT_NTC_ROOT_DCB; + Dcb->Header.NodeByteSize = sizeof(FCB); + + /* FCB is in a good condition */ + Dcb->Condition = FcbGood; + + /* Initialize FCB's resource */ + Dcb->Header.Resource = &Dcb->Resource; + ExInitializeResourceLite(&Dcb->Resource); + + /* Initialize Paging Io resource*/ + Dcb->Header.PagingIoResource = &Dcb->PagingIoResource; + ExInitializeResourceLite(&Dcb->PagingIoResource); + + /* Initialize a list of parent DCBs*/ + InitializeListHead(&Dcb->ParentDcbLinks); + + /* Set VCB */ + Dcb->Vcb = Vcb; + + /* Initialize parent's DCB list */ + InitializeListHead(&Dcb->Dcb.ParentDcbList); + + /* Initialize the full file name */ + Dcb->FullFileName.Buffer = L"\\"; + Dcb->FullFileName.Length = 1 * sizeof(WCHAR); + Dcb->FullFileName.MaximumLength = 2 * sizeof(WCHAR); + + Dcb->FileName.Name.Ansi.Buffer = "\\"; + Dcb->FileName.Name.Ansi.Length = 1; + Dcb->FileName.Name.Ansi.MaximumLength = 2 * sizeof(CHAR); + + /* Fill dirent attribute byte copy */ + Dcb->DirentFatFlags = FILE_ATTRIBUTE_DIRECTORY; + + /* Initialize advanced FCB header fields */ + ExInitializeFastMutex(&Dcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Dcb->Header, &Dcb->HeaderMutex); + + /* Initialize MCB */ + FsRtlInitializeLargeMcb(&Dcb->Mcb, NonPagedPool); + + /* Set up first cluster field depending on FAT type */ + if (TRUE/*FatIsFat32(Vcb)*/) + { + /* First cluster is really the first cluster of this volume */ + Dcb->FirstClusterOfFile = Vcb->Bpb.RootDirFirstCluster; + + /* Calculate size of FAT32 root dir */ + Dcb->Header.AllocationSize.LowPart = 0xFFFFFFFF; + //FatLookupFileAllocationSize(IrpContext, Dcb); + DPRINT1("Calculation of a size of a root dir is missing!\n"); + + Dcb->Header.FileSize.QuadPart = Dcb->Header.AllocationSize.QuadPart; + } + else + { +#if 0 + /* Add MCB entry */ + FatAddMcbEntry(Vcb, + &Dcb->Mcb, + 0, + FatRootDirectoryLbo(&Vcb->Bpb), + FatRootDirectorySize(&Vcb->Bpb)); + + /* Set a real size of the root directory */ + Dcb->Header.FileSize.QuadPart = FatRootDirectorySize(&Vcb->Bpb); + Dcb->Header.AllocationSize.QuadPart = Dcb->Header.FileSize.QuadPart; +#endif + UNIMPLEMENTED; + } + + /* Initialize free dirent bitmap */ + RtlInitializeBitMap(&Dcb->Dcb.FreeBitmap, NULL, 0); + + /* Fill the dirent bitmap */ + DPRINT1("Filling the free dirent bitmap is missing\n"); + //FatCheckFreeDirentBitmap( IrpContext, Dcb ); +} + + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Sep 28 20:04:31 2009 @@ -71,6 +71,10 @@ NTSTATUS NTAPI FatDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +VOID NTAPI +FatCreateRootDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb); /* -------------------------------------------------------- create.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Sep 28 20:04:31 2009 @@ -215,9 +215,20 @@ typedef struct _FCB_NAME_LINK { RTL_SPLAY_LINKS Links; - UNICODE_STRING String; + union + { + OEM_STRING Ansi; + UNICODE_STRING String; + } Name; UCHAR Type; } FCB_NAME_LINK, *PFCB_NAME_LINK; + +typedef enum _FCB_CONDITION +{ + FcbGood, + FcbBad, + FcbNeedsToBeVerified +} FCB_CONDITION; typedef struct _FCB { @@ -228,35 +239,47 @@ * FCB into paged and non paged parts * (as it is done in MS implementation */ - FAST_MUTEX HeaderMutex; + FAST_MUTEX HeaderMutex; // nonpaged! SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE Resource; - ERESOURCE PagingIoResource; + ERESOURCE Resource; // nonpaged! + ERESOURCE PagingIoResource; // nonpaged! FILE_LOCK Lock; + /* First cluster in the fat allocation chain */ + ULONG FirstClusterOfFile; + /* A list of all FCBs of that DCB */ + LIST_ENTRY ParentDcbLinks; /* Reference to the Parent Dcb*/ struct _FCB *ParentFcb; /* Pointer to a Vcb */ PVCB Vcb; + /* Fcb state */ + ULONG State; + /* Fcb condition */ + FCB_CONDITION Condition; /* Mcb mapping Vbo->Lbo */ LARGE_MCB Mcb; ULONG FirstCluster; /* Links into FCB Trie */ - FCB_NAME_LINK FileName[0x2]; + FCB_NAME_LINK FileName; /* Buffer for the short name */ WCHAR ShortNameBuffer[0xc]; /* Full file name */ UNICODE_STRING FullFileName; + /* A copy of fat attribute byte */ + UCHAR DirentFatFlags; /* File basic info */ FILE_BASIC_INFORMATION BasicInfo; union { struct { + /* A list of all FCBs/DCBs opened under this DCB */ + LIST_ENTRY ParentDcbList; /* Directory data stream (just handy to have it). */ PFILE_OBJECT StreamFileObject; /* Bitmap to search for free dirents. */ - /* RTL_BITMAP Bitmap; */ + RTL_BITMAP FreeBitmap; PRTL_SPLAY_LINKS SplayLinks; } Dcb; }; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Mon Sep 28 20:04:31 2009 @@ -124,6 +124,9 @@ Status = FatInitializeVcb(IrpContext, &VolumeDevice->Vcb, TargetDeviceObject, Vpb); if (!NT_SUCCESS(Status)) goto FatMountVolumeCleanup; + /* Create root DCB for it */ + FatCreateRootDcb(IrpContext, &VolumeDevice->Vcb); + /* Keep trace of media changes */ VolumeDevice->Vcb.MediaChangeCount = MediaChangeCount;

1 0

[sginsberg] 43206: - Comment fixes
by sginsberg＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: sginsberg Date: Mon Sep 28 20:02:45 2009 New Revision: 43206 URL: http://svn.reactos.org/svn/reactos?rev=43206&view=rev Log: - Comment fixes Modified: trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… ============================================================================== --- trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] Mon Sep 28 20:02:45 2009 @@ -1,4 +1,4 @@ -/* ReactOS DDK +/* ReactOS PSDK/DDK This file is in the public domain. @@ -151,7 +151,7 @@ #endif #endif -/* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */ +/* Make Sure NTDDI_VERSION and _WIN32_WINNT Matches */ #if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \ ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \ ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03)) || \

1 0

[sginsberg] 43205: Hey Arch, how do you expect kernel32 to build with Microsoft's headers if you define a NTDDI_VERSION that conflicts with _WIN32_WINNT and makes sdkddkver.h cry? Remove the conflicting define from the .rbuild and redefine it in the header before including the NDK (this is needed because we need Vista types from the PSDK but require 2003 types from the NDK -- glorious, eh?). Prepare sddkver.h for mingw-w64 import: - Point out the fact that the header is in the public domain. - A
by sginsberg＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: sginsberg Date: Mon Sep 28 19:45:23 2009 New Revision: 43205 URL: http://svn.reactos.org/svn/reactos?rev=43205&view=rev Log: Hey Arch, how do you expect kernel32 to build with Microsoft's headers if you define a NTDDI_VERSION that conflicts with _WIN32_WINNT and makes sdkddkver.h cry? Remove the conflicting define from the .rbuild and redefine it in the header before including the NDK (this is needed because we need Vista types from the PSDK but require 2003 types from the NDK -- glorious, eh?). Prepare sddkver.h for mingw-w64 import: - Point out the fact that the header is in the public domain. - Add some missing stuff, including a NTDDI_VERSION sanity check. - Format fixes, add some comments Modified: trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Mon Sep 28 19:45:23 2009 @@ -16,11 +16,15 @@ #include <windows.h> #include <tlhelp32.h> -#ifdef __GNUC__ -#include "intrin.h" -#endif +/* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 #include <ndk/ntndk.h> + + +#undef NTDDI_WS03SP1 + /* CSRSS Header */ #include <csrss/csrss.h> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Sep 28 19:45:23 2009 @@ -13,7 +13,6 @@ <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> <define name="__NO_CTYPE_INLINES" /> - <define name="NTDDI_VERSION">0x05020100</define> <dependency>errcodes</dependency> <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269 <pch>k32.h</pch> Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… ============================================================================== --- trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] Mon Sep 28 19:45:23 2009 @@ -1,12 +1,31 @@ +/* ReactOS DDK + +This file is in the public domain. + +Header Name: + + sdkddkver.h + +Abstract: + + Version definitions for SDK and DDK. + +--*/ + #ifndef _INC_SDKDDKVER #define _INC_SDKDDKVER -/* Version constants */ +/* _WIN32_WINNT */ #define _WIN32_WINNT_NT4 0x0400 #define _WIN32_WINNT_WIN2K 0x0500 #define _WIN32_WINNT_WINXP 0x0501 #define _WIN32_WINNT_WS03 0x0502 +#define _WIN32_WINNT_WIN6 0x0600 +#define _WIN32_WINNT_VISTA 0x0600 +#define _WIN32_WINNT_WS08 0x0600 #define _WIN32_WINNT_LONGHORN 0x0600 + +/* _WIN32_IE */ #define _WIN32_IE_IE20 0x0200 #define _WIN32_IE_IE30 0x0300 #define _WIN32_IE_IE302 0x0302 @@ -19,6 +38,8 @@ #define _WIN32_IE_IE60SP1 0x0601 #define _WIN32_IE_IE60SP2 0x0603 #define _WIN32_IE_IE70 0x0700 + +/* Mappings Between IE Version and Windows Version */ #define _WIN32_IE_NT4 _WIN32_IE_IE20 #define _WIN32_IE_NT4SP1 _WIN32_IE_IE20 #define _WIN32_IE_NT4SP2 _WIN32_IE_IE20 @@ -39,7 +60,10 @@ #define _WIN32_IE_XPSP2 _WIN32_IE_IE60SP2 #define _WIN32_IE_WS03 0x0602 #define _WIN32_IE_WS03SP1 _WIN32_IE_IE60SP2 +#define _WIN32_IE_WIN6 _WIN32_IE_IE70 #define _WIN32_IE_LONGHORN _WIN32_IE_IE70 + +/* NTDDI_VERSION */ #define NTDDI_WIN2K 0x05000000 #define NTDDI_WIN2KSP1 0x05000100 #define NTDDI_WIN2KSP2 0x05000200 @@ -71,13 +95,23 @@ #define NTDDI_WS08SP3 NTDDI_WIN6SP3 #define NTDDI_WS08SP4 NTDDI_WIN6SP4 +/* Version Fields in NTDDI_VERSION */ +#define OSVERSION_MASK 0xFFFF0000 +#define SPVERSION_MASK 0x0000FF00 +#define SUBVERSION_MASK 0x000000FF + +/* Macros to Extract Version Fields From NTDDI_VERSION */ +#define OSVER(Version) ((Version) & OSVERSION_MASK) +#define SPVER(Version) (((Version) & SPVERSION_MASK) >> 8) +#define SUBVER(Version) (((Version) & SUBVERSION_MASK)) + /* Macros to get the NTDDI for a given WIN32 */ -#define NTDDI_VERSION_FROM_WIN32_WINNT2(ver) ver##0000 -#define NTDDI_VERSION_FROM_WIN32_WINNT(ver) NTDDI_VERSION_FROM_WIN32_WINNT2(ver) +#define NTDDI_VERSION_FROM_WIN32_WINNT2(Version) Version##0000 +#define NTDDI_VERSION_FROM_WIN32_WINNT(Version) NTDDI_VERSION_FROM_WIN32_WINNT2(Version) /* Select Default WIN32_WINNT Value */ #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_) -#define _WIN32_WINNT 0x0600 +#define _WIN32_WINNT 0x0600 #endif /* Choose NTDDI Version */ @@ -117,4 +151,12 @@ #endif #endif +/* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */ +#if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03)) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) +#error NTDDI_VERSION and _WIN32_WINNT mismatch! #endif + +#endif

1 0

[janderwald] 43204: - Implement KSPROPERTY_PIN_NAME properly - KsPinPropertyHandler does *NOT* set Status in the IRP
by janderwald＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: janderwald Date: Mon Sep 28 15:33:17 2009 New Revision: 43204 URL: http://svn.reactos.org/svn/reactos?rev=43204&view=rev Log: - Implement KSPROPERTY_PIN_NAME properly - KsPinPropertyHandler does *NOT* set Status in the IRP Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Mon Sep 28 15:33:17 2009 @@ -174,6 +174,97 @@ return STATUS_SUCCESS; } + +NTSTATUS +KspReadMediaCategory( + IN LPGUID Category, + PKEY_VALUE_PARTIAL_INFORMATION *OutInformation) +{ + UNICODE_STRING MediaPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control\\MediaCategories\\"); + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"Name"); + UNICODE_STRING GuidString, Path; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hKey; + ULONG Size; + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + + /* convert the guid to string */ + Status = RtlStringFromGUID(Category, &GuidString); + if (!NT_SUCCESS(Status)) + return Status; + + /* allocate buffer for the registry key */ + Path.Length = 0; + Path.MaximumLength = MediaPath.MaximumLength + GuidString.MaximumLength; + Path.Buffer = ExAllocatePool(NonPagedPool, Path.MaximumLength); + if (!Path.Buffer) + { + /* not enough memory */ + RtlFreeUnicodeString(&GuidString); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&Path, &MediaPath); + RtlAppendUnicodeStringToString(&Path, &GuidString); + + /* free guid string */ + RtlFreeUnicodeString(&GuidString); + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &Path, OBJ_CASE_INSENSITIVE, NULL, NULL); + + /* open the key */ + Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); + + DPRINT1("ZwOpenKey() status 0x%08lx %S\n", Status, Path.Buffer); + + /* free path buffer */ + ExFreePool(Path.Buffer); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); + return Status; + } + + /* query the name size */ + Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, NULL, 0, &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) + { + /* failed to query for name key */ + ZwClose(hKey); + return Status; + } + + /* allocate buffer to read key info */ + KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ExAllocatePool(NonPagedPool, Size); + if (!KeyInfo) + { + /* not enough memory */ + ZwClose(hKey); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* now read the info */ + Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, (PVOID)KeyInfo, Size, &Size); + + /* close the key */ + ZwClose(hKey); + + if (!NT_SUCCESS(Status)) + { + /* failed to read key */ + ExFreePool(KeyInfo); + return Status; + } + + /* store key information */ + *OutInformation = KeyInfo; + return Status; +} + /* @implemented */ @@ -194,8 +285,8 @@ PVOID Buffer; PKSDATARANGE_AUDIO *WaveFormatOut; PKSDATAFORMAT_WAVEFORMATEX WaveFormatIn; - PULONG GuidBuffer; - static WCHAR Speaker[] = {L"PC-Speaker"}; + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + NTSTATUS Status = STATUS_NOT_SUPPORTED; IoStack = IoGetCurrentIrpStackLocation(Irp); Buffer = Irp->UserBuffer; @@ -207,13 +298,13 @@ case KSPROPERTY_PIN_CTYPES: (*(PULONG)Buffer) = DescriptorsCount; Irp->IoStatus.Information = sizeof(ULONG); - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case KSPROPERTY_PIN_DATAFLOW: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -221,20 +312,20 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_BUFFER_TOO_SMALL; break; } *((KSPIN_DATAFLOW*)Buffer) = Descriptor[Pin->PinId].DataFlow; Irp->IoStatus.Information = sizeof(KSPIN_DATAFLOW); - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case KSPROPERTY_PIN_DATARANGES: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -247,7 +338,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_MORE_ENTRIES; + Status = STATUS_MORE_ENTRIES; break; } @@ -262,14 +353,14 @@ Data = ((PUCHAR)Data + Descriptor[Pin->PinId].DataRanges[Index]->FormatSize); } - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; case KSPROPERTY_PIN_INTERFACES: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -281,7 +372,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_MORE_ENTRIES; + Status = STATUS_MORE_ENTRIES; break; } @@ -299,14 +390,14 @@ RtlMoveMemory((PVOID)(Item + 1), &StandardPinInterface, sizeof(KSPIN_INTERFACE)); } - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; case KSPROPERTY_PIN_MEDIUMS: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -318,7 +409,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_MORE_ENTRIES; + Status = STATUS_MORE_ENTRIES; break; } @@ -336,7 +427,7 @@ RtlMoveMemory((PVOID)(Item + 1), &StandardPinMedium, sizeof(KSPIN_MEDIUM)); } - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; @@ -344,7 +435,7 @@ Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -353,12 +444,12 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_BUFFER_TOO_SMALL; break; } *((KSPIN_COMMUNICATION*)Buffer) = Descriptor[Pin->PinId].Communication; - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; @@ -366,7 +457,7 @@ Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -375,7 +466,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_BUFFER_TOO_SMALL; break; } if (Descriptor[Pin->PinId].Category) @@ -383,7 +474,7 @@ RtlMoveMemory(Buffer, Descriptor[Pin->PinId].Category, sizeof(GUID)); } - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; break; @@ -391,32 +482,45 @@ Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - Irp->IoStatus.Information = 0; - break; - } - - GuidBuffer = Buffer; - Size = sizeof(Speaker); - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) - { - Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_MORE_ENTRIES; - break; - } - - RtlMoveMemory(GuidBuffer, Speaker, sizeof(Speaker)); - - //RtlMoveMemory(Buffer, &Descriptor[Pin->PinId].Name, sizeof(GUID)); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = Size; + Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + break; + } + + if (!Descriptor[Pin->PinId].Category) + { + Irp->IoStatus.Information = 0; + Status = STATUS_SUCCESS; + break; + } + + Status = KspReadMediaCategory((LPGUID)Descriptor[Pin->PinId].Category, &KeyInfo); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + break; + } + + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); + + + if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + { + Status = STATUS_MORE_ENTRIES; + ExFreePool(KeyInfo); + break; + } + + RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); + ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); + ExFreePool(KeyInfo); break; case KSPROPERTY_PIN_PROPOSEDATAFORMAT: Pin = (KSP_PIN*)Property; if (Pin->PinId >= DescriptorsCount) { - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; break; } @@ -424,23 +528,23 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { Irp->IoStatus.Information = Size; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Status = STATUS_BUFFER_TOO_SMALL; break; } if (IoStack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(KSDATAFORMAT_WAVEFORMATEX)) { UNIMPLEMENTED - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - return STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + break; } WaveFormatIn = (PKSDATAFORMAT_WAVEFORMATEX)Buffer; if (!Descriptor[Pin->PinId].DataRanges || !Descriptor[Pin->PinId].DataRangesCount) { - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - return STATUS_UNSUCCESSFUL; + Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + break; } WaveFormatOut = (PKSDATARANGE_AUDIO*)Descriptor[Pin->PinId].DataRanges; for(Index = 0; Index < Descriptor[Pin->PinId].DataRangesCount; Index++) @@ -468,16 +572,16 @@ return STATUS_SUCCESS; } } - Irp->IoStatus.Status = STATUS_NO_MATCH; + Status = STATUS_NO_MATCH; Irp->IoStatus.Information = 0; - return STATUS_NO_MATCH; + break; default: DPRINT1("Unhandled property request %x\n", Property->Id); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; } - return Irp->IoStatus.Status; + return Status; } /*

1 0

[fireball] 43203: [fastfat_new] - Add an internal routine for opening root DCB (a stub for now). - Add code for checking if this is a relative or absolute open. Start implementing absolute opening part.
by fireball＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: fireball Date: Mon Sep 28 13:02:34 2009 New Revision: 43203 URL: http://svn.reactos.org/svn/reactos?rev=43203&view=rev Log: [fastfat_new] - Add an internal routine for opening root DCB (a stub for now). - Add code for checking if this is a relative or absolute open. Start implementing absolute opening part. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Sep 28 13:02:34 2009 @@ -12,6 +12,24 @@ #include "fastfat.h" /* FUNCTIONS *****************************************************************/ + +IO_STATUS_BLOCK +NTAPI +FatiOpenRootDcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFILE_OBJECT FileObject, + IN PVCB Vcb, + IN PACCESS_MASK DesiredAccess, + IN USHORT ShareAccess, + IN ULONG CreateDisposition) +{ + IO_STATUS_BLOCK Iosb; + + DPRINT1("Opening root directory\n"); + + Iosb.Status = STATUS_NOT_IMPLEMENTED; + + return Iosb; +} NTSTATUS NTAPI @@ -36,6 +54,7 @@ PVCB Vcb, DecodedVcb; PFCB Fcb; PCCB Ccb; + PFCB ParentDcb; /* IRP data */ PFILE_OBJECT FileObject; @@ -51,7 +70,7 @@ /* Misc */ NTSTATUS Status; - //IO_STATUS_BLOCK Iosb; + IO_STATUS_BLOCK Iosb; PIO_STACK_LOCATION IrpSp; /* Get current IRP stack location */ @@ -184,10 +203,10 @@ // TODO: Make sure EAs aren't supported on FAT32 + /* Check if it's a volume open request */ if (FileName.Length == 0) { - /* It is a volume open request, check related FO to be sure */ - + /* Test related FO to be sure */ if (!RelatedFO || FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) { @@ -197,6 +216,58 @@ } } + /* Check if this is a relative open */ + if (RelatedFO) + { + // RelatedFO will be a parent directory + UNIMPLEMENTED; + } + else + { + /* Absolute open */ + if ((FileName.Length == sizeof(WCHAR)) && + (FileName.Buffer[0] == L'\\')) + { + /* Check if it's ok to open it */ + if (NonDirectoryFile) + { + DPRINT1("Trying to open root dir as a file\n"); + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + return STATUS_FILE_IS_A_DIRECTORY; + } + + /* Check delete on close on a root dir */ + if (DeleteOnClose) + { + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + return STATUS_CANNOT_DELETE; + } + + /* Call root directory open routine */ + Iosb = FatiOpenRootDcb(IrpContext, + FileObject, + Vcb, + DesiredAccess, + ShareAccess, + CreateDisposition); + + Irp->IoStatus.Information = Iosb.Information; + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + return Iosb.Status; + } + else + { + /* Not a root dir */ + ParentDcb = Vcb->RootDcb; + DPRINT1("ParentDcb %p\n", ParentDcb); + } + } + //return Iosb.Status; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Sep 28 13:02:34 2009 @@ -170,8 +170,9 @@ ULONG RootDirentSectors; LONGLONG BeyondLastClusterInFat; FAT_METHODS Methods; - /* Root Directory Fcb: */ - struct _FCB *RootFcb; + + /* Root Directory Control block */ + struct _FCB *RootDcb; ULONG MediaChangeCount; } VCB, *PVCB;

1 0

[fireball] 43202: [fastfat_new] - Fix wrong comment in FatiCreate, spotted by Ged Murphy. - Add some parameters validation to FatiCreate, and a check for volume open request. - Add node types and a decoding routine. - Implement VCB locking/unlocking.
by fireball＠svn.reactos.org 28 Sep '09

28 Sep '09

Author: fireball Date: Mon Sep 28 12:43:27 2009 New Revision: 43202 URL: http://svn.reactos.org/svn/reactos?rev=43202&view=rev Log: [fastfat_new] - Fix wrong comment in FatiCreate, spotted by Ged Murphy. - Add some parameters validation to FatiCreate, and a check for volume open request. - Add node types and a decoding routine. - Implement VCB locking/unlocking. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Sep 28 12:43:27 2009 @@ -33,7 +33,9 @@ ULONG CreateDisposition; /* Control blocks */ - PVCB Vcb; + PVCB Vcb, DecodedVcb; + PFCB Fcb; + PCCB Ccb; /* IRP data */ PFILE_OBJECT FileObject; @@ -48,8 +50,8 @@ ULONG EaLength; /* Misc */ - //NTSTATUS Status; - IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + //IO_STATUS_BLOCK Iosb; PIO_STACK_LOCATION IrpSp; /* Get current IRP stack location */ @@ -75,14 +77,14 @@ (IrpSp->FileObject->FileName.Buffer[1] == L'\\') && (IrpSp->FileObject->FileName.Buffer[0] == L'\\')) { - /* Remove two leading slashes */ + /* Remove a leading slash */ IrpSp->FileObject->FileName.Length -= sizeof(WCHAR); - RtlMoveMemory(&IrpSp->FileObject->FileName.Buffer[0], &IrpSp->FileObject->FileName.Buffer[1], IrpSp->FileObject->FileName.Length ); - /* If there are two leading slashes again, exit */ + /* Check again: if there are still two leading slashes, + exit with an error */ if ((IrpSp->FileObject->FileName.Length > sizeof(WCHAR)) && (IrpSp->FileObject->FileName.Buffer[1] == L'\\') && (IrpSp->FileObject->FileName.Buffer[0] == L'\\')) @@ -146,6 +148,55 @@ ((CreateDisposition == FILE_OPEN) || (CreateDisposition == FILE_OPEN_IF))); + /* Validate parameters: directory/nondirectory mismatch and + AllocationSize being more than 4GB */ + if ((DirectoryFile && NonDirectoryFile) || + Irp->Overlay.AllocationSize.HighPart != 0) + { + FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER); + + DPRINT1("FatiCreate: STATUS_INVALID_PARAMETER\n", 0); + return STATUS_INVALID_PARAMETER; + } + + /* Acquire the VCB lock exclusively */ + if (!FatAcquireExclusiveVcb(IrpContext, Vcb)) + { + // TODO: Postpone the IRP for later processing + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + } + + // TODO: Verify the VCB + + /* If VCB is locked, then no file openings are possible */ + if (Vcb->State & VCB_STATE_FLAG_LOCKED) + { + DPRINT1("This volume is locked\n"); + Status = STATUS_ACCESS_DENIED; + + /* Cleanup and return */ + FatReleaseVcb(IrpContext, Vcb); + return Status; + } + + // TODO: Check if the volume is write protected and disallow DELETE_ON_CLOSE + + // TODO: Make sure EAs aren't supported on FAT32 + + if (FileName.Length == 0) + { + /* It is a volume open request, check related FO to be sure */ + + if (!RelatedFO || + FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) + { + /* It is indeed a volume open request */ + DPRINT1("Volume open request, not implemented now!\n"); + UNIMPLEMENTED; + } + } + //return Iosb.Status; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Mon Sep 28 12:43:27 2009 @@ -271,4 +271,99 @@ ExQueueWorkItem(&IrpContext->WorkQueueItem, DelayedWorkQueue); } + +TYPE_OF_OPEN +NTAPI +FatDecodeFileObject(IN PFILE_OBJECT FileObject, + OUT PVCB *Vcb, + OUT PFCB *FcbOrDcb, + OUT PCCB *Ccb) +{ + TYPE_OF_OPEN TypeOfOpen = UnopenedFileObject; + PVOID FsContext = FileObject->FsContext; + PVOID FsContext2 = FileObject->FsContext2; + + /* If FsContext is NULL, then everything is NULL */ + if (!FsContext) + { + *Ccb = NULL; + *FcbOrDcb = NULL; + *Vcb = NULL; + + return TypeOfOpen; + } + + /* CCB is always stored in FsContext2 */ + *Ccb = FsContext2; + + /* Switch according to the NodeType */ + switch (FatNodeType(FsContext)) + { + /* Volume */ + case FAT_NTC_VCB: + *FcbOrDcb = NULL; + *Vcb = FsContext; + + TypeOfOpen = ( *Ccb == NULL ? VirtualVolumeFile : UserVolumeOpen ); + + break; + + /* Root or normal directory*/ + case FAT_NTC_ROOT_DCB: + case FAT_NTC_DCB: + *FcbOrDcb = FsContext; + *Vcb = (*FcbOrDcb)->Vcb; + + TypeOfOpen = (*Ccb == NULL ? DirectoryFile : UserDirectoryOpen); + + DPRINT1("Referencing a directory: %Z\n", &(*FcbOrDcb)->FullFileName); + break; + + /* File */ + case FAT_NTC_FCB: + *FcbOrDcb = FsContext; + *Vcb = (*FcbOrDcb)->Vcb; + + TypeOfOpen = (*Ccb == NULL ? EaFile : UserFileOpen); + + DPRINT1("Referencing a file: %Z\n", &(*FcbOrDcb)->FullFileName); + + break; + + default: + DPRINT1("Unknown node type %x\n", FatNodeType(FsContext)); + ASSERT(FALSE); + } + + return TypeOfOpen; +} + + +BOOLEAN +NTAPI +FatAcquireExclusiveVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb) +{ + /* Acquire VCB's resource if possible */ + if (ExAcquireResourceExclusiveLite(&Vcb->Resource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return TRUE; + } + else + { + return FALSE; + } +} + +VOID +NTAPI +FatReleaseVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb) +{ + /* Release VCB's resource */ + ExReleaseResourceLite(&Vcb->Resource); +} + + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Sep 28 12:43:27 2009 @@ -132,6 +132,20 @@ PIRP Irp OPTIONAL, NTSTATUS Status); +BOOLEAN NTAPI +FatAcquireExclusiveVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb); + +VOID NTAPI +FatReleaseVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb); + +TYPE_OF_OPEN +NTAPI +FatDecodeFileObject(IN PFILE_OBJECT FileObject, + OUT PVCB *Vcb, + OUT PFCB *FcbOrDcb, + OUT PCCB *Ccb); /* --------------------------------------------------------- lock.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Mon Sep 28 12:43:27 2009 @@ -489,6 +489,12 @@ Vcb->Header.ValidDataLength.HighPart = MAXLONG; Vcb->Header.ValidDataLength.LowPart = MAXULONG; + /* Set VCB to a good condition */ + Vcb->Condition = VcbGood; + + /* Initialize VCB's resource */ + ExInitializeResourceLite(&Vcb->Resource); + /* Initialize CC */ CcInitializeCacheMap(Vcb->StreamFileObject, (PCC_FILE_SIZES)&Vcb->Header.AllocationSize, Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Sep 28 12:43:27 2009 @@ -7,6 +7,18 @@ typedef PVOID PBCB; typedef NTSTATUS (*PFAT_OPERATION_HANDLER) (PFAT_IRP_CONTEXT); + +/* Node type stuff */ +typedef CSHORT FAT_NODE_TYPE; +typedef FAT_NODE_TYPE *PFAT_NODE_TYPE; + +#define FatNodeType(Ptr) (*((PFAT_NODE_TYPE)(Ptr))) + +/* Node type codes */ +#define FAT_NTC_VCB (CSHORT) '00VF' +#define FAT_NTC_FCB (CSHORT) 'CF' +#define FAT_NTC_DCB (CSHORT) 'DF' +#define FAT_NTC_ROOT_DCB (CSHORT) 'RFD' typedef struct _FAT_GLOBAL_DATA { @@ -116,7 +128,14 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define FAT_NTC_VCB (USHORT) '00VF' +#define VCB_STATE_FLAG_LOCKED 0x01 + +typedef enum _VCB_CONDITION +{ + VcbGood, + VcbNotMounted, + VcbBad +} VCB_CONDITION; /* Volume Control Block */ typedef struct _VCB @@ -129,6 +148,9 @@ PDEVICE_OBJECT TargetDeviceObject; LIST_ENTRY VcbLinks; PVPB Vpb; + ULONG State; + VCB_CONDITION Condition; + ERESOURCE Resource; /* Notifications support */ PNOTIFY_SYNC NotifySync; @@ -196,9 +218,6 @@ UCHAR Type; } FCB_NAME_LINK, *PFCB_NAME_LINK; -#define FAT_NTC_FCB (USHORT) 'CF' -#define FAT_NTC_DCB (USHORT) 'DF' - typedef struct _FCB { FSRTL_ADVANCED_FCB_HEADER Header; @@ -225,6 +244,8 @@ FCB_NAME_LINK FileName[0x2]; /* Buffer for the short name */ WCHAR ShortNameBuffer[0xc]; + /* Full file name */ + UNICODE_STRING FullFileName; /* File basic info */ FILE_BASIC_INFORMATION BasicInfo; union @@ -285,6 +306,16 @@ UCHAR Flags; } CCB, *PCCB; +typedef enum _TYPE_OF_OPEN +{ + UnopenedFileObject, + UserFileOpen, + UserDirectoryOpen, + UserVolumeOpen, + VirtualVolumeFile, + DirectoryFile, + EaFile +} TYPE_OF_OPEN; #define CCB_SEARCH_RETURN_SINGLE_ENTRY 0x01 #define CCB_SEARCH_PATTERN_LEGAL_8DOT3 0x02

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs