Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 65195: [NTFS] Optimize directory search initialization
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 20:18:27 2014 New Revision: 65195 URL: http://svn.reactos.org/svn/reactos?rev=65195&view=rev Log: [NTFS] Optimize directory search initialization Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 2 20:18:27 2014 @@ -305,7 +305,6 @@ PNTFS_FCB Fcb; PNTFS_CCB Ccb; BOOLEAN First = FALSE; - BOOLEAN WildCard; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status = STATUS_SUCCESS; @@ -338,16 +337,23 @@ if (!Ccb->DirectorySearchPattern) { First = TRUE; - Ccb->DirectorySearchPattern = - ExAllocatePoolWithTag(NonPagedPool, SearchPattern->Length + sizeof(WCHAR), TAG_NTFS); + Pattern.Length = 0; + Pattern.MaximumLength = SearchPattern->Length + sizeof(WCHAR); + Ccb->DirectorySearchPattern = Pattern.Buffer = + ExAllocatePoolWithTag(NonPagedPool, Pattern.MaximumLength, TAG_NTFS); if (!Ccb->DirectorySearchPattern) { return STATUS_INSUFFICIENT_RESOURCES; } - memcpy(Ccb->DirectorySearchPattern, - SearchPattern->Buffer, - SearchPattern->Length); + Status = RtlUpcaseUnicodeString(&Pattern, SearchPattern, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlUpcaseUnicodeString('%wZ') failed with status 0x%08lx\n", &Pattern, Status); + ExFreePoolWithTag(Ccb->DirectorySearchPattern, TAG_NTFS); + Ccb->DirectorySearchPattern = NULL; + return Status; + } Ccb->DirectorySearchPattern[SearchPattern->Length / sizeof(WCHAR)] = 0; } } @@ -365,19 +371,8 @@ } RtlInitUnicodeString(&Pattern, Ccb->DirectorySearchPattern); - WildCard = FsRtlDoesNameContainWildCards(&Pattern); - if (WildCard) - { - Status = RtlUpcaseUnicodeString(&Pattern, &Pattern, FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlUpcaseUnicodeString('%wZ') failed with status 0x%08lx\n", &Pattern, Status); - return Status; - } - } - - DPRINT1("Search pattern '%S'\n", Ccb->DirectorySearchPattern); - DPRINT1("In: '%S'\n", Fcb->PathName); + DPRINT("Search pattern '%S'\n", Ccb->DirectorySearchPattern); + DPRINT("In: '%S'\n", Fcb->PathName); /* Determine directory index */ if (Stack->Flags & SL_INDEX_SPECIFIED)

1 0

[dquintana] 65194: [RSHELL] [STOBJECT] * Some nitpicking. [SHELL32] * Fix missing null-termination by using proper string literals.
by dquintana＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: dquintana Date: Sun Nov 2 20:17:23 2014 New Revision: 65194 URL: http://svn.reactos.org/svn/reactos?rev=65194&view=rev Log: [RSHELL] [STOBJECT] * Some nitpicking. [SHELL32] * Fix missing null-termination by using proper string literals. Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/shellext/stobject/csystray.cpp branches/shell-experiments/dll/win32/shell32/desktop.cpp branches/shell-experiments/include/reactos/undocshell.h branches/shell-experiments/lib/atl/atlwin.h Modified: branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CDesktopBrowser.cpp [iso-8859-1] Sun Nov 2 20:17:23 2014 @@ -26,10 +26,8 @@ #define SHDESK_TAG 0x4b534544 -static const WCHAR szProgmanClassName [] = { 'P', 'r', 'o', 'g', 'm', 'a', 'n' }; -static const WCHAR szProgmanWindowName [] = { - 'P', 'r', 'o', 'g', 'r', 'a', 'm', ' ', 'M', 'a', 'n', 'a', 'g', 'e', 'r' -}; +static const WCHAR szProgmanClassName [] = L"Progman"; +static const WCHAR szProgmanWindowName [] = L"Program Manager"; class CDesktopBrowser : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -542,7 +540,7 @@ rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); } - hWndDesk = CreateWindowExW(0, szProgmanClassName, szProgmanWindowName, + hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, NULL, NULL, shell32_hInstance, reinterpret_cast<LPVOID>(ShellDesk)); 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] Sun Nov 2 20:17:23 2014 @@ -85,13 +85,20 @@ return S_OK; hr = IUnknown_GetSite(m_pDeskBar, IID_PPV_ARG(ITrayPriv, &m_pTrayPriv)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = IUnknown_GetWindow(m_pTrayPriv, &m_hwndTray); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = m_pTrayPriv->AppendMenuW(&hmenu); -#ifndef TEST_TRACKPOPUPMENU_SUBMENUS + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = m_pShellMenu->SetMenu(hmenu, NULL, SMSET_BOTTOM); -#else - hr = m_pShellMenu->SetMenu(hmenu, m_hwndTray, SMSET_BOTTOM); -#endif + if (FAILED_UNEXPECTEDLY(hr)) + return hr; return hr; } Modified: branches/shell-experiments/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] Sun Nov 2 20:17:23 2014 @@ -194,6 +194,7 @@ UpdateIcons(); return TRUE; case WM_DESTROY: + KillTimer(1); ShutdownIcons(); return TRUE; } Modified: branches/shell-experiments/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] Sun Nov 2 20:17:23 2014 @@ -26,10 +26,8 @@ #define SHDESK_TAG 0x4b534544 -static const WCHAR szProgmanClassName[] = {'P','r','o','g','m','a','n'}; -static const WCHAR szProgmanWindowName[] = { - 'P','r','o','g','r','a','m',' ','M','a','n','a','g','e','r' -}; +static const WCHAR szProgmanClassName [] = L"Progman"; +static const WCHAR szProgmanWindowName [] = L"Program Manager"; class CDesktopBrowser : public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -543,7 +541,7 @@ rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); } - hWndDesk = CreateWindowExW(0, szProgmanClassName, szProgmanWindowName, + hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); Modified: branches/shell-experiments/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… ============================================================================== --- branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/include/reactos/undocshell.h [iso-8859-1] Sun Nov 2 20:17:23 2014 @@ -823,6 +823,29 @@ return S_OK; } +template<class T, class T1> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, void ** ppv) +{ + CComPtr<T> obj; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new _CComObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, ppv); + if (FAILED(hResult)) + return hResult; + + hResult = obj->Initialize(initArg1); + if (FAILED(hResult)) + return hResult; + + return S_OK; +} + template<class T, class T1, class R> HRESULT inline ShellObjectCreatorInit(T1 initArg1, REFIID riid, R ** ppv) { @@ -926,6 +949,32 @@ return S_OK; } + +template<class T, class T1, class T2, class T3, class T4, class T5, class R> +HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 initArg4, T5 initArg5, REFIID riid, R ** ppv) +{ + CComPtr<T> obj; + CComPtr<R> result; + HRESULT hResult; + + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + ATLTRY(obj = new _CComObject<T>); + if (obj.p == NULL) + return E_OUTOFMEMORY; + hResult = obj->QueryInterface(riid, reinterpret_cast<void **>(&result)); + if (FAILED(hResult)) + return hResult; + + hResult = obj->Initialize(initArg1, initArg2, initArg3, initArg4, initArg5); + if (FAILED(hResult)) + return hResult; + + *ppv = result.Detach(); + + return S_OK; +} #endif /* __cplusplus */ #endif /* __WINE_UNDOCSHELL_H */ Modified: branches/shell-experiments/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/atl/atlwi… ============================================================================== --- branches/shell-experiments/lib/atl/atlwin.h [iso-8859-1] (original) +++ branches/shell-experiments/lib/atl/atlwin.h [iso-8859-1] Sun Nov 2 20:17:23 2014 @@ -696,6 +696,10 @@ { \ case 0: +#define ALT_MSG_MAP(map) \ + break; \ + case map: + #define END_MSG_MAP() \ break; \ default: \

1 0

[dquintana] 65193: [SHELL32] * Fix GCC build.
by dquintana＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: dquintana Date: Sun Nov 2 20:13:56 2014 New Revision: 65193 URL: http://svn.reactos.org/svn/reactos?rev=65193&view=rev Log: [SHELL32] * Fix GCC build. Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Sun Nov 2 20:13:56 2014 @@ -2261,7 +2261,7 @@ TRACE("(%p)->(%u), stub\n", this, ViewMode); /* It's not redundant to check FVM_AUTO because it's a (UINT)-1 */ - if ((ViewMode < FVM_FIRST || ViewMode > FVM_LAST) && (ViewMode != FVM_AUTO)) + if (((INT)ViewMode < FVM_FIRST || (INT)ViewMode > FVM_LAST) && ((INT)ViewMode != FVM_AUTO)) return E_INVALIDARG; /* Windows before Vista uses LVM_SETVIEW and possibly

1 0

[pschweitzer] 65192: [NTFS] Quickly implement NtfsReadFile(). By quickly, I mean that it works but is under optimal in many ways, and also doesn't support any caching. So, don't expect breaking per...
by pschweitzer＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: pschweitzer Date: Sun Nov 2 19:55:22 2014 New Revision: 65192 URL: http://svn.reactos.org/svn/reactos?rev=65192&view=rev Log: [NTFS] Quickly implement NtfsReadFile(). By quickly, I mean that it works but is under optimal in many ways, and also doesn't support any caching. So, don't expect breaking performances. BUUUUUUT... This implements reading a file on a NTFS volume on ReactOS! And it works! Here is a picture of all the achievements of ReactOS with NTFS lately: http://www.heisspiter.net/~Pierre/rostests/NTFS_all.png -> Volume information -> Displaying files in explorer -> Moving across directories -> Reading a file (with more here) That's all folks! (for now ;-)) Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Nov 2 19:55:22 2014 @@ -52,84 +52,116 @@ ULONG IrpFlags, PULONG LengthRead) { -#if 0 - NTSTATUS Status = STATUS_SUCCESS; - PUCHAR TempBuffer; - ULONG TempLength; - PCCB Ccb; - PFCB Fcb; - - DPRINT("CdfsReadFile(ReadOffset %lu Length %lu)\n", ReadOffset, Length); - - *LengthRead = 0; - - if (Length == 0) - return(STATUS_SUCCESS); - - Ccb = (PCCB)FileObject->FsContext2; - Fcb = (PFCB)FileObject->FsContext; - - if (ReadOffset >= Fcb->Entry.DataLengthL) - return(STATUS_END_OF_FILE); - - DPRINT("Reading %d bytes at %d\n", Length, ReadOffset); - - if (!(IrpFlags & (IRP_NOCACHE|IRP_PAGING_IO))) - { - LARGE_INTEGER FileOffset; - IO_STATUS_BLOCK IoStatus; - - if (ReadOffset + Length > Fcb->Entry.DataLengthL) - Length = Fcb->Entry.DataLengthL - ReadOffset; - if (FileObject->PrivateCacheMap == NULL) - { - CcRosInitializeFileCache(FileObject, PAGE_SIZE); - } - - FileOffset.QuadPart = (LONGLONG)ReadOffset; - CcCopyRead(FileObject, - &FileOffset, - Length, - TRUE, - Buffer, - &IoStatus); - *LengthRead = IoStatus.Information; - - return(IoStatus.Status); - } - - if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) - { - return STATUS_INVALID_PARAMETER; - } - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - - Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) - { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, Length + ReadOffset - Fcb->Entry.DataLengthL); - } - } - - return(Status); -#else - UNREFERENCED_PARAMETER(DeviceExt); - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(Length); - UNREFERENCED_PARAMETER(ReadOffset); - UNREFERENCED_PARAMETER(IrpFlags); + NTSTATUS Status = STATUS_SUCCESS; + PNTFS_FCB Fcb; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONG RealLength; + ULONG RealReadOffset; + ULONG RealLengthRead; + ULONG ToRead; + BOOLEAN AllocatedBuffer = FALSE; + PCHAR ReadBuffer = (PCHAR)Buffer; + + DPRINT1("NtfsReadFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); + *LengthRead = 0; - return STATUS_END_OF_FILE; -#endif + + if (Length == 0) + { + DPRINT1("Null read!\n"); + return STATUS_SUCCESS; + } + + Fcb = (PNTFS_FCB)FileObject->FsContext; + + if (ReadOffset >= Fcb->Entry.AllocatedSize) + { + DPRINT1("Reading beyond file end!\n"); + return STATUS_END_OF_FILE; + } + + ToRead = Length; + if (ReadOffset + Length > Fcb->Entry.AllocatedSize) + ToRead = Fcb->Entry.AllocatedSize - ReadOffset; + + RealReadOffset = ReadOffset; + RealLength = ToRead; + + if ((ReadOffset % DeviceExt->NtfsInfo.BytesPerSector) != 0 || (ToRead % DeviceExt->NtfsInfo.BytesPerSector) != 0) + { + RealReadOffset = ROUND_DOWN(ReadOffset, DeviceExt->NtfsInfo.BytesPerSector); + RealLength = ROUND_UP(ToRead, DeviceExt->NtfsInfo.BytesPerSector); + + ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + DeviceExt->NtfsInfo.BytesPerSector, TAG_NTFS); + if (ReadBuffer == NULL) + { + DPRINT1("Not enough memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + AllocatedBuffer = TRUE; + } + + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (FileRecord == NULL) + { + DPRINT1("Not enough memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(DeviceExt, Fcb->MFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't find record!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, L"", 0, &DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No data associated with file!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + DPRINT1("Effective read: %lu at %lu\n", RealLength, RealReadOffset); + RealLengthRead = ReadAttribute(DeviceExt, DataContext, RealReadOffset, (PCHAR)ReadBuffer, RealLength); + if (RealLengthRead != RealLength) + { + DPRINT1("Read failure!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } + return Status; + } + + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + + *LengthRead = ToRead; + + DPRINT1("%lu got read\n", *LengthRead); + + if (AllocatedBuffer) + { + RtlCopyMemory(Buffer, ReadBuffer + (ReadOffset - RealReadOffset), ToRead); + } + + if (ToRead != Length) + { + RtlZeroMemory(Buffer + ToRead, Length - ToRead); + } + + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } + + return STATUS_SUCCESS; }

1 0

[pschweitzer] 65191: [NTFS] Don't attempt to uninitialize cache map with a spin lock held.
by pschweitzer＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: pschweitzer Date: Sun Nov 2 19:27:58 2014 New Revision: 65191 URL: http://svn.reactos.org/svn/reactos?rev=65191&view=rev Log: [NTFS] Don't attempt to uninitialize cache map with a spin lock held. 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] Sun Nov 2 19:27:58 2014 @@ -162,11 +162,14 @@ if (Fcb->RefCount <= 0 && !NtfsFCBIsDirectory(Fcb)) { RemoveEntryList(&Fcb->FcbListEntry); + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); CcUninitializeCacheMap(Fcb->FileObject, NULL, NULL); NtfsDestroyFCB(Fcb); } - - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + else + { + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + } }

1 0

[hpoussin] 65190: [NTFS] Fix directory listing with search pattern This fixes name completion in command prompt.
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 18:58:16 2014 New Revision: 65190 URL: http://svn.reactos.org/svn/reactos?rev=65190&view=rev Log: [NTFS] Fix directory listing with search pattern This fixes name completion in command prompt. Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Nov 2 18:58:16 2014 @@ -305,6 +305,7 @@ PNTFS_FCB Fcb; PNTFS_CCB Ccb; BOOLEAN First = FALSE; + BOOLEAN WildCard; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; NTSTATUS Status = STATUS_SUCCESS; @@ -364,6 +365,16 @@ } RtlInitUnicodeString(&Pattern, Ccb->DirectorySearchPattern); + WildCard = FsRtlDoesNameContainWildCards(&Pattern); + if (WildCard) + { + Status = RtlUpcaseUnicodeString(&Pattern, &Pattern, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlUpcaseUnicodeString('%wZ') failed with status 0x%08lx\n", &Pattern, Status); + return Status; + } + } DPRINT1("Search pattern '%S'\n", Ccb->DirectorySearchPattern); DPRINT1("In: '%S'\n", Fcb->PathName);

1 0

[hpoussin] 65189: [NTOS:CM] Remove some debug prints
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 18:58:09 2014 New Revision: 65189 URL: http://svn.reactos.org/svn/reactos?rev=65189&view=rev Log: [NTOS:CM] Remove some debug prints Modified: trunk/reactos/ntoskrnl/config/cmlazy.c Modified: trunk/reactos/ntoskrnl/config/cmlazy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmlazy.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmlazy.c [iso-8859-1] Sun Nov 2 18:58:09 2014 @@ -78,12 +78,14 @@ else { /* Do the sync */ - DPRINT1("Flushing: %wZ\n", &CmHive->FileFullPath); - DPRINT1("Handle: %p\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); + DPRINT("Flushing: %wZ\n", &CmHive->FileFullPath); + DPRINT("Handle: %p\n", CmHive->FileHandles[HFILE_TYPE_PRIMARY]); Status = HvSyncHive(&CmHive->Hive); if(!NT_SUCCESS(Status)) { /* Let them know we failed */ + DPRINT1("Failed to flush %wZ on handle %p (status 0x%08lx)\n", + &CmHive->FileFullPath, CmHive->FileHandles[HFILE_TYPE_PRIMARY], Status); *Error = TRUE; Result = FALSE; break;

1 0

[hpoussin] 65188: [FDC] Remove some debug prints
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 18:58:04 2014 New Revision: 65188 URL: http://svn.reactos.org/svn/reactos?rev=65188&view=rev Log: [FDC] Remove some debug prints Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c trunk/reactos/drivers/storage/fdc/fdc/fdo.c trunk/reactos/drivers/storage/fdc/fdc/pdo.c Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] Sun Nov 2 18:58:04 2014 @@ -77,7 +77,7 @@ NTAPI FdcDriverUnload(IN PDRIVER_OBJECT DriverObject) { - DPRINT1("FdcDriverUnload()\n"); + DPRINT("FdcDriverUnload()\n"); } Modified: trunk/reactos/drivers/storage/fdc/fdc/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] Sun Nov 2 18:58:04 2014 @@ -11,6 +11,7 @@ #include "fdc.h" #include <stdio.h> +#define NDEBUG #include <debug.h> /* FUNCTIONS ******************************************************************/ @@ -89,7 +90,7 @@ // PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated; ULONG i; - DPRINT1("FdcFdoStartDevice called\n"); + DPRINT("FdcFdoStartDevice called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -129,7 +130,7 @@ switch (PartialDescriptor->Type) { case CmResourceTypePort: - DPRINT1("Port: 0x%lx (%lu)\n", + DPRINT("Port: 0x%lx (%lu)\n", PartialDescriptor->u.Port.Start.u.LowPart, PartialDescriptor->u.Port.Length); if (PartialDescriptor->u.Port.Length >= 6) @@ -137,7 +138,7 @@ break; case CmResourceTypeInterrupt: - DPRINT1("Interrupt: Level %lu Vector %lu\n", + DPRINT("Interrupt: Level %lu Vector %lu\n", PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector); /* @@ -153,7 +154,7 @@ break; case CmResourceTypeDma: - DPRINT1("Dma: Channel %lu\n", + DPRINT("Dma: Channel %lu\n", PartialDescriptor->u.Dma.Channel); break; } @@ -190,7 +191,7 @@ BOOLEAN ControllerFound = FALSE; ULONG i; - DPRINT1("FdcFdoConfigCallback() called\n"); + DPRINT("FdcFdoConfigCallback() called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)Context; @@ -256,7 +257,7 @@ DeviceExtension->ControllerInfo.Populated = TRUE; - DPRINT1("Detected %lu floppy drives!\n", + DPRINT("Detected %lu floppy drives!\n", DeviceExtension->ControllerInfo.NumberOfDrives); return STATUS_SUCCESS; @@ -341,7 +342,7 @@ ULONG i; NTSTATUS Status; - DPRINT1("FdcFdoQueryBusRelations() called\n"); + DPRINT("FdcFdoQueryBusRelations() called\n"); FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -376,7 +377,7 @@ { swprintf(DeviceNameBuffer, L"\\Device\\FloppyPDO%lu", DeviceNumber++); RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); - DPRINT1("Device name: %S\n", DeviceNameBuffer); + DPRINT("Device name: %S\n", DeviceNameBuffer); /* Create physical device object */ Status = IoCreateDevice(FdoDeviceExtension->Common.DeviceObject->DriverObject, @@ -395,7 +396,7 @@ goto done; } - DPRINT1("PDO created: %S\n", DeviceNameBuffer); + DPRINT("PDO created: %S\n", DeviceNameBuffer); DriveInfo->DeviceObject = Pdo; @@ -415,7 +416,7 @@ /* Add Device ID string */ RtlCreateUnicodeString(&PdoDeviceExtension->DeviceId, L"FDC\\GENERIC_FLOPPY_DRIVE"); - DPRINT1("DeviceID: %S\n", PdoDeviceExtension->DeviceId.Buffer); + DPRINT("DeviceID: %S\n", PdoDeviceExtension->DeviceId.Buffer); /* Add Hardware IDs string */ Status = PciCreateHardwareIDsString(&PdoDeviceExtension->HardwareIds); @@ -496,14 +497,14 @@ ULONG_PTR Information = 0; NTSTATUS Status = STATUS_NOT_SUPPORTED; - DPRINT1("FdcFdoPnp()\n"); + DPRINT("FdcFdoPnp()\n"); IrpSp = IoGetCurrentIrpStackLocation(Irp); switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: - DPRINT1(" IRP_MN_START_DEVICE received\n"); + DPRINT(" IRP_MN_START_DEVICE received\n"); /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -515,53 +516,53 @@ break; case IRP_MN_QUERY_REMOVE_DEVICE: - DPRINT1(" IRP_MN_QUERY_REMOVE_DEVICE\n"); + DPRINT(" IRP_MN_QUERY_REMOVE_DEVICE\n"); break; case IRP_MN_REMOVE_DEVICE: - DPRINT1(" IRP_MN_REMOVE_DEVICE received\n"); + DPRINT(" IRP_MN_REMOVE_DEVICE received\n"); break; case IRP_MN_CANCEL_REMOVE_DEVICE: - DPRINT1(" IRP_MN_CANCEL_REMOVE_DEVICE\n"); + DPRINT(" IRP_MN_CANCEL_REMOVE_DEVICE\n"); break; case IRP_MN_STOP_DEVICE: - DPRINT1(" IRP_MN_STOP_DEVICE received\n"); + DPRINT(" IRP_MN_STOP_DEVICE received\n"); break; case IRP_MN_QUERY_STOP_DEVICE: - DPRINT1(" IRP_MN_QUERY_STOP_DEVICE received\n"); + DPRINT(" IRP_MN_QUERY_STOP_DEVICE received\n"); break; case IRP_MN_CANCEL_STOP_DEVICE: - DPRINT1(" IRP_MN_CANCEL_STOP_DEVICE\n"); + DPRINT(" IRP_MN_CANCEL_STOP_DEVICE\n"); break; case IRP_MN_QUERY_DEVICE_RELATIONS: - DPRINT1(" IRP_MN_QUERY_DEVICE_RELATIONS\n"); + DPRINT(" IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch (IrpSp->Parameters.QueryDeviceRelations.Type) { case BusRelations: - DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); Status = FdcFdoQueryBusRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; case RemovalRelations: - DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); default: - DPRINT1(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", IrpSp->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } break; case IRP_MN_SURPRISE_REMOVAL: - DPRINT1(" IRP_MN_SURPRISE_REMOVAL received\n"); + DPRINT(" IRP_MN_SURPRISE_REMOVAL received\n"); break; default: Modified: trunk/reactos/drivers/storage/fdc/fdc/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/pd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] Sun Nov 2 18:58:04 2014 @@ -10,6 +10,7 @@ #include "fdc.h" +#define NDEBUG #include <debug.h> /* FUNCTIONS ******************************************************************/ @@ -56,22 +57,22 @@ switch (IrpSp->Parameters.QueryId.IdType) { case BusQueryDeviceID: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = &DeviceExtension->DeviceId; break; case BusQueryHardwareIDs: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); SourceString = &DeviceExtension->HardwareIds; break; case BusQueryCompatibleIDs: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &DeviceExtension->CompatibleIds; break; case BusQueryInstanceID: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = &DeviceExtension->InstanceId; break; @@ -102,7 +103,7 @@ ULONG_PTR Information = 0; NTSTATUS Status; - DPRINT1("FdcPdoPnp()\n"); + DPRINT("FdcPdoPnp()\n"); Status = Irp->IoStatus.Status; @@ -119,24 +120,24 @@ break; case IRP_MN_QUERY_BUS_INFORMATION: - DPRINT1("IRP_MN_QUERY_BUS_INFORMATION received\n"); + DPRINT("IRP_MN_QUERY_BUS_INFORMATION received\n"); break; case IRP_MN_QUERY_CAPABILITIES: - DPRINT1("IRP_MN_QUERY_CAPABILITIES received\n"); + DPRINT("IRP_MN_QUERY_CAPABILITIES received\n"); Status = FdcPdoQueryCapabilities(DeviceObject, IrpSp); break; case IRP_MN_QUERY_DEVICE_RELATIONS: - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS received\n"); + DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS received\n"); break; case IRP_MN_QUERY_DEVICE_TEXT: - DPRINT1("IRP_MN_QUERY_DEVICE_TEXT received\n"); + DPRINT("IRP_MN_QUERY_DEVICE_TEXT received\n"); break; case IRP_MN_QUERY_ID: - DPRINT1("IRP_MN_QUERY_ID received\n"); + DPRINT("IRP_MN_QUERY_ID received\n"); Status = FdcPdoQueryId(DeviceObject, IrpSp, &Information); break; @@ -145,11 +146,11 @@ break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: - DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS received\n"); + DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS received\n"); break; case IRP_MN_QUERY_RESOURCES: - DPRINT1("IRP_MN_QUERY_RESOURCES received\n"); + DPRINT("IRP_MN_QUERY_RESOURCES received\n"); break; case IRP_MN_SET_LOCK: @@ -157,7 +158,7 @@ break; case IRP_MN_START_DEVICE: - DPRINT1("IRP_MN_START_DEVICE received\n"); + DPRINT("IRP_MN_START_DEVICE received\n"); break; case IRP_MN_QUERY_STOP_DEVICE: @@ -170,11 +171,11 @@ break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("IRP_MN_REMOVE_DEVICE received\n"); + DPRINT("IRP_MN_REMOVE_DEVICE received\n"); break; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - DPRINT1("IRP_MN_FILTER_RESOURCE_REQUIREMENTS received\n"); + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS received\n"); /* Nothing to do */ Irp->IoStatus.Status = Status; break; @@ -188,7 +189,7 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - DPRINT1("Leaving. Status 0x%X\n", Status); + DPRINT("Leaving. Status 0x%X\n", Status); return Status; }

1 0

[hpoussin] 65187: [SYSSETUP] Disable debug prints (incidentally enabled in r65128)
by hpoussin＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: hpoussin Date: Sun Nov 2 18:57:56 2014 New Revision: 65187 URL: http://svn.reactos.org/svn/reactos?rev=65187&view=rev Log: [SYSSETUP] Disable debug prints (incidentally enabled in r65128) Modified: trunk/reactos/dll/win32/syssetup/classinst.c Modified: trunk/reactos/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/classin… ============================================================================== --- trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/classinst.c [iso-8859-1] Sun Nov 2 18:57:56 2014 @@ -8,7 +8,7 @@ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /*

1 0

[pschweitzer] 65186: [NTFS] Fix a really nasty bug in NTFS: it was possible to perform a buffer overflow when reading the bitmap data.
by pschweitzer＠svn.reactos.org 02 Nov '14

02 Nov '14

Author: pschweitzer Date: Sun Nov 2 17:53:18 2014 New Revision: 65186 URL: http://svn.reactos.org/svn/reactos?rev=65186&view=rev Log: [NTFS] Fix a really nasty bug in NTFS: it was possible to perform a buffer overflow when reading the bitmap data. Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sun Nov 2 17:53:18 2014 @@ -70,7 +70,7 @@ BitmapDataSize = AttributeDataLength(&DataContext->Record); ASSERT((BitmapDataSize * 8) >= (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)); - BitmapData = ExAllocatePoolWithTag(NonPagedPool, BitmapDataSize, TAG_NTFS); + BitmapData = ExAllocatePoolWithTag(NonPagedPool, ROUND_UP(BitmapDataSize, DeviceExt->NtfsInfo.BytesPerSector), TAG_NTFS); if (BitmapData == NULL) { ReleaseAttributeContext(DataContext);

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