Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64583: [NTOSKRNL] Move MmMapMemoryArea to Cc and rename it to CcRosMapVacb
by tkreuzer＠svn.reactos.org 08 Oct '14

08 Oct '14

Author: tkreuzer Date: Wed Oct 8 00:30:15 2014 New Revision: 64583 URL: http://svn.reactos.org/svn/reactos?rev=64583&view=rev Log: [NTOSKRNL] Move MmMapMemoryArea to Cc and rename it to CcRosMapVacb Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=645… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Oct 8 00:30:15 2014 @@ -579,6 +579,41 @@ } static +VOID +CcRosMapVacb(PVOID BaseAddress, + SIZE_T Length, + ULONG Consumer, + ULONG Protection) +{ + ULONG i; + NTSTATUS Status; + + ASSERT(((ULONG_PTR)BaseAddress % PAGE_SIZE) == 0); + + for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) + { + PFN_NUMBER Page; + + Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to allocate page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + Status = MmCreateVirtualMapping (NULL, + (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), + Protection, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + } +} + +static NTSTATUS CcRosCreateVacb ( PROS_SHARED_CACHE_MAP SharedCacheMap, @@ -719,7 +754,7 @@ } #endif - MmMapMemoryArea(current->BaseAddress, VACB_MAPPING_GRANULARITY, + CcRosMapVacb(current->BaseAddress, VACB_MAPPING_GRANULARITY, MC_CACHE, PAGE_READWRITE); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Oct 8 00:30:15 2014 @@ -540,13 +540,6 @@ VOID NTAPI -MmMapMemoryArea(PVOID BaseAddress, - SIZE_T Length, - ULONG Consumer, - ULONG Protection); - -VOID -NTAPI MiRosCheckMemoryAreas( PMMSUPPORT AddressSpace); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Wed Oct 8 00:30:15 2014 @@ -1081,39 +1081,6 @@ return STATUS_SUCCESS; } -VOID NTAPI -MmMapMemoryArea(PVOID BaseAddress, - SIZE_T Length, - ULONG Consumer, - ULONG Protection) -{ - ULONG i; - NTSTATUS Status; - - ASSERT(((ULONG_PTR)BaseAddress % PAGE_SIZE) == 0); - - for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - PFN_NUMBER Page; - - Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to allocate page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - Status = MmCreateVirtualMapping (NULL, - (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), - Protection, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - } -} VOID NTAPI

1 0

[tkreuzer] 64582: [ADVAPI32] Hey Arch, stop spamming my debug logs!
by tkreuzer＠svn.reactos.org 07 Oct '14

07 Oct '14

Author: tkreuzer Date: Tue Oct 7 22:07:44 2014 New Revision: 64582 URL: http://svn.reactos.org/svn/reactos?rev=64582&view=rev Log: [ADVAPI32] Hey Arch, stop spamming my debug logs! Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Tue Oct 7 22:07:44 2014 @@ -711,7 +711,7 @@ goto Exit; } - ERR("Maxfallbacksubkeylen: %d\n", MaxFallbackSubKeyLen); + TRACE("Maxfallbacksubkeylen: %d\n", MaxFallbackSubKeyLen); /* Allocate our buffer */ FallbackSubKeyName = RtlAllocateHeap( @@ -925,7 +925,7 @@ goto Exit; } - ERR("Maxfallbacksubkeylen: %d\n", MaxFallbackValueNameLen); + TRACE("Maxfallbacksubkeylen: %d\n", MaxFallbackValueNameLen); /* Allocate our buffer */ FallbackValueName = RtlAllocateHeap(

1 0

[tkreuzer] 64581: [NTOSKRNL] Silence some annoying DPRINTs
by tkreuzer＠svn.reactos.org 07 Oct '14

07 Oct '14

Author: tkreuzer Date: Tue Oct 7 22:02:12 2014 New Revision: 64581 URL: http://svn.reactos.org/svn/reactos?rev=64581&view=rev Log: [NTOSKRNL] Silence some annoying DPRINTs Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Oct 7 22:02:12 2014 @@ -714,7 +714,7 @@ PMMPFN Pfn1, Pfn2; /* Make sure the lock is held */ - DPRINT1("Inserting page: %lx into standby list !\n", PageFrameIndex); + DPRINT("Inserting page: %lx into standby list !\n", PageFrameIndex); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Make sure the PFN is valid */ @@ -1171,7 +1171,7 @@ TempPte.u.Soft.Prototype = 0; TempPte.u.Soft.Protection = Pfn1->OriginalPte.u.Soft.Protection; MI_WRITE_INVALID_PTE(PointerPte, TempPte); - DPRINT1("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); + DPRINT("Marking PTE: %p as transition (%p - %lx)\n", PointerPte, Pfn1, MiGetPfnEntryIndex(Pfn1)); } /* Put the page in transition */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Oct 7 22:02:12 2014 @@ -676,7 +676,7 @@ if (TempPte.u.Soft.Transition == 1) { /* We can give the page back for other use */ - DPRINT1("Releasing page for transition PTE %p\n", PointerPte); + DPRINT("Releasing page for transition PTE %p\n", PointerPte); PageFrameIndex = PFN_FROM_PTE(&TempPte); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); @@ -1675,7 +1675,6 @@ ASSERT(MiIsRosSectionObject(SectionObject) == TRUE); /* Return the image information */ - DPRINT1("HERE!\n"); *ImageInformation = ((PROS_SECTION_OBJECT)SectionObject)->ImageSection->ImageInformation; }

1 0

[dquintana] 64580: [BROWSEUI] * Fix opening folder windows on desktop process.
by dquintana＠svn.reactos.org 07 Oct '14

07 Oct '14

Author: dquintana Date: Tue Oct 7 20:23:52 2014 New Revision: 64580 URL: http://svn.reactos.org/svn/reactos?rev=64580&view=rev Log: [BROWSEUI] * Fix opening folder windows on desktop process. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Oct 7 20:23:52 2014 @@ -3401,7 +3401,8 @@ BOOL Ret; // Tell the thread ref we are using it. - parameters->offsetF8->AddRef(); + if (parameters && parameters->offsetF8) + parameters->offsetF8->AddRef(); ATLTRY(theCabinet = new CComObject<CShellBrowser>); if (theCabinet == NULL) @@ -3444,7 +3445,8 @@ theCabinet.Detach(); // Tell the thread ref we are not using it anymore. - parameters->offsetF8->Release(); + if (parameters && parameters->offsetF8) + parameters->offsetF8->Release(); return hResult; }

1 0

[dquintana] 64579: [RSHELL] * Work around shellexecute not handling GUID path components by giving them to explorer as a cmdline parameter. * NOTE: The Printers and Faxes option is temporarily disa...
by dquintana＠svn.reactos.org 07 Oct '14

07 Oct '14

Author: dquintana Date: Tue Oct 7 14:45:32 2014 New Revision: 64579 URL: http://svn.reactos.org/svn/reactos?rev=64579&view=rev Log: [RSHELL] * Work around shellexecute not handling GUID path components by giving them to explorer as a cmdline parameter. * NOTE: The Printers and Faxes option is temporarily disabled because it CRASHES explorer-new. Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Tue Oct 7 14:45:32 2014 @@ -221,12 +221,21 @@ HRESULT OnExec(LPSMDATA psmd) { + // H H A CCC K K ! ! ! + // H H A A C C K K ! ! ! + // HHHHH AAAAA C KKK ! ! ! + // H H A A C C K K ! ! ! + // H H A A CCC K K . . . + // + // HACK: Instead of running explorer.exe with the path, we should be using ShellExecute to "open" the path directly! + // Remove once ShellExecute can handle CLSID path components. + if (psmd->uId == IDM_CONTROLPANEL) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, NULL, 1); + ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, SW_SHOWNORMAL); else if (psmd->uId == IDM_NETWORKCONNECTIONS) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, NULL, 1); + ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", NULL, SW_SHOWNORMAL); else if (psmd->uId == IDM_PRINTERSANDFAXES) - ShellExecuteW(NULL, L"open", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, NULL, 1); + {}/* FIXME: crashes: ShellExecuteW(NULL, NULL, L"explorer.exe", L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B30309D}", NULL, SW_SHOWNORMAL);*/ else PostMessageW(m_hwndTray, WM_COMMAND, psmd->uId, 0);

1 0

[dquintana] 64578: [FILEBROWSER] * Always open separate. [BROWSEUI] * Use the threadref IUnknown for reference counting in the browser threads.
by dquintana＠svn.reactos.org 07 Oct '14

07 Oct '14

Author: dquintana Date: Tue Oct 7 14:40:33 2014 New Revision: 64578 URL: http://svn.reactos.org/svn/reactos?rev=64578&view=rev Log: [FILEBROWSER] * Always open separate. [BROWSEUI] * Use the threadref IUnknown for reference counting in the browser threads. Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c branches/shell-experiments/dll/win32/browseui/desktopipc.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Tue Oct 7 14:40:33 2014 @@ -27,14 +27,15 @@ #include <shlwapi_undoc.h> #include <stdio.h> -typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); - int _tmain(int argc, _TCHAR* argv[]) { EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 }; if (SHExplorerParseCmdLine(&parseResults)) + { + parseResults.dwFlags |= SH_EXPLORER_CMDLINE_FLAG_SEPARATE; return SHCreateFromDesktop(&parseResults); + } return 0; } Modified: branches/shell-experiments/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Tue Oct 7 14:40:33 2014 @@ -450,15 +450,21 @@ HANDLE threadHandle; DWORD threadID; - DbgPrint("SHOpenFolderWindow\n"); - - threadHandle = CreateThread(NULL, 0x10000, BrowserThreadProc, parameters, 0, &threadID); + WCHAR debugStr[MAX_PATH + 1]; + SHGetPathFromIDListW(parameters->directoryPIDL, debugStr); + + DbgPrint("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); + + PIE_THREAD_PARAM_BLOCK paramsCopy = SHCloneIETHREADPARAM(parameters); + + SHGetInstanceExplorer(&(paramsCopy->offsetF8)); + threadHandle = CreateThread(NULL, 0x10000, BrowserThreadProc, paramsCopy, 0, &threadID); if (threadHandle != NULL) { CloseHandle(threadHandle); return S_OK; } - SHDestroyIETHREADPARAM(parameters); + SHDestroyIETHREADPARAM(paramsCopy); return E_FAIL; } @@ -485,8 +491,12 @@ parameters->offset10 = param10; parameters->directoryPIDL = pidl; parameters->dwFlags = dwFlags; - - return SHOpenFolderWindow(parameters); + + HRESULT hr = SHOpenFolderWindow(parameters); + + SHDestroyIETHREADPARAM(parameters); + + return hr; } /************************************************************************* Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Oct 7 14:40:33 2014 @@ -3399,6 +3399,9 @@ HRESULT hResult; MSG Msg; BOOL Ret; + + // Tell the thread ref we are using it. + parameters->offsetF8->AddRef(); ATLTRY(theCabinet = new CComObject<CShellBrowser>); if (theCabinet == NULL) @@ -3440,6 +3443,9 @@ theCabinet.Detach(); + // Tell the thread ref we are not using it anymore. + parameters->offsetF8->Release(); + return hResult; } @@ -3454,5 +3460,7 @@ OleUninitialize(); + SHDestroyIETHREADPARAM(parameters); + return hr; }

1 0

[pschweitzer] 64577: [NTFS] - Implement NtfsDirFindFile() - Enable again NtfsMakeFCBFromDirEntry() and fix its prototype but disable its implementation yet
by pschweitzer＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: pschweitzer Date: Mon Oct 6 20:51:41 2014 New Revision: 64577 URL: http://svn.reactos.org/svn/reactos?rev=64577&view=rev Log: [NTFS] - Implement NtfsDirFindFile() - Enable again NtfsMakeFCBFromDirEntry() and fix its prototype but disable its implementation yet Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Oct 6 20:51:41 2014 @@ -348,15 +348,17 @@ DPRINT("Name '%S'\n", Name); } +#endif NTSTATUS -NtfsMakeFCBFromDirEntry(PVCB Vcb, - PFCB DirectoryFCB, +NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, + PNTFS_FCB DirectoryFCB, PWSTR Name, - PDIR_RECORD Record, - PFCB * fileFCB) -{ + PFILE_RECORD_HEADER Record, + PNTFS_FCB * fileFCB) +{ +#if 0 WCHAR pathName[MAX_PATH]; PFCB rcFCB; ULONG Size; @@ -400,8 +402,10 @@ *fileFCB = rcFCB; return(STATUS_SUCCESS); -} +#else + return STATUS_NOT_IMPLEMENTED; #endif +} NTSTATUS @@ -451,113 +455,26 @@ PWSTR FileToFind, PNTFS_FCB *FoundFCB) { -#if 0 - WCHAR TempName[2]; - WCHAR Name[256]; - PVOID Block; - ULONG FirstSector; - ULONG DirSize; - PDIR_RECORD Record; - ULONG Offset; - ULONG BlockOffset; - NTSTATUS Status; - - LARGE_INTEGER StreamOffset; - PVOID Context; - - ASSERT(DeviceExt); - ASSERT(DirectoryFcb); - ASSERT(FileToFind); - - DPRINT("NtfsDirFindFile(VCB:%08x, dirFCB:%08x, File:%S)\n", - DeviceExt, - DirectoryFcb, - FileToFind); - DPRINT("Dir Path:%S\n", DirectoryFcb->PathName); - - /* default to '.' if no filename specified */ - if (wcslen(FileToFind) == 0) - { - TempName[0] = L'.'; - TempName[1] = 0; - FileToFind = TempName; - } - - DirSize = DirectoryFcb->Entry.DataLengthL; - StreamOffset.QuadPart = (LONGLONG)DirectoryFcb->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - - if(!CcMapData(DeviceExt->StreamFileObject, &StreamOffset, - BLOCKSIZE, TRUE, &Context, &Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - - Offset = 0; - BlockOffset = 0; - Record = (PDIR_RECORD)Block; - while(TRUE) - { - if (Record->RecordLength == 0) - { - DPRINT("RecordLength == 0 Stopped!\n"); - break; - } - - DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - - NtfsGetDirEntryName(DeviceExt, Record, Name); - DPRINT("Name '%S'\n", Name); - - if (wstrcmpjoki(Name, FileToFind)) - { - DPRINT("Match found, %S\n", Name); - Status = NtfsMakeFCBFromDirEntry(DeviceExt, - DirectoryFcb, - Name, - Record, - FoundFCB); - - CcUnpinData(Context); - - return(Status); - } - - Offset += Record->RecordLength; - BlockOffset += Record->RecordLength; - Record = (PDIR_RECORD)(Block + BlockOffset); - if (BlockOffset >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(Context); - StreamOffset.QuadPart += BLOCKSIZE; - Offset = ROUND_UP(Offset, BLOCKSIZE); - BlockOffset = 0; - - if (!CcMapData(DeviceExt->StreamFileObject, - &StreamOffset, - BLOCKSIZE, TRUE, - &Context, &Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - Record = (PDIR_RECORD)(Block + BlockOffset); - } - - if (Offset >= DirSize) - break; - } - - CcUnpinData(Context); -#else - UNREFERENCED_PARAMETER(Vcb); - UNREFERENCED_PARAMETER(DirectoryFcb); - UNREFERENCED_PARAMETER(FileToFind); - UNREFERENCED_PARAMETER(FoundFCB); -#endif - return STATUS_OBJECT_NAME_NOT_FOUND; + NTSTATUS Status; + ULONGLONG CurrentDir; + UNICODE_STRING File; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + + *FoundFCB = NULL; + RtlInitUnicodeString(&File, FileToFind); + CurrentDir = DirectoryFcb->MFTIndex; + + Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &DataContext, CurrentDir); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = NtfsMakeFCBFromDirEntry(Vcb, DirectoryFcb, FileToFind, FileRecord, FoundFCB); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + return Status; }

1 0

[pschweitzer] 64576: [NTFS] Not being working (yet) doesn't mean you can leak mem!
by pschweitzer＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: pschweitzer Date: Mon Oct 6 19:28:41 2014 New Revision: 64576 URL: http://svn.reactos.org/svn/reactos?rev=64576&view=rev Log: [NTFS] Not being working (yet) doesn't mean you can leak mem! Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Mon Oct 6 19:28:41 2014 @@ -682,6 +682,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsLookupFile: Can't read MFT record\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } @@ -689,6 +690,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtfsLookupFile: Can't find data attribute\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; }

1 0

[akhaldi] 64575: [EVENTVWR] * Minor style change.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:47:17 2014 New Revision: 64575 URL: http://svn.reactos.org/svn/reactos?rev=64575&view=rev Log: [EVENTVWR] * Minor style change. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon Oct 6 18:47:17 2014 @@ -520,7 +520,7 @@ QueryEventMessages(LPWSTR lpMachineName, LPWSTR lpLogName) { - HWND hwndDlg=0; + HWND hwndDlg = NULL; HANDLE hEventLog; EVENTLOGRECORD *pevlr; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 0, dwRecordsToRead = 0, dwFlags, dwMaxLength;

1 0

[akhaldi] 64574: [CMAKE] * Target shdocvw_v1 doesn't exist, don't depend on it.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:43:37 2014 New Revision: 64574 URL: http://svn.reactos.org/svn/reactos?rev=64574&view=rev Log: [CMAKE] * Target shdocvw_v1 doesn't exist, don't depend on it. Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Oct 6 18:43:37 2014 @@ -108,6 +108,5 @@ kernel32 ntdll) -add_dependencies(shell32 shdocvw_v1) add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

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