Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72132: [CRT] Correct some types. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 10:18:08 2016 New Revision: 72132 URL: http://svn.reactos.org/svn/reactos?rev=72132&view=rev Log: [CRT] Correct some types. CORE-11799 Modified: trunk/reactos/sdk/lib/crt/float/i386/cntrlfp.c trunk/reactos/sdk/lib/crt/float/i386/fpreset.c trunk/reactos/sdk/lib/crt/float/i386/statfp.c Modified: trunk/reactos/sdk/lib/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/sdk/lib/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/float/i386/cntrlfp.c [iso-8859-1] Sat Aug 6 10:18:08 2016 @@ -42,7 +42,7 @@ */ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) { - unsigned int fpword = 0; + unsigned short fpword = 0; unsigned int flags = 0; TRACE("(%08x, %08x): Called\n", newval, mask); Modified: trunk/reactos/sdk/lib/crt/float/i386/fpreset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/float/i386/fpr… ============================================================================== --- trunk/reactos/sdk/lib/crt/float/i386/fpreset.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/float/i386/fpreset.c [iso-8859-1] Sat Aug 6 10:18:08 2016 @@ -12,7 +12,7 @@ */ void CDECL _fpreset(void) { - const unsigned int x86_cw = 0x27f; + const unsigned short x86_cw = 0x27f; #ifdef _MSC_VER __asm { fninit } __asm { fldcw [x86_cw] } Modified: trunk/reactos/sdk/lib/crt/float/i386/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/float/i386/sta… ============================================================================== --- trunk/reactos/sdk/lib/crt/float/i386/statfp.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/float/i386/statfp.c [iso-8859-1] Sat Aug 6 10:18:08 2016 @@ -25,7 +25,7 @@ unsigned int CDECL _statusfp(void) { unsigned int retVal = 0; - unsigned int fpword; + unsigned short fpword; #ifdef _M_AMD64 fpword = _mm_getcsr();

1 0

[akhaldi] 72131: [WIN32DLLS] We don't need mingwex for these modules anymore. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 09:53:47 2016 New Revision: 72131 URL: http://svn.reactos.org/svn/reactos?rev=72131&view=rev Log: [WIN32DLLS] We don't need mingwex for these modules anymore. CORE-11799 Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -6,11 +6,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) add_library(beepmidi SHARED ${SOURCE}) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(beepmidi mingwex) -endif() - set_module_type(beepmidi win32dll UNICODE) add_importlibs(beepmidi winmm msvcrt kernel32 ntdll) add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -32,11 +32,6 @@ set_module_type(gdiplus win32dll) target_link_libraries(gdiplus wine) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(gdiplus mingwex) -endif() - add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus gdiplus_private.h SOURCE) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -105,11 +105,6 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}") set_module_type(mshtml win32dll) target_link_libraries(mshtml uuid wine strmiids oldnames) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(mshtml mingwex) -endif() - add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(mshtml mshtml_nsiface_header) Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -47,12 +47,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(oleaut32 mingwex) - #FIXME: http://llvm.org/bugs/show_bug.cgi?id=19027 - set_property(SOURCE vartype.c APPEND_STRING PROPERTY COMPILE_FLAGS " -no-integrated-as") -endif() - add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl) add_dependencies(oleaut32 oleaut32_idlheader) set_module_type(oleaut32 win32dll) Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMake… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -22,11 +22,6 @@ set_module_type(wdmaud.drv win32dll UNICODE) set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") target_link_libraries(wdmaud.drv mmebuddy libsamplerate mmixer) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(wdmaud.drv mingwex) -endif() - add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) add_pch(wdmaud.drv wdmaud.h SOURCE) add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:53:47 2016 @@ -16,10 +16,5 @@ set_module_type(winemp3.acm win32dll) set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm wine libmpg123 oldnames) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(winemp3.acm mingwex) -endif() - add_importlibs(winemp3.acm winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winemp3.acm DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 72130: [NTOS:MM] Add some missing VOIDs. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 09:34:39 2016 New Revision: 72130 URL: http://svn.reactos.org/svn/reactos?rev=72130&view=rev Log: [NTOS:MM] Add some missing VOIDs. CORE-11799 Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/special.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Aug 6 09:34:39 2016 @@ -1663,7 +1663,7 @@ VOID NTAPI -MiInitializeSessionSpaceLayout(); +MiInitializeSessionSpaceLayout(VOID); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Sat Aug 6 09:34:39 2016 @@ -70,7 +70,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VOID NTAPI MiTestSpecialPool(); +VOID NTAPI MiTestSpecialPool(VOID); BOOLEAN NTAPI

1 0

[akhaldi] 72129: [DIRECTX/WINE] We don't need mingwex for these anymore. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 09:32:45 2016 New Revision: 72129 URL: http://svn.reactos.org/svn/reactos?rev=72129&view=rev Log: [DIRECTX/WINE] We don't need mingwex for these anymore. CORE-11799 Modified: trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:32:45 2016 @@ -25,11 +25,6 @@ set_module_type(d3drm win32dll UNICODE) target_link_libraries(d3drm dxguid uuid wine) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(d3drm mingwex) -endif() - add_importlibs(d3drm ddraw d3dxof msvcrt kernel32 ntdll) add_pch(d3drm d3drm_private.h SOURCE) add_cd_file(TARGET d3drm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:32:45 2016 @@ -33,11 +33,6 @@ set_module_type(d3dx9_36 win32dll) add_dependencies(d3dx9_36 d3d_idl_headers) target_link_libraries(d3dx9_36 dxguid wine) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(d3dx9_36 mingwex) -endif() - add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof d3dwine user32 ole32 gdi32 msvcrt kernel32 ntdll) add_pch(d3dx9_36 d3dx9_36_private.h SOURCE) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:32:45 2016 @@ -24,10 +24,5 @@ set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid wine) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(dsound mingwex) -endif() - add_importlibs(dsound winmm advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Sat Aug 6 09:32:45 2016 @@ -50,11 +50,6 @@ set_module_type(d3dwine win32dll) target_link_libraries(d3dwine wine) - -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(d3dwine mingwex) -endif() - add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(d3dwine wined3d_private.h SOURCE) add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 72128: [NTOS:PNPMGR] Mark IopReportTargetDeviceChangeAsyncWorker as stdcall and remove the PWORKER_THREAD_ROUTINE cast. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 09:11:08 2016 New Revision: 72128 URL: http://svn.reactos.org/svn/reactos?rev=72128&view=rev Log: [NTOS:PNPMGR] Mark IopReportTargetDeviceChangeAsyncWorker as stdcall and remove the PWORKER_THREAD_ROUTINE cast. CORE-11799 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Sat Aug 6 09:11:08 2016 @@ -108,6 +108,7 @@ } VOID +NTAPI IopReportTargetDeviceChangeAsyncWorker(PVOID Context) { PINTERNAL_WORK_QUEUE_ITEM Item; @@ -509,7 +510,7 @@ Item->PhysicalDeviceObject = PhysicalDeviceObject; Item->Callback = Callback; Item->Context = Context; - ExInitializeWorkItem(&(Item->WorkItem), (PWORKER_THREAD_ROUTINE)IopReportTargetDeviceChangeAsyncWorker, Item); + ExInitializeWorkItem(&(Item->WorkItem), IopReportTargetDeviceChangeAsyncWorker, Item); /* Finally, queue the item, our work here is done */ ExQueueWorkItem(&(Item->WorkItem), DelayedWorkQueue);

1 0

[tfaber] 72127: [NTOS:MM] - Correctly check for overflow in PeFmtCreateSection CORE-11794
by tfaber＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: tfaber Date: Sat Aug 6 09:07:03 2016 New Revision: 72127 URL: http://svn.reactos.org/svn/reactos?rev=72127&view=rev Log: [NTOS:MM] - Correctly check for overflow in PeFmtCreateSection CORE-11794 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Aug 6 09:07:03 2016 @@ -208,6 +208,7 @@ SIZE_T nPrevVirtualEndOfSegment = 0; ULONG nFileSizeOfHeaders = 0; ULONG i; + ULONG AlignedLength; ASSERT(FileHeader); ASSERT(FileHeaderSize > 0); @@ -755,10 +756,11 @@ else pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize; - pssSegments[i].Length.LowPart = ALIGN_UP_BY(pssSegments[i].Length.LowPart, nSectionAlignment); - /* FIXME: always false */ - if (pssSegments[i].Length.QuadPart < pssSegments[i].Length.QuadPart) + AlignedLength = ALIGN_UP_BY(pssSegments[i].Length.LowPart, nSectionAlignment); + if(AlignedLength < pssSegments[i].Length.LowPart) DIE(("Cannot align the virtual size of section %u\n", i)); + + pssSegments[i].Length.LowPart = AlignedLength; if(pssSegments[i].Length.QuadPart == 0) DIE(("Virtual size of section %u is null\n", i));

1 0

[pschweitzer] 72126: [FASTFAT] Don't mess with parentless FCB. Dedicated to Thomas :-). CORE-11377 CORE-11426
by pschweitzer＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: pschweitzer Date: Sat Aug 6 08:57:47 2016 New Revision: 72126 URL: http://svn.reactos.org/svn/reactos?rev=72126&view=rev Log: [FASTFAT] Don't mess with parentless FCB. Dedicated to Thomas :-). CORE-11377 CORE-11426 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c 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] Sat Aug 6 08:57:47 2016 @@ -268,11 +268,15 @@ PVFATFCB pFCB) { FsRtlUninitializeFileLock(&pFCB->FileLock); + if (!vfatFCBIsRoot(pFCB) && + !BooleanFlagOn(pFCB->Flags, FCB_IS_FAT) && !BooleanFlagOn(pFCB->Flags, FCB_IS_VOLUME)) + { + RemoveEntryList(&pFCB->ParentListEntry); + } ExFreePool(pFCB->PathNameBuffer); ExDeleteResourceLite(&pFCB->PagingIoResource); ExDeleteResourceLite(&pFCB->MainResource); ExFreeToNPagedLookasideList(&VfatGlobalData->FcbLookasideList, pFCB); - RemoveEntryList(&pFCB->ParentListEntry); ASSERT(IsListEmpty(&pFCB->ParentListHead)); }

1 0

[pschweitzer] 72125: [FASTFAT] Addendum to r72124
by pschweitzer＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: pschweitzer Date: Sat Aug 6 08:32:17 2016 New Revision: 72125 URL: http://svn.reactos.org/svn/reactos?rev=72125&view=rev Log: [FASTFAT] Addendum to r72124 Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Aug 6 08:32:17 2016 @@ -386,8 +386,14 @@ /* List of FCB's for this volume */ LIST_ENTRY FcbListEntry; + /* List of FCB's for the parent */ + LIST_ENTRY ParentListEntry; + /* pointer to the parent fcb */ struct _VFATFCB *parentFcb; + + /* List for the children */ + LIST_ENTRY ParentListHead; /* Flags for the fcb */ ULONG Flags;

1 0

[pschweitzer] 72124: [FASTFAT] Track child FCB in parent FCB to allow browsing them in case it's needed. This allows fixing a FIXME and offering better performances when renaming a directory. CORE-...
by pschweitzer＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: pschweitzer Date: Sat Aug 6 08:30:30 2016 New Revision: 72124 URL: http://svn.reactos.org/svn/reactos?rev=72124&view=rev Log: [FASTFAT] Track child FCB in parent FCB to allow browsing them in case it's needed. This allows fixing a FIXME and offering better performances when renaming a directory. CORE-11377 CORE-11426 Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c 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] Sat Aug 6 08:30:30 2016 @@ -153,6 +153,7 @@ rcFCB->RFCB.PagingIoResource = &rcFCB->PagingIoResource; rcFCB->RFCB.Resource = &rcFCB->MainResource; rcFCB->RFCB.IsFastIoPossible = FastIoIsNotPossible; + InitializeListHead(&rcFCB->ParentListHead); return rcFCB; } @@ -271,6 +272,8 @@ ExDeleteResourceLite(&pFCB->PagingIoResource); ExDeleteResourceLite(&pFCB->MainResource); ExFreeToNPagedLookasideList(&VfatGlobalData->FcbLookasideList, pFCB); + RemoveEntryList(&pFCB->ParentListEntry); + ASSERT(IsListEmpty(&pFCB->ParentListHead)); } BOOLEAN @@ -455,6 +458,7 @@ /* Save old parent */ OldParent = Fcb->parentFcb; + RemoveEntryList(&Fcb->ParentListEntry); /* Reinit FCB */ vfatInitFCBFromDirEntry(pVCB, Fcb, DirContext); @@ -464,6 +468,7 @@ CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); } Fcb->parentFcb = ParentFcb; + InsertTailList(&ParentFcb->ParentListHead, &Fcb->ParentListEntry); vfatAddFCBToTable(pVCB, Fcb); /* If we moved across directories, dereference our old parent @@ -673,6 +678,7 @@ vfatFCBInitializeCacheFromVolume(vcb, rcFCB); } rcFCB->parentFcb = directoryFCB; + InsertTailList(&directoryFCB->ParentListHead, &rcFCB->ParentListEntry); vfatAddFCBToTable(vcb, rcFCB); *fileFCB = rcFCB; Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat Aug 6 08:30:30 2016 @@ -704,19 +704,17 @@ vfatSplitPathName(&NewName, &NewPath, &NewFile); DPRINT("New dir: %wZ, New file: %wZ\n", &NewPath, &NewFile); - /* FIXME: Do it in a more efficient way, like linking FCBs to their parent FCB so that we browse less FCBs - * Note: The FIXME is the way MS FastFAT seems to do it - */ - if (vfatFCBIsDirectory(FCB)) + if (vfatFCBIsDirectory(FCB) && !IsListEmpty(&FCB->ParentListHead)) { PLIST_ENTRY Entry; PVFATFCB VolFCB; - for (Entry = DeviceExt->FcbListHead.Flink; Entry != &DeviceExt->FcbListHead; Entry = Entry->Flink) - { - VolFCB = CONTAINING_RECORD(Entry, VFATFCB, FcbListEntry); - if (VolFCB->parentFcb == FCB && VolFCB->OpenHandleCount != 0) - { + for (Entry = FCB->ParentListHead.Flink; Entry != &FCB->ParentListHead; Entry = Entry->Flink) + { + VolFCB = CONTAINING_RECORD(Entry, VFATFCB, ParentListEntry); + if (VolFCB->OpenHandleCount != 0) + { + ASSERT(VolFCB->parentFCB == FCB); DPRINT1("At least one children file opened! %wZ (%u, %u)\n", &VolFCB->PathNameU, VolFCB->RefCount, VolFCB->OpenHandleCount); Status = STATUS_ACCESS_DENIED; ASSERT(OldReferences == FCB->parentFcb->RefCount);

1 0

[akhaldi] 72123: [CALC] We don't need mingwex anymore. CORE-11799
by akhaldi＠svn.reactos.org 06 Aug '16

06 Aug '16

Author: akhaldi Date: Sat Aug 6 08:26:54 2016 New Revision: 72123 URL: http://svn.reactos.org/svn/reactos?rev=72123&view=rev Log: [CALC] We don't need mingwex anymore. CORE-11799 Modified: trunk/reactos/base/applications/calc/CMakeLists.txt Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Aug 6 08:26:54 2016 @@ -15,9 +15,7 @@ set_module_type(calc win32gui UNICODE) add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32) -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(calc mingwex) -elseif(MSVC) +if(MSVC) add_importlibs(calc ntdll) endif()

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