Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 39042: sync cryptnet with wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 23 06:45:09 2009 New Revision: 39042 URL: http://svn.reactos.org/svn/reactos?rev=39042&view=rev Log: sync cryptnet with wine 1.1.13 Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Fri Jan 23 06:45:09 2009 @@ -136,7 +136,7 @@ LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) { - PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvPara; + PCCERT_CONTEXT cert = pvPara; PCERT_EXTENSION ext; BOOL ret = FALSE; @@ -686,7 +686,7 @@ switch (status) { case INTERNET_STATUS_REQUEST_COMPLETE: - result = (LPINTERNET_ASYNC_RESULT)statusInfo; + result = statusInfo; context->error = result->dwError; SetEvent(context->event); } @@ -1244,17 +1244,17 @@ { case CERT_QUERY_CONTENT_CERT: if (!CertAddCertificateContextToStore(store, - (PCCERT_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; case CERT_QUERY_CONTENT_CRL: if (!CertAddCRLContextToStore(store, - (PCCRL_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; case CERT_QUERY_CONTENT_CTL: if (!CertAddCTLContextToStore(store, - (PCCTL_CONTEXT)context, CERT_STORE_ADD_ALWAYS, NULL)) + context, CERT_STORE_ADD_ALWAYS, NULL)) ret = FALSE; break; default: @@ -1327,7 +1327,7 @@ static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) { - PCCERT_CONTEXT cert = (PCCERT_CONTEXT)pvObject; + PCCERT_CONTEXT cert = pvObject; *expiration = cert->pCertInfo->NotAfter; return TRUE; @@ -1335,7 +1335,7 @@ static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) { - PCCRL_CONTEXT cert = (PCCRL_CONTEXT)pvObject; + PCCRL_CONTEXT cert = pvObject; *expiration = cert->pCrlInfo->NextUpdate; return TRUE; @@ -1343,7 +1343,7 @@ static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) { - PCCTL_CONTEXT cert = (PCCTL_CONTEXT)pvObject; + PCCTL_CONTEXT cert = pvObject; *expiration = cert->pCtlInfo->NextUpdate; return TRUE; @@ -1518,7 +1518,7 @@ PCRL_ENTRY entry = NULL; CertFindCertificateInCRL( - (PCCERT_CONTEXT)rgpvContext[i], crl, 0, NULL, + rgpvContext[i], crl, 0, NULL, &entry); if (entry) {

15 years, 7 months

[fireball] 39041: - Stubplement SwapSplayLinks helper function, and make RtlDelete call it. - Fix a few lines having TABs instead of SPACEs.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 06:20:37 2009 New Revision: 39041 URL: http://svn.reactos.org/svn/reactos?rev=39041&view=rev Log: - Stubplement SwapSplayLinks helper function, and make RtlDelete call it. - Fix a few lines having TABs instead of SPACEs. Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=39… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Fri Jan 23 06:20:37 2009 @@ -15,6 +15,13 @@ /* FUNCTIONS ***************************************************************/ +VOID +SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, + PRTL_SPLAY_LINKS LinkB) +{ + DPRINT1("UNIMPLEMENTED!\n"); +} + /* * @implemented */ @@ -32,8 +39,7 @@ SP = RtlSubtreePredecessor(N); /* Swap it with N, this will guarantee that N will have only a child */ - //SwapSplayLinks(SP, N); - DPRINT1("UNIMPLEMENTED!\n"); + SwapSplayLinks(SP, N); } /* Check if we have no children */ @@ -103,12 +109,10 @@ */ VOID NTAPI -RtlDeleteNoSplay ( - PRTL_SPLAY_LINKS Links, - PRTL_SPLAY_LINKS *Root - ) -{ - UNIMPLEMENTED; +RtlDeleteNoSplay(PRTL_SPLAY_LINKS Links, + PRTL_SPLAY_LINKS *Root) +{ + UNIMPLEMENTED; } /* @@ -508,8 +512,8 @@ } } - /* Return the root entry */ - return N; + /* Return the root entry */ + return N; } /*

15 years, 7 months

[pschweitzer] 39040: Added notifications stuff to VCB

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jan 23 06:18:38 2009 New Revision: 39040 URL: http://svn.reactos.org/svn/reactos?rev=39040&view=rev Log: Added notifications stuff to VCB Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h 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] Fri Jan 23 06:18:38 2009 @@ -593,6 +593,10 @@ goto FatInitializeVcbCleanup; } + /* Set up notifications */ + FsRtlNotifyInitializeSync(&Vcb->NotifySync); + InitializeListHead(&Vcb->NotifyList); + /* Call helper function */ FatiInitializeVcb(Vcb); @@ -623,6 +627,9 @@ Vcb->VolumeFileObject = NULL; } + /* Free notifications stuff */ + FsRtlNotifyUninitializeSync(&Vcb->NotifySync); + /* Unlink from global Vcb list. */ RemoveEntryList(&Vcb->VcbLinks); 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] Fri Jan 23 06:18:38 2009 @@ -90,6 +90,10 @@ PFILE_OBJECT VolumeFileObject; PDEVICE_OBJECT TargetDeviceObject; LIST_ENTRY VcbLinks; + + /* Notifications support */ + PNOTIFY_SYNC NotifySync; + LIST_ENTRY NotifyList; /* Volume Characteristics: */ ULONG SerialNumber;

15 years, 7 months

[fireball] 39039: Christoph von Wittich - Fix a typo: dereference target device object instead of referencing it in an uninit routine.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 05:04:05 2009 New Revision: 39039 URL: http://svn.reactos.org/svn/reactos?rev=39039&view=rev Log: Christoph von Wittich - Fix a typo: dereference target device object instead of referencing it in an uninit routine. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.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] Fri Jan 23 05:04:05 2009 @@ -627,7 +627,7 @@ RemoveEntryList(&Vcb->VcbLinks); /* Release Target Device */ - ObReferenceObject(Vcb->TargetDeviceObject); + ObDereferenceObject(Vcb->TargetDeviceObject); Vcb->TargetDeviceObject = NULL; }

15 years, 7 months

[fireball] 39038: [FORMATTING] - Bring formatting closer to ReactOS kernelmode style.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 05:01:59 2009 New Revision: 39038 URL: http://svn.reactos.org/svn/reactos?rev=39038&view=rev Log: [FORMATTING] - Bring formatting closer to ReactOS kernelmode style. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.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] Fri Jan 23 05:01:59 2009 @@ -28,93 +28,80 @@ ((ULONG) ((xOffset - (xVcb)->DataArea) >> (xVcb)->BytesPerClusterLog) + 0x02) ULONG -FatScanFat12ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait); - -ULONG -FatSetFat12ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat12ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat12ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatScanFat16ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait); - -ULONG -FatSetFat16ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat16ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat16ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatScanFat32ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait); - -ULONG -FatSetFat32ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat32ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat32ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); +FatScanFat12ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat12ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); BOOLEAN NTAPI -FatValidBpb( - IN PBIOS_PARAMETER_BLOCK Bpb); +FatValidBpb(IN PBIOS_PARAMETER_BLOCK Bpb); /* VARIABLES ****************************************************************/ FAT_METHODS Fat12Methods = { @@ -139,10 +126,7 @@ }; /* FUNCTIONS ****************************************************************/ -FORCEINLINE -ULONG -FatPowerOfTwo( - ULONG Number) + /* * FUNCTION: * Determines the index of the set bit. @@ -150,6 +134,10 @@ * Number = Number having a single bit set. * RETURNS: Index of the set bit. */ +FORCEINLINE +ULONG +FatPowerOfTwo( + ULONG Number) { ULONG Temp; Temp = Number @@ -159,90 +147,77 @@ } ULONG -FatScanFat12ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat12ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat12ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat12ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat16ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat16ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat16ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat16ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat32ForContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait) +FatScanFat12ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat12ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + /* * FUNCTION: * Scans FAT32 for continous chain of clusters @@ -255,22 +230,24 @@ * RETURNS: Value of the last claster terminated the scan. * NOTES: Raises STATUS_CANT_WAIT race condition. */ +ULONG +FatScanFat32ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) { LONGLONG PageOffset; SIZE_T OffsetWithinPage, PageValidLength; PULONG Entry, BeyoudLastEntry; - /* - * Determine page offset and the offset within page + /* Determine page offset and the offset within page * for the first cluster. */ PageValidLength = PAGE_SIZE; PageOffset = ((LONGLONG) *Index) << 0x2; OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); PageOffset -= OffsetWithinPage; - /* - * Check if the context already has the required page mapped. - * Map the first page is necessary. - */ + /* Check if the context already has the required page mapped. + * Map the first page is necessary. + */ if (PageOffset != Context->PageOffset.QuadPart) { Context->PageOffset.QuadPart = PageOffset; @@ -279,17 +256,19 @@ CcUnpinData(Context->PageBcb); Context->PageBcb = NULL; } - if (!CcMapData(Context->FileObject, &Context->PageOffset, - PAGE_SIZE, CanWait, &Context->PageBcb, &Context->PageBuffer)) - { + if (!CcMapData(Context->FileObject, + &Context->PageOffset, + PAGE_SIZE, + CanWait, + &Context->PageBcb, + &Context->PageBuffer)) + { Context->PageOffset.QuadPart = 0LL; ExRaiseStatus(STATUS_CANT_WAIT); } } Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PULONG); - /* - * Next Page Offset. - */ + /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; if (PageOffset > Context->BeyoundLastEntryOffset) PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset @@ -299,19 +278,15 @@ { do { - if ((*Entry & FAT_CLUSTER_LAST) != ++(*Index) ) + if ((*Entry & FAT_CLUSTER_LAST) != ++(*Index)) return (*Entry & FAT_CLUSTER_LAST); - } - while (++Entry < BeyoudLastEntry); - /* - * Check if this is the last available entry. - */ + } while (++Entry < BeyoudLastEntry); + /* Check if this is the last available entry */ if (PageValidLength < PAGE_SIZE) break; - /* - * We are getting beyound current page and - * are still in the continous run, map the next page. - */ + /* We are getting beyound current page and + * are still in the continous run, map the next page. + */ Context->PageOffset.QuadPart = PageOffset; CcUnpinData(Context->PageBcb); if (!CcMapData(Context->FileObject, @@ -323,9 +298,7 @@ ExRaiseStatus(STATUS_CANT_WAIT); } Entry = (PULONG) Context->PageBuffer; - /* - * Next Page Offset. - */ + /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; if (PageOffset > Context->BeyoundLastEntryOffset) PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset @@ -336,45 +309,33 @@ } ULONG -FatSetFat32ContinousRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat32ForValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat32ValueRun( - IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat( - IN PFCB Fcb, - IN LONGLONG Vbo, - OUT PLONGLONG Lbo, - IN OUT PLONGLONG Length, - OUT PULONG Index, - IN BOOLEAN CanWait -) +FatSetFat32ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat32ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat32ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + /* * FUNCTION: * Queries file MCB for the specified region [Vbo, Vbo + Length], @@ -395,37 +356,36 @@ * NOTES: Should be called by I/O routines to split the I/O operation * into sequential or parallel I/O operations. */ +ULONG +FatScanFat(IN PFCB Fcb, + IN LONGLONG Vbo, + OUT PLONGLONG Lbo, + IN OUT PLONGLONG Length, + OUT PULONG Index, + IN BOOLEAN CanWait) { LONGLONG CurrentLbo, CurrentVbo, BeyoundLastVbo, CurrentLength; ULONG Entry, NextEntry, NumberOfEntries, CurrentIndex; FAT_SCAN_CONTEXT Context; PVCB Vcb; - /* - * Some often used values - */ + /* Some often used values */ Vcb = Fcb->Vcb; CurrentIndex = 0; BeyoundLastVbo = Vbo + *Length; CurrentLength = ((LONGLONG) Vcb->Clusters) << Vcb->BytesPerClusterLog; if (BeyoundLastVbo > CurrentLength) BeyoundLastVbo = CurrentLength; - /* - * Try to locate first run. - */ + /* Try to locate first run */ if (FsRtlLookupLargeMcbEntry(&Fcb->Mcb, Vbo, Lbo, Length, NULL, NULL, Index)) { - /* - * Check if we have a single mapped run. - */ + /* Check if we have a single mapped run */ if (Vbo >= BeyoundLastVbo) goto FatScanFcbFatExit; } else { *Length = 0L; } - /* - * Get the first scan startup values. - */ + /* Get the first scan startup values */ if (FsRtlLookupLastLargeMcbEntryAndIndex( &Fcb->Mcb, &CurrentVbo, &CurrentLbo, &CurrentIndex)) { @@ -433,9 +393,7 @@ } else { - /* - * Map is empty, set up initial values. - */ + /* Map is empty, set up initial values */ Entry = Fcb->FirstCluster; if (Entry <= 0x2) ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); @@ -452,16 +410,12 @@ Context.FileObject = Vcb->VolumeFileObject; while (CurrentVbo < BeyoundLastVbo) { - /* - * Locate Continous run starting with the current entry. - */ + /* Locate Continous run starting with the current entry */ NumberOfEntries = Entry; NextEntry = Vcb->Methods.ScanContinousRun( &Context, &NumberOfEntries, CanWait); NumberOfEntries -= Entry; - /* - * Check value that terminated the for being valid for FAT. - */ + /* Check value that terminated the for being valid for FAT */ if (NextEntry <= 0x2) ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); if (NextEntry >= Vcb->Clusters) @@ -470,18 +424,14 @@ ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); break; } - /* - * Add new run. - */ + /* Add new run */ CurrentLength = ((LONGLONG) NumberOfEntries) << Vcb->BytesPerClusterLog; FsRtlAddLargeMcbEntry(&Fcb->Mcb, CurrentVbo, FatEntryToDataOffset(Entry, Vcb), CurrentLength); - /* - * Setup next iteration. - */ + /* Setup next iteration */ Entry = NextEntry; CurrentVbo += CurrentLength; CurrentIndex ++; @@ -501,8 +451,7 @@ BOOLEAN NTAPI -FatValidBpb( - IN PBIOS_PARAMETER_BLOCK Bpb) +FatValidBpb(IN PBIOS_PARAMETER_BLOCK Bpb) { return (FatValidBytesPerSector(Bpb->BytesPerSector) && FatValidSectorsPerCluster(Bpb->SectorsPerCluster) @@ -524,8 +473,7 @@ } VOID -FatiInitializeVcb( - PVCB Vcb) +FatiInitializeVcb(PVCB Vcb) { ULONG ClustersCapacity; @@ -565,10 +513,9 @@ } NTSTATUS -FatInitializeVcb( - IN PVCB Vcb, - IN PDEVICE_OBJECT TargetDeviceObject, - IN PVPB Vpb) +FatInitializeVcb(IN PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb) { NTSTATUS Status; PBCB Bcb; @@ -577,13 +524,12 @@ RtlZeroMemory(Vcb, sizeof(*Vcb)); - /* - * Initialize list head, so that it will - * not fail in cleanup. - */ + /* Initialize list head, so that it will + * not fail in cleanup. + */ InitializeListHead(&Vcb->VcbLinks); - /* Setup FCB Header. */ + /* Setup FCB Header */ Vcb->Header.NodeTypeCode = FAT_NTC_VCB; Vcb->Header.NodeByteSize = sizeof(*Vcb); @@ -591,55 +537,54 @@ Vcb->TargetDeviceObject = TargetDeviceObject; ObReferenceObject(TargetDeviceObject); - /* Setup FCB Header. */ + /* Setup FCB Header */ ExInitializeFastMutex(&Vcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Vcb->Header, &Vcb->HeaderMutex); - /* Create Volume File Object. */ + /* Create Volume File Object */ Vcb->VolumeFileObject = IoCreateStreamFileObject(NULL, - Vcb->TargetDeviceObject); - - /* We have to setup all FCB fields needed for CC. */ + Vcb->TargetDeviceObject); + + /* We have to setup all FCB fields needed for CC */ Vcb->VolumeFileObject->FsContext = Vcb; Vcb->VolumeFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; - - /* At least full boot sector should be available. */ + /* At least full boot sector should be available */ Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); Vcb->Header.AllocationSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); Vcb->Header.ValidDataLength.HighPart = MAXLONG; Vcb->Header.ValidDataLength.LowPart = MAXULONG; - /* Initialize CC. */ + /* Initialize CC */ CcInitializeCacheMap(Vcb->VolumeFileObject, - (PCC_FILE_SIZES) &Vcb->Header.AllocationSize, - FALSE, - &FatGlobalData.CacheMgrNoopCallbacks, - Vcb); + (PCC_FILE_SIZES)&Vcb->Header.AllocationSize, + FALSE, + &FatGlobalData.CacheMgrNoopCallbacks, + Vcb); /* Read boot sector */ - Offset.QuadPart = 0; - Bcb = NULL; - /* - * Note: Volume Read path does not require - * any of the parameters set further - * in this routine. - */ + Offset.QuadPart = 0; + Bcb = NULL; + + /* Note: Volume Read path does not require + * any of the parameters set further + * in this routine. + */ if (CcMapData(Vcb->VolumeFileObject, - &Offset, - sizeof(PACKED_BOOT_SECTOR), - TRUE, - &Bcb, - &Buffer)) + &Offset, + sizeof(PACKED_BOOT_SECTOR), + TRUE, + &Bcb, + &Buffer)) { PPACKED_BOOT_SECTOR BootSector = (PPACKED_BOOT_SECTOR) Buffer; FatUnpackBios(&Vcb->Bpb, &BootSector->PackedBpb); - if (!(FatBootSectorJumpValid(BootSector->Jump) - && FatValidBpb(&Vcb->Bpb))) + if (!(FatBootSectorJumpValid(BootSector->Jump) && + FatValidBpb(&Vcb->Bpb))) { Status = STATUS_UNRECOGNIZED_VOLUME; } - CopyUchar4( &Vpb->SerialNumber, BootSector->Id ); + CopyUchar4(&Vpb->SerialNumber, BootSector->Id); CcUnpinData(Bcb); } else @@ -647,7 +592,10 @@ Status = STATUS_UNRECOGNIZED_VOLUME; goto FatInitializeVcbCleanup; } + + /* Call helper function */ FatiInitializeVcb(Vcb); + /* Add this Vcb to grobal Vcb list. */ InsertTailList(&FatGlobalData.VcbListHead, &Vcb->VcbLinks); return STATUS_SUCCESS; @@ -660,8 +608,7 @@ } VOID -FatUninitializeVcb( - IN PVCB Vcb) +FatUninitializeVcb(IN PVCB Vcb) { LARGE_INTEGER ZeroSize; @@ -675,6 +622,7 @@ ObDereferenceObject(Vcb->VolumeFileObject); Vcb->VolumeFileObject = NULL; } + /* Unlink from global Vcb list. */ RemoveEntryList(&Vcb->VcbLinks);

15 years, 7 months

[cwittich] 39037: fix stdole2 dependencies

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 23 04:48:53 2009 New Revision: 39037 URL: http://svn.reactos.org/svn/reactos?rev=39037&view=rev Log: fix stdole2 dependencies Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/oleaut… ============================================================================== --- trunk/rostests/winetests/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/oleaut32.rbuild [iso-8859-1] Fri Jan 23 04:48:53 2009 @@ -30,15 +30,17 @@ <dependency>tmarshal_header</dependency> <dependency>tmarshal</dependency> <dependency>test_tlb</dependency> - <dependency>stdole2.tlb</dependency> </module> <module name="tmarshal_header" type="idlheader"> + <dependency>stdole2</dependency> <file>tmarshal.idl</file> </module> <module name="test_tlb" type="embeddedtypelib" allowwarnings="true"> + <dependency>stdole2</dependency> <file>test_tlb.idl</file> </module> <module name="tmarshal" type="embeddedtypelib" allowwarnings="true"> + <dependency>stdole2</dependency> <file>tmarshal.idl</file> </module> </group>

15 years, 7 months

[fireball] 39036: [FORMATTING] - Bring formatting closer to ReactOS kernelmode style. - Fix a typo in a variable name.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 04:47:32 2009 New Revision: 39036 URL: http://svn.reactos.org/svn/reactos?rev=39036&view=rev Log: [FORMATTING] - Bring formatting closer to ReactOS kernelmode style. - Fix a typo in a variable name. Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] Fri Jan 23 04:47:32 2009 @@ -44,7 +44,8 @@ PWCHAR FileName; } FAT_ENUM_DIR_CONTEXT; -typedef enum _FILE_TIME_INDEX { +typedef enum _FILE_TIME_INDEX +{ FileCreationTime = 0, FileLastAccessTime, FileLastWriteTime, @@ -52,82 +53,70 @@ } FILE_TIME_INDEX; VOID -FatQueryFileTimes( - OUT PLARGE_INTEGER FileTimes, - IN PDIR_ENTRY Dirent); +FatQueryFileTimes(OUT PLARGE_INTEGER FileTimes, + IN PDIR_ENTRY Dirent); VOID -Fat8dot3ToUnicodeString( - OUT PUNICODE_STRING FileName, - IN PUCHAR ShortName, - IN UCHAR Flags); - -ULONG -FatDirentToDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToFullDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToIdFullDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToBothDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToIdBothDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToNamesInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); - -ULONG -FatDirentToObjectIdInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer); +Fat8dot3ToUnicodeString(OUT PUNICODE_STRING FileName, + IN PUCHAR ShortName, + IN UCHAR Flags); + +ULONG +FatDirentToDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); /* FUNCTIONS *****************************************************************/ FORCEINLINE VOID -FatDateTimeToSystemTime( - OUT PLARGE_INTEGER SystemTime, - IN PFAT_DATETIME FatDateTime, - IN UCHAR TenMs OPTIONAL) +FatDateTimeToSystemTime(OUT PLARGE_INTEGER SystemTime, + IN PFAT_DATETIME FatDateTime, + IN UCHAR TenMs OPTIONAL) { TIME_FIELDS TimeFields; - /* - * Setup time fields. - */ + /* Setup time fields */ TimeFields.Year = FatDateTime->Date.Year + 1980; TimeFields.Month = FatDateTime->Date.Month; TimeFields.Day = FatDateTime->Date.Day; TimeFields.Hour = FatDateTime->Time.Hour; TimeFields.Minute = FatDateTime->Time.Minute; TimeFields.Second = (FatDateTime->Time.DoubleSeconds << 1); - /* - * Adjust up to 10 milliseconds - * if the parameter was supplied - */ + + /* Adjust up to 10 milliseconds + * if the parameter was supplied + */ if (ARGUMENT_PRESENT(TenMs)) { TimeFields.Second += TenMs / 100; @@ -137,17 +126,15 @@ { TimeFields.Milliseconds = 0; } - /* - * Fix seconds value that might get beyoud the bound. - */ - if (TimeFields.Second > 59) - TimeFields.Second = 0; - /* - * Perform ceonversion to system time if possible. - */ - if (RtlTimeFieldsToTime(&TimeFields, SystemTime)) { + + /* Fix seconds value that might get beyoud the bound */ + if (TimeFields.Second > 59) TimeFields.Second = 0; + + /* Perform ceonversion to system time if possible */ + if (RtlTimeFieldsToTime(&TimeFields, SystemTime)) + { /* Convert to system time */ - ExLocalTimeToSystemTime( SystemTime, SystemTime ); + ExLocalTimeToSystemTime(SystemTime, SystemTime); } else { @@ -157,20 +144,16 @@ } VOID -FatQueryFileTimes( - OUT PLARGE_INTEGER FileTimes, - IN PDIR_ENTRY Dirent) -{ - /* - * Convert LastWriteTime - */ - FatDateTimeToSystemTime( - &FileTimes[FileLastWriteTime], - &Dirent->LastWriteDateTime, 0); - /* - * All other time fileds are valid (according to MS) - * only if Win31 compatability mode is set. - */ +FatQueryFileTimes(OUT PLARGE_INTEGER FileTimes, + IN PDIR_ENTRY Dirent) +{ + /* Convert LastWriteTime */ + FatDateTimeToSystemTime(&FileTimes[FileLastWriteTime], + &Dirent->LastWriteDateTime, + 0); + /* All other time fileds are valid (according to MS) + * only if Win31 compatability mode is set. + */ if (FatGlobalData.Win31FileSystem) { /* We can avoid calling conversion routine @@ -194,10 +177,9 @@ else { /* Perform conversion */ - FatDateTimeToSystemTime( - &FileTimes[FileCreationTime], - &Dirent->CreationDateTime, - Dirent->CreationTimeTenMs); + FatDateTimeToSystemTime(&FileTimes[FileCreationTime], + &Dirent->CreationDateTime, + Dirent->CreationTimeTenMs); } if (Dirent->LastAccessDate.Value == 0) { @@ -217,18 +199,17 @@ LastAccessDateTime.Date.Value = Dirent->LastAccessDate.Value; LastAccessDateTime.Time.Value = 0; - FatDateTimeToSystemTime( - &FileTimes[FileLastAccessTime], - &LastAccessDateTime, 0); + FatDateTimeToSystemTime(&FileTimes[FileLastAccessTime], + &LastAccessDateTime, + 0); } } } VOID -Fat8dot3ToUnicodeString( - OUT PUNICODE_STRING FileName, - IN PUCHAR ShortName, - IN UCHAR Flags) +Fat8dot3ToUnicodeString(OUT PUNICODE_STRING FileName, + IN PUCHAR ShortName, + IN UCHAR Flags) { PCHAR Name; UCHAR Index, Ext = 0; @@ -237,11 +218,11 @@ Name = Add2Ptr(FileName->Buffer, 0x0c, PCHAR); RtlCopyMemory(Name, ShortName, 0x0b); - /* Restore the name byte used to mark deleted entries. */ + /* Restore the name byte used to mark deleted entries */ if (Name[0] == 0x05) Name[0] |= 0xe0; - /* Locate the end of name part. */ + /* Locate the end of name part */ for (Index = 0; Index < 0x08 && Name[Index] != 0x20; Index++); @@ -260,6 +241,7 @@ Index ++; Ext ++; } } + /* Perform Oem to Unicode conversion. */ Oem.Buffer = Name; Oem.Length = Index; @@ -279,32 +261,28 @@ { /* Set extension for downcase */ Oem.Length = Ext * sizeof(WCHAR); - Oem.Buffer = Add2Ptr( - FileName->Buffer, - FileName->Length - Oem.Length, - PSTR); + Oem.Buffer = Add2Ptr(FileName->Buffer, + FileName->Length - Oem.Length, + PSTR); } else { /* Set base name for downcase */ Oem.Buffer = (PSTR) FileName->Buffer; - Oem.Length = FileName->Length - - Ext * sizeof(WCHAR); + Oem.Length = FileName->Length - Ext * sizeof(WCHAR); } Oem.MaximumLength = Oem.Length; - RtlUpcaseUnicodeString( - (PUNICODE_STRING)&Oem, - (PUNICODE_STRING)&Oem, - FALSE); - } - } -} - -ULONG -FatDirentToDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) + RtlUpcaseUnicodeString((PUNICODE_STRING)&Oem, + (PUNICODE_STRING)&Oem, + FALSE); + } + } +} + +ULONG +FatDirentToDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_DIRECTORY_INFORMATION Info; //UNICODE_STRING FileName; @@ -324,10 +302,9 @@ // FatQueryShortName(&FileName, Dirent); // Info->ShortNameLength = (CCHAR) FileName.Length; Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ + /* Associate LFN buffer and length pointers + * of this entry with the context. + */ Context->NextEntryOffset = &Info->NextEntryOffset; Context->FileName = Info->FileName; Context->FileNameLength = &Info->FileNameLength; @@ -335,10 +312,9 @@ } ULONG -FatDirentToFullDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_FULL_DIR_INFORMATION Info; //UNICODE_STRING FileName; @@ -369,10 +345,9 @@ } ULONG -FatDirentToIdFullDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_ID_FULL_DIR_INFORMATION Info; //UNICODE_STRING FileName; @@ -403,10 +378,9 @@ } ULONG -FatDirentToBothDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_BOTH_DIR_INFORMATION Info; UNICODE_STRING FileName; @@ -426,10 +400,9 @@ Fat8dot3ToUnicodeString(&FileName, Dirent->FileName, Dirent->Case); Info->ShortNameLength = (CCHAR) FileName.Length; Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ + /* Associate LFN buffer and length pointers + * of this entry with the context. + */ Context->NextEntryOffset = &Info->NextEntryOffset; Context->FileName = Info->FileName; Context->FileNameLength = &Info->FileNameLength; @@ -437,10 +410,9 @@ } ULONG -FatDirentToIdBothDirInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_ID_BOTH_DIR_INFORMATION Info; UNICODE_STRING FileName; @@ -471,20 +443,18 @@ } ULONG -FatDirentToNamesInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_NAMES_INFORMATION Info; Info = (PFILE_NAMES_INFORMATION) Buffer; // FatQueryShortName(&FileName, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ + /* Associate LFN buffer and length pointers + * of this entry with the context. + */ Context->NextEntryOffset = &Info->NextEntryOffset; Context->FileName = Info->FileName; Context->FileNameLength = &Info->FileNameLength; @@ -492,10 +462,9 @@ } ULONG -FatDirentToObjectIdInfo( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN PDIR_ENTRY Dirent, - IN PVOID Buffer) +FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) { PFILE_OBJECTID_INFORMATION Info; @@ -504,26 +473,23 @@ } ULONG -FatEnumerateDirents( - IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN ULONG Index, - IN BOOLEAN CanWait) +FatEnumerateDirents(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN ULONG Index, + IN BOOLEAN CanWait) { LONGLONG PageOffset; SIZE_T OffsetWithinPage, PageValidLength; - PUCHAR Entry, BeyoudLastEntry; - /* - * Determine page offset and the offset within page - * for the first cluster. - */ + PUCHAR Entry, BeyondLastEntry; + /* Determine page offset and the offset within page + * for the first cluster. + */ PageValidLength = PAGE_SIZE; PageOffset = ((LONGLONG) Index) << BYTES_PER_DIRENT_LOG; OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); PageOffset -= OffsetWithinPage; - /* - * Check if the context already has the required page mapped. - * Map the first page is necessary. - */ + /* Check if the context already has the required page mapped. + * Map the first page is necessary. + */ if (PageOffset != Context->PageOffset.QuadPart) { Context->PageOffset.QuadPart = PageOffset; @@ -532,24 +498,28 @@ CcUnpinData(Context->PageBcb); Context->PageBcb = NULL; } - if (!CcMapData(Context->FileObject, &Context->PageOffset, - PAGE_SIZE, CanWait, &Context->PageBcb, &Context->PageBuffer)) + if (!CcMapData(Context->FileObject, + &Context->PageOffset, + PAGE_SIZE, + CanWait, + &Context->PageBcb, + &Context->PageBuffer)) { Context->PageOffset.QuadPart = 0LL; ExRaiseStatus(STATUS_CANT_WAIT); } } Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PUCHAR); - /* - * Next Page Offset. - */ + /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; if (PageOffset > Context->BeyoundLastEntryOffset) + { PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset - Context->PageOffset.QuadPart); - BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); + } + BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); while (TRUE) - { + { do { if (*Entry == FAT_DIRENT_NEVER_USED) @@ -568,39 +538,38 @@ PDIR_ENTRY Dirent; Dirent = (PDIR_ENTRY) Entry; RtlCopyMemory(Context->DirentFileName, - Dirent->FileName, - sizeof(Dirent->FileName)); + Dirent->FileName, + sizeof(Dirent->FileName)); } - } - while (++Entry < BeyoudLastEntry); - /* - * Check if this is the last available entry. - */ + } while (++Entry < BeyondLastEntry); + /* Check if this is the last available entry */ if (PageValidLength < PAGE_SIZE) break; - /* - * We are getting beyound current page and - * are still in the continous run, map the next page. - */ + /* We are getting beyound current page and + * are still in the continous run, map the next page. + */ Context->PageOffset.QuadPart = PageOffset; CcUnpinData(Context->PageBcb); if (!CcMapData(Context->FileObject, - &Context->PageOffset, PAGE_SIZE, CanWait, - &Context->PageBcb, &Context->PageBuffer)) + &Context->PageOffset, + PAGE_SIZE, + CanWait, + &Context->PageBcb, + &Context->PageBuffer)) { Context->PageBcb = NULL; Context->PageOffset.QuadPart = 0LL; ExRaiseStatus(STATUS_CANT_WAIT); } Entry = (PUCHAR) Context->PageBuffer; - /* - * Next Page Offset. - */ + /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; if (PageOffset > Context->BeyoundLastEntryOffset) + { PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset - Context->PageOffset.QuadPart); - BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); + } + BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); } return 0; }

15 years, 7 months

[cwittich] 39035: we don't have to link against libjpeg

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jan 23 04:36:18 2009 New Revision: 39035 URL: http://svn.reactos.org/svn/reactos?rev=39035&view=rev Log: we don't have to link against libjpeg Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] Fri Jan 23 04:36:18 2009 @@ -39,7 +39,6 @@ <library>oleaut32_proxy</library> <library>wine</library> <library>wineldr</library> - <library>libjpeg</library> <library>ole32</library> <library>rpcrt4</library> <library>user32</library>

15 years, 7 months

[fireball] 39034: Alex Vlasov - Implement operations with directory entries.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 04:26:02 2009 New Revision: 39034 URL: http://svn.reactos.org/svn/reactos?rev=39034&view=rev Log: Alex Vlasov - Implement operations with directory entries. Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] Fri Jan 23 04:26:02 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/filesystems/fastfat/direntry.c * PURPOSE: Directory entries - * PROGRAMMERS: + * PROGRAMMERS: Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -11,7 +11,598 @@ #define NDEBUG #include "fastfat.h" +/* PROTOTYPES ***************************************************************/ +#define BYTES_PER_DIRENT_LOG 0x05 + +typedef struct _FAT_ENUM_DIR_CONTEXT *PFAT_ENUM_DIR_CONTEXT; + +typedef ULONG (*PFAT_COPY_DIRENT_ROUTINE) (struct _FAT_ENUM_DIR_CONTEXT *, PDIR_ENTRY, PVOID); + +typedef struct _FAT_ENUM_DIR_CONTEXT +{ + PFILE_OBJECT FileObject; + LARGE_INTEGER PageOffset; + LONGLONG BeyoundLastEntryOffset; + PVOID PageBuffer; + PBCB PageBcb; + + /* + * We should always cache short file name + * because we never know if there is a long + * name for the dirent and when we find out + * that our base dirent might become unpinned. + */ + UCHAR DirentFileName[RTL_FIELD_SIZE(DIR_ENTRY, FileName) + 1]; + PFAT_COPY_DIRENT_ROUTINE CopyDirent; + LONGLONG BytesPerClusterMask; + /* + * The following fields are + * set by the copy routine + */ + PULONG NextEntryOffset; + PULONG FileNameLength; + PWCHAR FileName; +} FAT_ENUM_DIR_CONTEXT; + +typedef enum _FILE_TIME_INDEX { + FileCreationTime = 0, + FileLastAccessTime, + FileLastWriteTime, + FileChangeTime +} FILE_TIME_INDEX; + +VOID +FatQueryFileTimes( + OUT PLARGE_INTEGER FileTimes, + IN PDIR_ENTRY Dirent); + +VOID +Fat8dot3ToUnicodeString( + OUT PUNICODE_STRING FileName, + IN PUCHAR ShortName, + IN UCHAR Flags); + +ULONG +FatDirentToDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToFullDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToIdFullDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToBothDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToIdBothDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToNamesInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + +ULONG +FatDirentToObjectIdInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer); + /* FUNCTIONS *****************************************************************/ +FORCEINLINE +VOID +FatDateTimeToSystemTime( + OUT PLARGE_INTEGER SystemTime, + IN PFAT_DATETIME FatDateTime, + IN UCHAR TenMs OPTIONAL) +{ + TIME_FIELDS TimeFields; + + /* + * Setup time fields. + */ + TimeFields.Year = FatDateTime->Date.Year + 1980; + TimeFields.Month = FatDateTime->Date.Month; + TimeFields.Day = FatDateTime->Date.Day; + TimeFields.Hour = FatDateTime->Time.Hour; + TimeFields.Minute = FatDateTime->Time.Minute; + TimeFields.Second = (FatDateTime->Time.DoubleSeconds << 1); + /* + * Adjust up to 10 milliseconds + * if the parameter was supplied + */ + if (ARGUMENT_PRESENT(TenMs)) + { + TimeFields.Second += TenMs / 100; + TimeFields.Milliseconds = (TenMs % 100) * 10; + } + else + { + TimeFields.Milliseconds = 0; + } + /* + * Fix seconds value that might get beyoud the bound. + */ + if (TimeFields.Second > 59) + TimeFields.Second = 0; + /* + * Perform ceonversion to system time if possible. + */ + if (RtlTimeFieldsToTime(&TimeFields, SystemTime)) { + /* Convert to system time */ + ExLocalTimeToSystemTime( SystemTime, SystemTime ); + } + else + { + /* Set to default time if conversion failed */ + *SystemTime = FatGlobalData.DefaultFileTime; + } +} + +VOID +FatQueryFileTimes( + OUT PLARGE_INTEGER FileTimes, + IN PDIR_ENTRY Dirent) +{ + /* + * Convert LastWriteTime + */ + FatDateTimeToSystemTime( + &FileTimes[FileLastWriteTime], + &Dirent->LastWriteDateTime, 0); + /* + * All other time fileds are valid (according to MS) + * only if Win31 compatability mode is set. + */ + if (FatGlobalData.Win31FileSystem) + { + /* We can avoid calling conversion routine + * if time in dirent is 0 or equals to already + * known time (LastWriteTime). + */ + if (Dirent->CreationDateTime.Value == 0) + { + /* Set it to default time */ + FileTimes[FileCreationTime] = FatGlobalData.DefaultFileTime; + } + else if (Dirent->CreationDateTime.Value + == Dirent->LastWriteDateTime.Value) + { + /* Assign the already known time */ + FileTimes[FileCreationTime] = FileTimes[FileLastWriteTime]; + /* Adjust milliseconds from extra dirent field */ + FileTimes[FileCreationTime].QuadPart + += (ULONG) Dirent->CreationTimeTenMs * 100000; + } + else + { + /* Perform conversion */ + FatDateTimeToSystemTime( + &FileTimes[FileCreationTime], + &Dirent->CreationDateTime, + Dirent->CreationTimeTenMs); + } + if (Dirent->LastAccessDate.Value == 0) + { + /* Set it to default time */ + FileTimes[FileLastAccessTime] = FatGlobalData.DefaultFileTime; + } + else if (Dirent->LastAccessDate.Value + == Dirent->LastWriteDateTime.Date.Value) + { + /* Assign the already known time */ + FileTimes[FileLastAccessTime] = FileTimes[FileLastWriteTime]; + } + else + { + /* Perform conversion */ + FAT_DATETIME LastAccessDateTime; + + LastAccessDateTime.Date.Value = Dirent->LastAccessDate.Value; + LastAccessDateTime.Time.Value = 0; + FatDateTimeToSystemTime( + &FileTimes[FileLastAccessTime], + &LastAccessDateTime, 0); + } + } +} + +VOID +Fat8dot3ToUnicodeString( + OUT PUNICODE_STRING FileName, + IN PUCHAR ShortName, + IN UCHAR Flags) +{ + PCHAR Name; + UCHAR Index, Ext = 0; + OEM_STRING Oem; + + Name = Add2Ptr(FileName->Buffer, 0x0c, PCHAR); + RtlCopyMemory(Name, ShortName, 0x0b); + + /* Restore the name byte used to mark deleted entries. */ + if (Name[0] == 0x05) + Name[0] |= 0xe0; + + /* Locate the end of name part. */ + for (Index = 0; Index < 0x08 + && Name[Index] != 0x20; Index++); + + /* Locate the end of extension part */ + if (Name[0x08] != 0x20) + { + Ext = 0x2; + Name[Index++] = 0x2e; + Name[Index++] = Name[0x08]; + if ((Name[Index] = Name[0x09]) != 0x20) + { + Index ++; Ext ++; + } + if ((Name[Index] = Name[0x0a]) != 0x20) + { + Index ++; Ext ++; + } + } + /* Perform Oem to Unicode conversion. */ + Oem.Buffer = Name; + Oem.Length = Index; + Oem.MaximumLength = Index; + RtlOemStringToUnicodeString(FileName, &Oem, FALSE); + Index = FlagOn(Flags, FAT_CASE_LOWER_BASE|FAT_CASE_LOWER_EXT); + if (Index > 0) + { + /* Downcase the whole name */ + if (Index == (FAT_CASE_LOWER_BASE|FAT_CASE_LOWER_EXT)) + { + RtlUpcaseUnicodeString(FileName, FileName, FALSE); + } + else + { + if (Index == FAT_CASE_LOWER_EXT) + { + /* Set extension for downcase */ + Oem.Length = Ext * sizeof(WCHAR); + Oem.Buffer = Add2Ptr( + FileName->Buffer, + FileName->Length - Oem.Length, + PSTR); + } + else + { + /* Set base name for downcase */ + Oem.Buffer = (PSTR) FileName->Buffer; + Oem.Length = FileName->Length + - Ext * sizeof(WCHAR); + } + Oem.MaximumLength = Oem.Length; + RtlUpcaseUnicodeString( + (PUNICODE_STRING)&Oem, + (PUNICODE_STRING)&Oem, + FALSE); + } + } +} + +ULONG +FatDirentToDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_DIRECTORY_INFORMATION Info; + //UNICODE_STRING FileName; + + Info = (PFILE_DIRECTORY_INFORMATION) Buffer; + /* Setup Attributes */ + Info->FileAttributes = Dirent->Attributes; + /* Setup times */ + FatQueryFileTimes(&Info->CreationTime, Dirent); + /* Setup sizes */ + Info->EndOfFile.QuadPart = Dirent->FileSize; + Info->AllocationSize.QuadPart = + (Context->BytesPerClusterMask + Dirent->FileSize) + & ~(Context->BytesPerClusterMask); + //FileName.Buffer = Info->ShortName; + //FileName.MaximumLength = sizeof(Info->ShortName); + // FatQueryShortName(&FileName, Dirent); + // Info->ShortNameLength = (CCHAR) FileName.Length; + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToFullDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_FULL_DIR_INFORMATION Info; + //UNICODE_STRING FileName; + + Info = (PFILE_FULL_DIR_INFORMATION) Buffer; + /* Setup Attributes */ + Info->FileAttributes = Dirent->Attributes; + /* Setup times */ + FatQueryFileTimes(&Info->CreationTime, Dirent); + /* Setup sizes */ + Info->EndOfFile.QuadPart = Dirent->FileSize; + Info->AllocationSize.QuadPart = + (Context->BytesPerClusterMask + Dirent->FileSize) + & ~(Context->BytesPerClusterMask); + //FileName.Buffer = Info->ShortName; + //FileName.MaximumLength = sizeof(Info->ShortName); + // FatQueryShortName(&FileName, Dirent); + // Info->ShortNameLength = (CCHAR) FileName.Length; + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToIdFullDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_ID_FULL_DIR_INFORMATION Info; + //UNICODE_STRING FileName; + + Info = (PFILE_ID_FULL_DIR_INFORMATION) Buffer; + /* Setup Attributes */ + Info->FileAttributes = Dirent->Attributes; + /* Setup times */ + FatQueryFileTimes(&Info->CreationTime, Dirent); + /* Setup sizes */ + Info->EndOfFile.QuadPart = Dirent->FileSize; + Info->AllocationSize.QuadPart = + (Context->BytesPerClusterMask + Dirent->FileSize) + & ~(Context->BytesPerClusterMask); + //FileName.Buffer = Info->ShortName; + //FileName.MaximumLength = sizeof(Info->ShortName); + // FatQueryShortName(&FileName, Dirent); + // Info->ShortNameLength = (CCHAR) FileName.Length; + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToBothDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_BOTH_DIR_INFORMATION Info; + UNICODE_STRING FileName; + + Info = (PFILE_BOTH_DIR_INFORMATION) Buffer; + /* Setup Attributes */ + Info->FileAttributes = Dirent->Attributes; + /* Setup times */ + FatQueryFileTimes(&Info->CreationTime, Dirent); + /* Setup sizes */ + Info->EndOfFile.QuadPart = Dirent->FileSize; + Info->AllocationSize.QuadPart = + (Context->BytesPerClusterMask + Dirent->FileSize) + & ~(Context->BytesPerClusterMask); + FileName.Buffer = Info->ShortName; + FileName.MaximumLength = sizeof(Info->ShortName); + Fat8dot3ToUnicodeString(&FileName, Dirent->FileName, Dirent->Case); + Info->ShortNameLength = (CCHAR) FileName.Length; + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToIdBothDirInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_ID_BOTH_DIR_INFORMATION Info; + UNICODE_STRING FileName; + + Info = (PFILE_ID_BOTH_DIR_INFORMATION) Buffer; + /* Setup Attributes */ + Info->FileAttributes = Dirent->Attributes; + /* Setup times */ + FatQueryFileTimes(&Info->CreationTime, Dirent); + /* Setup sizes */ + Info->EndOfFile.QuadPart = Dirent->FileSize; + Info->AllocationSize.QuadPart = + (Context->BytesPerClusterMask + Dirent->FileSize) + & ~(Context->BytesPerClusterMask); + FileName.Buffer = Info->ShortName; + FileName.MaximumLength = sizeof(Info->ShortName); + Fat8dot3ToUnicodeString(&FileName, Dirent->FileName, Dirent->Case); + Info->ShortNameLength = (CCHAR) FileName.Length; + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToNamesInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_NAMES_INFORMATION Info; + + Info = (PFILE_NAMES_INFORMATION) Buffer; +// FatQueryShortName(&FileName, Dirent); + Info->NextEntryOffset = sizeof(*Info); + /* + * Associate LFN buffer and length pointers + * of this entry with the context. + */ + Context->NextEntryOffset = &Info->NextEntryOffset; + Context->FileName = Info->FileName; + Context->FileNameLength = &Info->FileNameLength; + return Info->NextEntryOffset; +} + +ULONG +FatDirentToObjectIdInfo( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN PDIR_ENTRY Dirent, + IN PVOID Buffer) +{ + PFILE_OBJECTID_INFORMATION Info; + + Info = (PFILE_OBJECTID_INFORMATION) Buffer; + return sizeof(*Info); +} + +ULONG +FatEnumerateDirents( + IN OUT PFAT_ENUM_DIR_CONTEXT Context, + IN ULONG Index, + IN BOOLEAN CanWait) +{ + LONGLONG PageOffset; + SIZE_T OffsetWithinPage, PageValidLength; + PUCHAR Entry, BeyoudLastEntry; + /* + * Determine page offset and the offset within page + * for the first cluster. + */ + PageValidLength = PAGE_SIZE; + PageOffset = ((LONGLONG) Index) << BYTES_PER_DIRENT_LOG; + OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); + PageOffset -= OffsetWithinPage; + /* + * Check if the context already has the required page mapped. + * Map the first page is necessary. + */ + if (PageOffset != Context->PageOffset.QuadPart) + { + Context->PageOffset.QuadPart = PageOffset; + if (Context->PageBcb != NULL) + { + CcUnpinData(Context->PageBcb); + Context->PageBcb = NULL; + } + if (!CcMapData(Context->FileObject, &Context->PageOffset, + PAGE_SIZE, CanWait, &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + } + Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PUCHAR); + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); + while (TRUE) + { + do + { + if (*Entry == FAT_DIRENT_NEVER_USED) + return 0; // TODO: return something reasonable. + if (*Entry == FAT_DIRENT_DELETED) + { + continue; + } + if (Entry[0x0a] == FAT_DIRENT_ATTR_LFN) + { + PLONG_FILE_NAME_ENTRY Lfnent; + Lfnent = (PLONG_FILE_NAME_ENTRY) Entry; + } + else + { + PDIR_ENTRY Dirent; + Dirent = (PDIR_ENTRY) Entry; + RtlCopyMemory(Context->DirentFileName, + Dirent->FileName, + sizeof(Dirent->FileName)); + } + } + while (++Entry < BeyoudLastEntry); + /* + * Check if this is the last available entry. + */ + if (PageValidLength < PAGE_SIZE) + break; + /* + * We are getting beyound current page and + * are still in the continous run, map the next page. + */ + Context->PageOffset.QuadPart = PageOffset; + CcUnpinData(Context->PageBcb); + if (!CcMapData(Context->FileObject, + &Context->PageOffset, PAGE_SIZE, CanWait, + &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageBcb = NULL; + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + Entry = (PUCHAR) Context->PageBuffer; + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); + } + return 0; +} /* EOF */

15 years, 7 months

[fireball] 39033: Alex Vlasov - Implement FAT operations (scanning, finding continuous runs). - Implement and plug in VCB initialization.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 23 04:19:57 2009 New Revision: 39033 URL: http://svn.reactos.org/svn/reactos?rev=39033&view=rev Log: Alex Vlasov - Implement FAT operations (scanning, finding continuous runs). - Implement and plug in VCB initialization. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.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] Fri Jan 23 04:19:57 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/filesystems/fastfat/fat.c * PURPOSE: FAT support routines - * PROGRAMMERS: + * PROGRAMMERS: Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -11,7 +11,678 @@ #define NDEBUG #include "fastfat.h" +/* PROTOTYPES ***************************************************************/ +typedef struct _FAT_SCAN_CONTEXT +{ + PFILE_OBJECT FileObject; + LARGE_INTEGER PageOffset; + LONGLONG BeyoundLastEntryOffset; + PVOID PageBuffer; + PBCB PageBcb; +} FAT_SCAN_CONTEXT; + +#define FatEntryToDataOffset(xEntry, xVcb) \ + ((xVcb)->DataArea + (((LONGLONG) ((xEntry) - 0x02)) << (xVcb)->BytesPerClusterLog)) + +#define FatDataOffsetToEntry(xOffset, xVcb) \ + ((ULONG) ((xOffset - (xVcb)->DataArea) >> (xVcb)->BytesPerClusterLog) + 0x02) + +ULONG +FatScanFat12ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat12ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat12ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat16ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat16ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait); + +ULONG +FatScanFat32ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +ULONG +FatSetFat32ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait); + +BOOLEAN +NTAPI +FatValidBpb( + IN PBIOS_PARAMETER_BLOCK Bpb); + +/* VARIABLES ****************************************************************/ +FAT_METHODS Fat12Methods = { + FatScanFat12ForContinousRun, + FatSetFat12ContinousRun, + FatScanFat16ForValueRun, + FatSetFat12ValueRun +}; + +FAT_METHODS Fat16Methods = { + FatScanFat16ForContinousRun, + FatSetFat16ContinousRun, + FatScanFat16ForValueRun, + FatSetFat16ValueRun +}; + +FAT_METHODS Fat32Methods = { + FatScanFat32ForContinousRun, + FatSetFat32ContinousRun, + FatScanFat32ForValueRun, + FatSetFat32ValueRun +}; + /* FUNCTIONS ****************************************************************/ - +FORCEINLINE +ULONG +FatPowerOfTwo( + ULONG Number) +/* + * FUNCTION: + * Determines the index of the set bit. + * ARGUMENTS: + * Number = Number having a single bit set. + * RETURNS: Index of the set bit. + */ +{ + ULONG Temp; + Temp = Number + - ((Number >> 1) & 033333333333) + - ((Number >> 2) & 011111111111); + return (((Temp + (Temp >> 3)) & 030707070707) % 63); +} + +ULONG +FatScanFat12ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat12ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat12ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat16ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat16ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat32ForContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN BOOLEAN CanWait) +/* + * FUNCTION: + * Scans FAT32 for continous chain of clusters + * ARGUMENTS: + * Context = Pointer to FAT_SCAN_CONTEXT. + * Index = Supplies the Index of the first cluster + * and receves the last index after the last + * cluster in the chain. + * CanWait = Indicates if the context allows blocking. + * RETURNS: Value of the last claster terminated the scan. + * NOTES: Raises STATUS_CANT_WAIT race condition. + */ +{ + LONGLONG PageOffset; + SIZE_T OffsetWithinPage, PageValidLength; + PULONG Entry, BeyoudLastEntry; + /* + * Determine page offset and the offset within page + * for the first cluster. + */ + PageValidLength = PAGE_SIZE; + PageOffset = ((LONGLONG) *Index) << 0x2; + OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); + PageOffset -= OffsetWithinPage; + /* + * Check if the context already has the required page mapped. + * Map the first page is necessary. + */ + if (PageOffset != Context->PageOffset.QuadPart) + { + Context->PageOffset.QuadPart = PageOffset; + if (Context->PageBcb != NULL) + { + CcUnpinData(Context->PageBcb); + Context->PageBcb = NULL; + } + if (!CcMapData(Context->FileObject, &Context->PageOffset, + PAGE_SIZE, CanWait, &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + } + Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PULONG); + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + while (TRUE) + { + do + { + if ((*Entry & FAT_CLUSTER_LAST) != ++(*Index) ) + return (*Entry & FAT_CLUSTER_LAST); + } + while (++Entry < BeyoudLastEntry); + /* + * Check if this is the last available entry. + */ + if (PageValidLength < PAGE_SIZE) + break; + /* + * We are getting beyound current page and + * are still in the continous run, map the next page. + */ + Context->PageOffset.QuadPart = PageOffset; + CcUnpinData(Context->PageBcb); + if (!CcMapData(Context->FileObject, + &Context->PageOffset, PAGE_SIZE, CanWait, + &Context->PageBcb, &Context->PageBuffer)) + { + Context->PageBcb = NULL; + Context->PageOffset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + Entry = (PULONG) Context->PageBuffer; + /* + * Next Page Offset. + */ + PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; + if (PageOffset > Context->BeyoundLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + - Context->PageOffset.QuadPart); + BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + } + return (*Index - 1); +} + +ULONG +FatSetFat32ContinousRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat32ForValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN OUT PULONG Index, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatSetFat32ValueRun( + IN OUT PFAT_SCAN_CONTEXT Context, + IN ULONG Index, + IN ULONG Length, + IN ULONG IndexValue, + IN BOOLEAN CanWait) +{ + ExRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + +ULONG +FatScanFat( + IN PFCB Fcb, + IN LONGLONG Vbo, + OUT PLONGLONG Lbo, + IN OUT PLONGLONG Length, + OUT PULONG Index, + IN BOOLEAN CanWait +) +/* + * FUNCTION: + * Queries file MCB for the specified region [Vbo, Vbo + Length], + * returns the number of runs in the region as well as the first + * run of the range itself. + * If the specified region is not fully cached in MCB the routine + * scans FAT for the file and fills the MCB until the file offset + * (defined as Vbo + Length) is reached. + * ARGUMENTS: + * Fcb = Pointer to FCB structure for the file. + * Vbo = Virtual Byte Offset in the file. + * Lbo = Receives the Value of Logical Byte offset corresponding + * to supplied Vbo Value. + * Length = Supplies file range length to be examined and recieves + * the length of first run. + * OutIndex = Recieves the index (in MCB cache) of first run. + * RETURNS: Incremented index of the last run (+1). + * NOTES: Should be called by I/O routines to split the I/O operation + * into sequential or parallel I/O operations. + */ +{ + LONGLONG CurrentLbo, CurrentVbo, BeyoundLastVbo, CurrentLength; + ULONG Entry, NextEntry, NumberOfEntries, CurrentIndex; + FAT_SCAN_CONTEXT Context; + PVCB Vcb; + + /* + * Some often used values + */ + Vcb = Fcb->Vcb; + CurrentIndex = 0; + BeyoundLastVbo = Vbo + *Length; + CurrentLength = ((LONGLONG) Vcb->Clusters) << Vcb->BytesPerClusterLog; + if (BeyoundLastVbo > CurrentLength) + BeyoundLastVbo = CurrentLength; + /* + * Try to locate first run. + */ + if (FsRtlLookupLargeMcbEntry(&Fcb->Mcb, Vbo, Lbo, Length, NULL, NULL, Index)) + { + /* + * Check if we have a single mapped run. + */ + if (Vbo >= BeyoundLastVbo) + goto FatScanFcbFatExit; + } else { + *Length = 0L; + } + /* + * Get the first scan startup values. + */ + if (FsRtlLookupLastLargeMcbEntryAndIndex( + &Fcb->Mcb, &CurrentVbo, &CurrentLbo, &CurrentIndex)) + { + Entry = FatDataOffsetToEntry(CurrentLbo, Vcb); + } + else + { + /* + * Map is empty, set up initial values. + */ + Entry = Fcb->FirstCluster; + if (Entry <= 0x2) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + if (Entry >= Vcb->Clusters) + { + if (Entry < FAT_CLUSTER_LAST) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + BeyoundLastVbo = 0LL; + } + CurrentIndex = 0L; + CurrentVbo = 0LL; + } + RtlZeroMemory(&Context, sizeof(Context)); + Context.FileObject = Vcb->VolumeFileObject; + while (CurrentVbo < BeyoundLastVbo) + { + /* + * Locate Continous run starting with the current entry. + */ + NumberOfEntries = Entry; + NextEntry = Vcb->Methods.ScanContinousRun( + &Context, &NumberOfEntries, CanWait); + NumberOfEntries -= Entry; + /* + * Check value that terminated the for being valid for FAT. + */ + if (NextEntry <= 0x2) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + if (NextEntry >= Vcb->Clusters) + { + if (NextEntry < FAT_CLUSTER_LAST) + ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); + break; + } + /* + * Add new run. + */ + CurrentLength = ((LONGLONG) NumberOfEntries) + << Vcb->BytesPerClusterLog; + FsRtlAddLargeMcbEntry(&Fcb->Mcb, + CurrentVbo, + FatEntryToDataOffset(Entry, Vcb), + CurrentLength); + /* + * Setup next iteration. + */ + Entry = NextEntry; + CurrentVbo += CurrentLength; + CurrentIndex ++; + } + if (*Length == 0LL && CurrentIndex > 0) + { + if (!FsRtlLookupLargeMcbEntry(&Fcb->Mcb, + Vbo, Lbo, Length, NULL, NULL, Index)) + { + *Index = 0L; + *Lbo = 0LL; + } + } +FatScanFcbFatExit: + return CurrentIndex; +} + +BOOLEAN +NTAPI +FatValidBpb( + IN PBIOS_PARAMETER_BLOCK Bpb) +{ + return (FatValidBytesPerSector(Bpb->BytesPerSector) + && FatValidSectorsPerCluster(Bpb->SectorsPerCluster) + && Bpb->ReservedSectors > 0 + && Bpb->Fats > 0 + && (Bpb->Sectors > 0 || Bpb->LargeSectors > 0) + && (Bpb->SectorsPerFat > 0 + || (Bpb->LargeSectorsPerFat > 0 && Bpb->FsVersion == 0)) + && (Bpb->Media == 0xf0 + || Bpb->Media == 0xf8 + || Bpb->Media == 0xf9 + || Bpb->Media == 0xfb + || Bpb->Media == 0xfc + || Bpb->Media == 0xfd + || Bpb->Media == 0xfe + || Bpb->Media == 0xff) + && (Bpb->SectorsPerFat == 0 || Bpb->RootEntries > 0) + && (Bpb->SectorsPerFat > 0 || !Bpb->MirrorDisabled)); +} + +VOID +FatiInitializeVcb( + PVCB Vcb) +{ + ULONG ClustersCapacity; + + /* Various characteristics needed for navigation in FAT */ + if ((Vcb->Sectors = Vcb->Bpb.Sectors) == 0) + Vcb->Sectors = Vcb->Bpb.LargeSectors; + if ((Vcb->SectorsPerFat = Vcb->Bpb.SectorsPerFat) == 0) + Vcb->SectorsPerFat = Vcb->Bpb.LargeSectorsPerFat; + Vcb->RootDirent = Vcb->Bpb.ReservedSectors + Vcb->Bpb.Fats * Vcb->SectorsPerFat; + Vcb->RootDirentSectors = BytesToSectors(Vcb, + Vcb->Bpb.RootEntries * sizeof(DIR_ENTRY)); + Vcb->DataArea = Vcb->RootDirent + Vcb->RootDirentSectors; + Vcb->Clusters = (Vcb->Sectors - Vcb->Bpb.ReservedSectors + - Vcb->Bpb.Fats * Vcb->SectorsPerFat + - Vcb->RootDirentSectors) / Vcb->Bpb.SectorsPerCluster; + if (Vcb->BytesPerClusterLog < 4087) + { + Vcb->IndexDepth = 0x0c; + Vcb->Methods = Fat12Methods; + } + else + { + Vcb->IndexDepth = 0x10; + Vcb->Methods = Fat16Methods; + } + /* Large Sectors are used for FAT32 */ + if (Vcb->Bpb.Sectors == 0) { + Vcb->IndexDepth = 0x20; + Vcb->Methods = Fat32Methods; + } + ClustersCapacity = (SectorsToBytes(Vcb, Vcb->Sectors) * 0x8 / Vcb->IndexDepth) - 1; + if (Vcb->Clusters > ClustersCapacity) + Vcb->Clusters = ClustersCapacity; + Vcb->BytesPerCluster = SectorsToBytes(Vcb, Vcb->Bpb.SectorsPerCluster); + Vcb->BytesPerClusterLog = FatPowerOfTwo(Vcb->BytesPerCluster); + Vcb->BeyoundLastClusterInFat = ((LONGLONG) Vcb->Clusters) * Vcb->IndexDepth / 0x8; +} + +NTSTATUS +FatInitializeVcb( + IN PVCB Vcb, + IN PDEVICE_OBJECT TargetDeviceObject, + IN PVPB Vpb) +{ + NTSTATUS Status; + PBCB Bcb; + PVOID Buffer; + LARGE_INTEGER Offset; + + RtlZeroMemory(Vcb, sizeof(*Vcb)); + + /* + * Initialize list head, so that it will + * not fail in cleanup. + */ + InitializeListHead(&Vcb->VcbLinks); + + /* Setup FCB Header. */ + Vcb->Header.NodeTypeCode = FAT_NTC_VCB; + Vcb->Header.NodeByteSize = sizeof(*Vcb); + + /* Setup Vcb fields */ + Vcb->TargetDeviceObject = TargetDeviceObject; + ObReferenceObject(TargetDeviceObject); + + /* Setup FCB Header. */ + ExInitializeFastMutex(&Vcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Vcb->Header, &Vcb->HeaderMutex); + + /* Create Volume File Object. */ + Vcb->VolumeFileObject = IoCreateStreamFileObject(NULL, + Vcb->TargetDeviceObject); + + /* We have to setup all FCB fields needed for CC. */ + Vcb->VolumeFileObject->FsContext = Vcb; + Vcb->VolumeFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; + + + /* At least full boot sector should be available. */ + Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + Vcb->Header.AllocationSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + Vcb->Header.ValidDataLength.HighPart = MAXLONG; + Vcb->Header.ValidDataLength.LowPart = MAXULONG; + + /* Initialize CC. */ + CcInitializeCacheMap(Vcb->VolumeFileObject, + (PCC_FILE_SIZES) &Vcb->Header.AllocationSize, + FALSE, + &FatGlobalData.CacheMgrNoopCallbacks, + Vcb); + + /* Read boot sector */ + Offset.QuadPart = 0; + Bcb = NULL; + /* + * Note: Volume Read path does not require + * any of the parameters set further + * in this routine. + */ + if (CcMapData(Vcb->VolumeFileObject, + &Offset, + sizeof(PACKED_BOOT_SECTOR), + TRUE, + &Bcb, + &Buffer)) + { + PPACKED_BOOT_SECTOR BootSector = (PPACKED_BOOT_SECTOR) Buffer; + FatUnpackBios(&Vcb->Bpb, &BootSector->PackedBpb); + if (!(FatBootSectorJumpValid(BootSector->Jump) + && FatValidBpb(&Vcb->Bpb))) + { + Status = STATUS_UNRECOGNIZED_VOLUME; + } + CopyUchar4( &Vpb->SerialNumber, BootSector->Id ); + CcUnpinData(Bcb); + } + else + { + Status = STATUS_UNRECOGNIZED_VOLUME; + goto FatInitializeVcbCleanup; + } + FatiInitializeVcb(Vcb); + /* Add this Vcb to grobal Vcb list. */ + InsertTailList(&FatGlobalData.VcbListHead, &Vcb->VcbLinks); + return STATUS_SUCCESS; + +FatInitializeVcbCleanup: + + /* Unwind the routine actions */ + FatUninitializeVcb(Vcb); + return Status; +} + +VOID +FatUninitializeVcb( + IN PVCB Vcb) +{ + LARGE_INTEGER ZeroSize; + + ZeroSize.QuadPart = 0LL; + + /* Close volume file */ + if (Vcb->VolumeFileObject != NULL) + { + /* Uninitialize CC. */ + CcUninitializeCacheMap(Vcb->VolumeFileObject, &ZeroSize, NULL); + ObDereferenceObject(Vcb->VolumeFileObject); + Vcb->VolumeFileObject = NULL; + } + /* Unlink from global Vcb list. */ + RemoveEntryList(&Vcb->VcbLinks); + + /* Release Target Device */ + ObReferenceObject(Vcb->TargetDeviceObject); + Vcb->TargetDeviceObject = NULL; +} /* EOF */ + + 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] Fri Jan 23 04:19:57 2009 @@ -109,10 +109,20 @@ /* Save device object in a VPB */ Vpb->DeviceObject = (PDEVICE_OBJECT)VolumeDevice; - /* TODO: Initialize VCB for this volume */ + /* Initialize VCB for this volume */ + Status = FatInitializeVcb(&VolumeDevice->Vcb, TargetDeviceObject, Vpb); + if (!NT_SUCCESS(Status)) + goto FatMountVolumeCleanup; /* Return success */ return STATUS_SUCCESS; + + +FatMountVolumeCleanup: + + /* Unwind the routine actions */ + IoDeleteDevice((PDEVICE_OBJECT)VolumeDevice); + return Status; }

15 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
76
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 2009