Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72122: [NTDLL] Add missing VOID. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 08:18:11 2016 New Revision: 72122 URL: http://svn.reactos.org/svn/reactos?rev=72122&view=rev Log: [NTDLL] Add missing VOID. CORE-11799 Modified: trunk/reactos/dll/ntdll/include/ntdllp.h Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Aug 6 08:18:11 2016 @@ -59,7 +59,7 @@ NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); VOID NTAPI LdrpInitFailure(NTSTATUS Status); VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry); -VOID NTAPI LdrpEnsureLoaderLockIsHeld(); +VOID NTAPI LdrpEnsureLoaderLockIsHeld(VOID); /* ldrpe.c */ NTSTATUS @@ -105,7 +105,7 @@ IN ULONG Flags); ULONG NTAPI -LdrpClearLoadInProgress(); +LdrpClearLoadInProgress(VOID); NTSTATUS NTAPI

1 0

[tfaber] 72121: [ARP] - Do not return failure after successful operations CORE-11794
by tfaber＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: tfaber Date: Sat Aug 6 07:57:51 2016 New Revision: 72121 URL: http://svn.reactos.org/svn/reactos?rev=72121&view=rev Log: [ARP] - Do not return failure after successful operations CORE-11794 Modified: trunk/reactos/base/applications/network/arp/arp.c Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] Sat Aug 6 07:57:51 2016 @@ -568,24 +568,30 @@ else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) DisplayArpEntries(argv[2], argv[4]); else + { Usage(); return EXIT_FAILURE; + } break; case 'd': if (argc == 3) Deletehost(argv[2], NULL); else if (argc == 4) Deletehost(argv[2], argv[3]); else + { Usage(); return EXIT_FAILURE; + } break; case 's': if (argc == 4) Addhost(argv[2], argv[3], NULL); else if (argc == 5) Addhost(argv[2], argv[3], argv[4]); else + { Usage(); return EXIT_FAILURE; + } break; default: Usage();

1 0

[tfaber] 72120: [CMD][UXTHEME] - Clarify misleading indentation CORE-11794
by tfaber＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: tfaber Date: Sat Aug 6 07:08:52 2016 New Revision: 72120 URL: http://svn.reactos.org/svn/reactos?rev=72120&view=rev Log: [CMD][UXTHEME] - Clarify misleading indentation CORE-11794 Modified: trunk/reactos/base/shell/cmd/copy.c trunk/reactos/dll/win32/uxtheme/system.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sat Aug 6 07:08:52 2016 @@ -481,13 +481,15 @@ case _T('-'): if (_tcslen(arg[i]) >= 3) + { if (_totupper(arg[i][2]) == _T('Y')) { dwFlags &= ~COPY_NO_PROMPT; dwFlags |= COPY_PROMPT; } - - break; + } + + break; case _T('Z'): dwFlags |= COPY_RESTART; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sat Aug 6 07:08:52 2016 @@ -797,7 +797,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList) { - HRESULT hr; + HRESULT hr; TRACE("(%p,%s,%s)\n", hwnd, debugstr_w(pszSubAppName), debugstr_w(pszSubIdList)); @@ -812,7 +812,7 @@ if (!SUCCEEDED(hr)) return hr; - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); return hr; }

1 0

[tfaber] 72119: [CRT] - Apply Wine commit b7f6362d (msvcrt: Use the correct object type for __non_rtti_object exceptions.) by Alexandre Julliard CORE-11794
by tfaber＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: tfaber Date: Sat Aug 6 06:52:41 2016 New Revision: 72119 URL: http://svn.reactos.org/svn/reactos?rev=72119&view=rev Log: [CRT] - Apply Wine commit b7f6362d (msvcrt: Use the correct object type for __non_rtti_object exceptions.) by Alexandre Julliard CORE-11794 Modified: trunk/reactos/sdk/lib/crt/except/cpp.c Modified: trunk/reactos/sdk/lib/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/except/cpp.c [iso-8859-1] Sat Aug 6 06:52:41 2016 @@ -1134,7 +1134,7 @@ { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1219,7 +1219,7 @@ { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1258,7 +1258,7 @@ { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY

1 0

[tfaber] 72118: [CRT] - Remove pointless inline CORE-11794
by tfaber＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: tfaber Date: Fri Aug 5 21:33:54 2016 New Revision: 72118 URL: http://svn.reactos.org/svn/reactos?rev=72118&view=rev Log: [CRT] - Remove pointless inline CORE-11794 Modified: trunk/reactos/sdk/lib/crt/include/internal/tls.h trunk/reactos/sdk/lib/crt/misc/tls.c Modified: trunk/reactos/sdk/lib/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/include/intern… ============================================================================== --- trunk/reactos/sdk/lib/crt/include/internal/tls.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/include/internal/tls.h [iso-8859-1] Fri Aug 5 21:33:54 2016 @@ -57,10 +57,10 @@ typedef struct __thread_data thread_data_t; -extern inline BOOL msvcrt_init_tls(void); -extern inline BOOL msvcrt_free_tls(void); +extern BOOL msvcrt_init_tls(void); +extern BOOL msvcrt_free_tls(void); extern thread_data_t *msvcrt_get_thread_data(void); -extern inline void msvcrt_free_tls_mem(void); +extern void msvcrt_free_tls_mem(void); #define MSVCRT_ENABLE_PER_THREAD_LOCALE 1 #define MSVCRT_DISABLE_PER_THREAD_LOCALE 2 Modified: trunk/reactos/sdk/lib/crt/misc/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/misc/tls.c?rev… ============================================================================== --- trunk/reactos/sdk/lib/crt/misc/tls.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/misc/tls.c [iso-8859-1] Fri Aug 5 21:33:54 2016 @@ -6,7 +6,7 @@ /* Index to TLS */ static DWORD msvcrt_tls_index; -inline BOOL msvcrt_init_tls(void) +BOOL msvcrt_init_tls(void) { msvcrt_tls_index = TlsAlloc(); @@ -18,7 +18,7 @@ return TRUE; } -inline BOOL msvcrt_free_tls(void) +BOOL msvcrt_free_tls(void) { if (!TlsFree(msvcrt_tls_index)) { @@ -48,7 +48,7 @@ return ptr; } -inline void msvcrt_free_tls_mem(void) +void msvcrt_free_tls_mem(void) { thread_data_t *tls = TlsGetValue(msvcrt_tls_index);

1 0

[hbelusca] 72117: [COMCTL32]: Addendum to r72116: Add the __REACTOS__ ifdefs to ease wine syncing, and update the patch in accordance. CORE-11532
by hbelusca＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: hbelusca Date: Fri Aug 5 17:45:34 2016 New Revision: 72117 URL: http://svn.reactos.org/svn/reactos?rev=72117&view=rev Log: [COMCTL32]: Addendum to r72116: Add the __REACTOS__ ifdefs to ease wine syncing, and update the patch in accordance. CORE-11532 Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Fri Aug 5 17:45:34 2016 @@ -848,6 +848,28 @@ } TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; +@@ -3302,7 +3365,11 @@ REBAR_NCHitTest (const REBAR_INFO *infoP + (INT *)&nmmouse.dwItemSpec); + nmmouse.dwItemData = 0; + nmmouse.pt = clpt; ++#ifdef __REACTOS__ ++ nmmouse.dwHitInfo = scrap; ++#else + nmmouse.dwHitInfo = 0; ++#endif + if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) { + TRACE("notify changed return value from %ld to %d\n", + ret, i); +@@ -3374,6 +3441,9 @@ REBAR_Paint (const REBAR_INFO *infoPtr, + { + if (hdc) { + TRACE("painting\n"); ++#ifdef __REACTOS__ ++ REBAR_EraseBkGnd (infoPtr, hdc); ++#endif + REBAR_Refresh (infoPtr, hdc); + } else { + PAINTSTRUCT ps; @@ -3652,7 +3728,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, return REBAR_ShowBand (infoPtr, wParam, lParam); Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Fri Aug 5 17:45:34 2016 @@ -3378,7 +3378,11 @@ (INT *)&nmmouse.dwItemSpec); nmmouse.dwItemData = 0; nmmouse.pt = clpt; +#ifdef __REACTOS__ nmmouse.dwHitInfo = scrap; +#else + nmmouse.dwHitInfo = 0; +#endif if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) { TRACE("notify changed return value from %ld to %d\n", ret, i); @@ -3450,7 +3454,9 @@ { if (hdc) { TRACE("painting\n"); +#ifdef __REACTOS__ REBAR_EraseBkGnd (infoPtr, hdc); +#endif REBAR_Refresh (infoPtr, hdc); } else { PAINTSTRUCT ps;

1 0

[gadamopoulos] 72116: [COMCTL32] - rebar: actually pass the hittest flag to the NM_NCHITTEST notification. CORE-11532
by gadamopoulos＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: gadamopoulos Date: Fri Aug 5 17:16:22 2016 New Revision: 72116 URL: http://svn.reactos.org/svn/reactos?rev=72116&view=rev Log: [COMCTL32] - rebar: actually pass the hittest flag to the NM_NCHITTEST notification. CORE-11532 Modified: trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Fri Aug 5 17:16:22 2016 @@ -3378,7 +3378,7 @@ (INT *)&nmmouse.dwItemSpec); nmmouse.dwItemData = 0; nmmouse.pt = clpt; - nmmouse.dwHitInfo = 0; + nmmouse.dwHitInfo = scrap; if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) { TRACE("notify changed return value from %ld to %d\n", ret, i); @@ -3450,6 +3450,7 @@ { if (hdc) { TRACE("painting\n"); + REBAR_EraseBkGnd (infoPtr, hdc); REBAR_Refresh (infoPtr, hdc); } else { PAINTSTRUCT ps;

1 0

[hbelusca] 72115: [FASTFAT_NEW]: Fix add_pch command usage.
by hbelusca＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: hbelusca Date: Fri Aug 5 11:54:48 2016 New Revision: 72115 URL: http://svn.reactos.org/svn/reactos?rev=72115&view=rev Log: [FASTFAT_NEW]: Fix add_pch command usage. Modified: trunk/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] Fri Aug 5 11:54:48 2016 @@ -22,10 +22,10 @@ rw.c shutdown.c volume.c - fastfat.rc) + fastfat.h) -add_library(fastfat_new SHARED ${SOURCE}) +add_library(fastfat_new SHARED ${SOURCE} fastfat.rc) set_module_type(fastfat_new kernelmodedriver) target_link_libraries(fastfat_new ${PSEH_LIB} fullfat) add_importlibs(fastfat_new ntoskrnl hal) -add_pch(fastfat_new fastfat.h) +add_pch(fastfat_new fastfat.h SOURCE)

1 0

[pschweitzer] 72114: [NET/USE] Always delete remembered connections on /delete ROSAPPS-303
by pschweitzer＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: pschweitzer Date: Fri Aug 5 10:58:09 2016 New Revision: 72114 URL: http://svn.reactos.org/svn/reactos?rev=72114&view=rev Log: [NET/USE] Always delete remembered connections on /delete ROSAPPS-303 Modified: trunk/reactos/base/applications/network/net/cmdUse.c Modified: trunk/reactos/base/applications/network/net/cmdUse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUse.c [iso-8859-1] Fri Aug 5 10:58:09 2016 @@ -126,7 +126,7 @@ return 1; } - return WNetCancelConnection(argv[2], FALSE); + return WNetCancelConnection2(argv[2], CONNECT_UPDATE_PROFILE, FALSE); } else {

1 0

[pschweitzer] 72113: [FASTFAT] Refactor vfatMakeFCBFromDirEntry() and vfatUpdateFCB() so that they share code. It will help avoiding wild FCB modifications on renaming. CORE-11377
by pschweitzer＠svn.reactos.org 05 Aug '16

05 Aug '16

Author: pschweitzer Date: Fri Aug 5 10:48:01 2016 New Revision: 72113 URL: http://svn.reactos.org/svn/reactos?rev=72113&view=rev Log: [FASTFAT] Refactor vfatMakeFCBFromDirEntry() and vfatUpdateFCB() so that they share code. It will help avoiding wild FCB modifications on renaming. CORE-11377 Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Fri Aug 5 10:48:01 2016 @@ -638,8 +638,6 @@ { /* We're modifying an existing FCB - likely rename/move */ Status = vfatUpdateFCB(DeviceExt, *Fcb, &DirContext, ParentFcb); - (*Fcb)->dirIndex = DirContext.DirIndex; - (*Fcb)->startIndex = DirContext.StartIndex; } else { @@ -802,8 +800,6 @@ /* We're modifying an existing FCB - likely rename/move */ /* FIXME: check status */ vfatUpdateFCB(DeviceExt, *Fcb, &DirContext, ParentFcb); - (*Fcb)->dirIndex = DirContext.DirIndex; - (*Fcb)->startIndex = DirContext.StartIndex; } else { Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Fri Aug 5 10:48:01 2016 @@ -358,6 +358,68 @@ } } +static +VOID +vfatInitFCBFromDirEntry( + PDEVICE_EXTENSION Vcb, + PVFATFCB Fcb, + PVFAT_DIRENTRY_CONTEXT DirContext) +{ + ULONG Size; + + RtlCopyMemory(&Fcb->entry, &DirContext->DirEntry, sizeof (DIR_ENTRY)); + RtlCopyUnicodeString(&Fcb->ShortNameU, &DirContext->ShortNameU); + if (Vcb->Flags & VCB_IS_FATX) + { + Fcb->ShortHash.Hash = Fcb->Hash.Hash; + } + else + { + Fcb->ShortHash.Hash = vfatNameHash(0, &Fcb->DirNameU); + Fcb->ShortHash.Hash = vfatNameHash(Fcb->ShortHash.Hash, &Fcb->ShortNameU); + } + + if (vfatFCBIsDirectory(Fcb)) + { + ULONG FirstCluster, CurrentCluster; + NTSTATUS Status = STATUS_SUCCESS; + Size = 0; + FirstCluster = vfatDirEntryGetFirstCluster(Vcb, &Fcb->entry); + if (FirstCluster == 1) + { + Size = Vcb->FatInfo.rootDirectorySectors * Vcb->FatInfo.BytesPerSector; + } + else if (FirstCluster != 0) + { + CurrentCluster = FirstCluster; + while (CurrentCluster != 0xffffffff && NT_SUCCESS(Status)) + { + Size += Vcb->FatInfo.BytesPerCluster; + Status = NextCluster(Vcb, FirstCluster, &CurrentCluster, FALSE); + } + } + } + else if (Fcb->Flags & FCB_IS_FATX_ENTRY) + { + Size = Fcb->entry.FatX.FileSize; + } + else + { + Size = Fcb->entry.Fat.FileSize; + } + Fcb->dirIndex = DirContext->DirIndex; + Fcb->startIndex = DirContext->StartIndex; + if ((Fcb->Flags & FCB_IS_FATX_ENTRY) && !vfatFCBIsRoot(Fcb)) + { + ASSERT(DirContext->DirIndex >= 2 && DirContext->StartIndex >= 2); + Fcb->dirIndex = DirContext->DirIndex-2; + Fcb->startIndex = DirContext->StartIndex-2; + } + Fcb->RFCB.FileSize.QuadPart = Size; + Fcb->RFCB.ValidDataLength.QuadPart = Size; + Fcb->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, Vcb->FatInfo.BytesPerCluster); +} + NTSTATUS vfatUpdateFCB( PDEVICE_EXTENSION pVCB, @@ -391,31 +453,17 @@ Fcb->DirNameU.Buffer = Fcb->PathNameU.Buffer; vfatSplitPathName(&Fcb->PathNameU, &Fcb->DirNameU, &Fcb->LongNameU); - /* Copy short name */ - RtlCopyUnicodeString(&Fcb->ShortNameU, &DirContext->ShortNameU); - - /* Recompute hashes */ - Fcb->Hash.Hash = vfatNameHash(0, &Fcb->PathNameU); - if (pVCB->Flags & VCB_IS_FATX) - { - Fcb->ShortHash.Hash = Fcb->Hash.Hash; - - RtlCopyMemory(Fcb->entry.FatX.Filename, DirContext->DirEntry.FatX.Filename, 42); - Fcb->entry.FatX.FilenameLength = DirContext->DirEntry.FatX.FilenameLength; - } - else - { - Fcb->ShortHash.Hash = vfatNameHash(0, &Fcb->DirNameU); - Fcb->ShortHash.Hash = vfatNameHash(Fcb->ShortHash.Hash, &Fcb->ShortNameU); - - RtlCopyMemory(Fcb->entry.Fat.ShortName, DirContext->DirEntry.Fat.ShortName, 11); - } - - /* Set parent */ + /* Save old parent */ OldParent = Fcb->parentFcb; + + /* Reinit FCB */ + vfatInitFCBFromDirEntry(pVCB, Fcb, DirContext); + + if (vfatFCBIsDirectory(Fcb)) + { + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + } Fcb->parentFcb = ParentFcb; - - /* Add to the table */ vfatAddFCBToTable(pVCB, Fcb); /* If we moved across directories, dereference our old parent @@ -607,7 +655,6 @@ PVFATFCB *fileFCB) { PVFATFCB rcFCB; - ULONG Size; UNICODE_STRING NameU; NTSTATUS Status; @@ -618,57 +665,8 @@ } rcFCB = vfatNewFCB(vcb, &NameU); - RtlCopyMemory(&rcFCB->entry, &DirContext->DirEntry, sizeof (DIR_ENTRY)); - RtlCopyUnicodeString(&rcFCB->ShortNameU, &DirContext->ShortNameU); - if (vcb->Flags & VCB_IS_FATX) - { - rcFCB->ShortHash.Hash = rcFCB->Hash.Hash; - } - else - { - rcFCB->ShortHash.Hash = vfatNameHash(0, &rcFCB->DirNameU); - rcFCB->ShortHash.Hash = vfatNameHash(rcFCB->ShortHash.Hash, &rcFCB->ShortNameU); - } - - if (vfatFCBIsDirectory(rcFCB)) - { - ULONG FirstCluster, CurrentCluster; - NTSTATUS Status = STATUS_SUCCESS; - Size = 0; - FirstCluster = vfatDirEntryGetFirstCluster(vcb, &rcFCB->entry); - if (FirstCluster == 1) - { - Size = vcb->FatInfo.rootDirectorySectors * vcb->FatInfo.BytesPerSector; - } - else if (FirstCluster != 0) - { - CurrentCluster = FirstCluster; - while (CurrentCluster != 0xffffffff && NT_SUCCESS(Status)) - { - Size += vcb->FatInfo.BytesPerCluster; - Status = NextCluster(vcb, FirstCluster, &CurrentCluster, FALSE); - } - } - } - else if (rcFCB->Flags & FCB_IS_FATX_ENTRY) - { - Size = rcFCB->entry.FatX.FileSize; - } - else - { - Size = rcFCB->entry.Fat.FileSize; - } - rcFCB->dirIndex = DirContext->DirIndex; - rcFCB->startIndex = DirContext->StartIndex; - if ((rcFCB->Flags & FCB_IS_FATX_ENTRY) && !vfatFCBIsRoot(directoryFCB)) - { - ASSERT(DirContext->DirIndex >= 2 && DirContext->StartIndex >= 2); - rcFCB->dirIndex = DirContext->DirIndex-2; - rcFCB->startIndex = DirContext->StartIndex-2; - } - rcFCB->RFCB.FileSize.QuadPart = Size; - rcFCB->RFCB.ValidDataLength.QuadPart = Size; - rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP_64(Size, vcb->FatInfo.BytesPerCluster); + vfatInitFCBFromDirEntry(vcb, rcFCB, DirContext); + rcFCB->RefCount = 1; if (vfatFCBIsDirectory(rcFCB)) {

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