Ros-diffs

ros-diffs@reactos.org

81390 discussions

03/06: Minor update
by gedmurphy 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c91a00fcfc3a1aa46c9b… commit 8c91a00fcfc3a1aa46c9bfcee953d009691179f0 Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Jan 18 16:30:13 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 Minor update --- base/shell/explorer/trayntfy.cpp | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 5b8ad09fa3..33ac6c85b3 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -41,11 +41,6 @@ struct IconWatcherData DWORD ProcessId; NOTIFYICONDATA IconData; - IconWatcherData() - { - IconWatcherData(NULL); - } - IconWatcherData(NOTIFYICONDATA *iconData) : hProcess(NULL), ProcessId(0) { @@ -81,6 +76,7 @@ public: m_Loop(false) { } + virtual ~CIconWatcher() { Uninitialize(); @@ -235,12 +231,16 @@ private: if (Status == WAIT_OBJECT_0) { // We've been kicked, we have updates to our list (or we're exiting the thread) + if (This->m_Loop) + TRACE("Updating watched icon list"); } else if ((Status >= WAIT_OBJECT_0 + 1) && (Status < Size)) { IconWatcherData *Icon; Icon = This->GetListEntry(NULL, WatchList[Status], false); + TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf", Icon->ProcessId); + int len = FIELD_OFFSET(SYS_PAGER_COPY_DATA, nicon_data) + Icon->IconData.cbSize; PSYS_PAGER_COPY_DATA pnotify_data = (PSYS_PAGER_COPY_DATA)new BYTE[len]; pnotify_data->cookie = 1; @@ -342,28 +342,6 @@ public: return -1; } - int FindItem(IN GUID& Guid, NOTIFYICONDATA ** pdata) - { - int count = GetButtonCount(); - - for (int i = 0; i < count; i++) - { - NOTIFYICONDATA * data; - - data = GetItemData(i); - - if (data->guidItem == Guid) - { - if (pdata) - *pdata = data; - return i; - } - } - - return -1; - } - - BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn;

1 0

02/06: forgot about the gcc build...
by gedmurphy 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c9629bb725399c074bc2… commit 6c9629bb725399c074bc2856f54b85b9f0e638ae Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Jan 18 15:21:37 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 forgot about the gcc build... --- base/shell/explorer/trayntfy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 256ef4b827..5b8ad09fa3 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -119,7 +119,7 @@ public: EnterCriticalSection(&m_ListLock); POSITION Pos; - for (int i = 0; i < m_WatcherList.GetCount(); i++) + for (size_t i = 0; i < m_WatcherList.GetCount(); i++) { Pos = m_WatcherList.FindIndex(i); if (Pos) @@ -170,7 +170,7 @@ public: IconWatcherData* GetListEntry(_In_opt_ NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove) { - IconWatcherData *Entry = nullptr; + IconWatcherData *Entry = NULL; POSITION NextPosition = m_WatcherList.GetHeadPosition(); POSITION Position; do @@ -188,7 +188,7 @@ public: break; } } - Entry = nullptr; + Entry = NULL; } while (NextPosition != NULL); @@ -214,7 +214,7 @@ private: WatchList[0] = This->m_WakeUpEvent; POSITION Pos; - for (int i = 0; i < This->m_WatcherList.GetCount(); i++) + for (size_t i = 0; i < This->m_WatcherList.GetCount(); i++) { Pos = This->m_WatcherList.FindIndex(i); if (Pos)

1 0

01/06: Initial implementation of a watcher for the systray (notification area) that removes icons if the owning process dies/terminates without removing it
by gedmurphy 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d66c6890f7172a7d0f2ad… commit d66c6890f7172a7d0f2ad44ed7545f92768fddba Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Jan 18 14:53:33 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 Initial implementation of a watcher for the systray (notification area) that removes icons if the owning process dies/terminates without removing it --- base/shell/explorer/precomp.h | 2 + base/shell/explorer/trayntfy.cpp | 301 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 296 insertions(+), 7 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index df6fd7537f..9aaa351f76 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -28,10 +28,12 @@ #include <atlcom.h> #include <atlwin.h> #include <atlstr.h> +#include <atlcoll.h> #include <shellapi.h> #include <shlobj.h> #include <shlwapi.h> #include <uxtheme.h> +#include <process.h> #include <strsafe.h> #include <undocuser.h> diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index b4e6b6d242..256ef4b827 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -2,6 +2,7 @@ * ReactOS Explorer * * Copyright 2006 - 2007 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2018 Ged Murphy <gedmurphy(a)reactos.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,253 @@ typedef struct _SYS_PAGER_COPY_DATA NOTIFYICONDATA nicon_data; } SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; + +struct IconWatcherData +{ + HANDLE hProcess; + DWORD ProcessId; + NOTIFYICONDATA IconData; + + IconWatcherData() + { + IconWatcherData(NULL); + } + + IconWatcherData(NOTIFYICONDATA *iconData) : + hProcess(NULL), ProcessId(0) + { + IconData.cbSize = sizeof(NOTIFYICONDATA); + IconData.hWnd = iconData->hWnd; + IconData.uID = iconData->uID; + IconData.guidItem = iconData->guidItem; + } + + ~IconWatcherData() + { + if (hProcess) + { + CloseHandle(hProcess); + } + } +}; + +class CIconWatcher +{ + CAtlList<IconWatcherData *> m_WatcherList; + CRITICAL_SECTION m_ListLock; + HANDLE m_hWatcherThread; + HANDLE m_WakeUpEvent; + HWND m_hwndSysTray; + bool m_Loop; + +public: + CIconWatcher() : + m_hWatcherThread(NULL), + m_WakeUpEvent(NULL), + m_hwndSysTray(NULL), + m_Loop(false) + { + } + virtual ~CIconWatcher() + { + Uninitialize(); + if (m_WakeUpEvent) + CloseHandle(m_WakeUpEvent); + if (m_hWatcherThread) + CloseHandle(m_hWatcherThread); + } + + bool Initialize(_In_ HWND hWndParent) + { + m_hwndSysTray = hWndParent; + + InitializeCriticalSection(&m_ListLock); + m_WakeUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (m_WakeUpEvent == NULL) + return false; + + m_hWatcherThread = (HANDLE)_beginthreadex(NULL, + 0, + WatcherThread, + (LPVOID)this, + 0, + NULL); + if (m_hWatcherThread == NULL) + return false; + + return true; + } + + void Uninitialize() + { + m_Loop = false; + SetEvent(m_WakeUpEvent); + + EnterCriticalSection(&m_ListLock); + + POSITION Pos; + for (int i = 0; i < m_WatcherList.GetCount(); i++) + { + Pos = m_WatcherList.FindIndex(i); + if (Pos) + { + IconWatcherData *Icon; + Icon = m_WatcherList.GetAt(Pos); + CloseHandle(Icon->hProcess); + } + } + m_WatcherList.RemoveAll(); + + LeaveCriticalSection(&m_ListLock); + } + + bool AddIconToWatcher(_In_ NOTIFYICONDATA *iconData) + { + IconWatcherData *Icon = new IconWatcherData(iconData); + + (void)GetWindowThreadProcessId(iconData->hWnd, &Icon->ProcessId); + + Icon->hProcess = OpenProcess(SYNCHRONIZE, FALSE, Icon->ProcessId); + if (Icon->hProcess == NULL) + return false; + + EnterCriticalSection(&m_ListLock); + + m_WatcherList.AddTail(Icon); + SetEvent(m_WakeUpEvent); + + LeaveCriticalSection(&m_ListLock); + + return true; + } + + bool RemoveIconFromWatcher(_In_ NOTIFYICONDATA *iconData) + { + EnterCriticalSection(&m_ListLock); + + IconWatcherData *Icon; + Icon = GetListEntry(iconData, NULL, true); + + SetEvent(m_WakeUpEvent); + LeaveCriticalSection(&m_ListLock); + + delete Icon; + return true; + } + + IconWatcherData* GetListEntry(_In_opt_ NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove) + { + IconWatcherData *Entry = nullptr; + POSITION NextPosition = m_WatcherList.GetHeadPosition(); + POSITION Position; + do + { + Position = NextPosition; + + Entry = m_WatcherList.GetNext(NextPosition); + if (Entry) + { + if ((iconData && ((Entry->IconData.hWnd == iconData->hWnd) && (Entry->IconData.uID == iconData->uID))) || + (hProcess && (Entry->hProcess == hProcess))) + { + if (Remove) + m_WatcherList.RemoveAt(Position); + break; + } + } + Entry = nullptr; + + } while (NextPosition != NULL); + + return Entry; + } + +private: + + static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam) + { + CIconWatcher* This = reinterpret_cast<CIconWatcher *>(lpParam); + + This->m_Loop = true; + while (This->m_Loop) + { + HANDLE *WatchList; + DWORD Size; + + EnterCriticalSection(&This->m_ListLock); + + Size = This->m_WatcherList.GetCount() + 1; + WatchList = new HANDLE[Size]; + WatchList[0] = This->m_WakeUpEvent; + + POSITION Pos; + for (int i = 0; i < This->m_WatcherList.GetCount(); i++) + { + Pos = This->m_WatcherList.FindIndex(i); + if (Pos) + { + IconWatcherData *Icon; + Icon = This->m_WatcherList.GetAt(Pos); + WatchList[i + 1] = Icon->hProcess; + } + } + + LeaveCriticalSection(&This->m_ListLock); + + DWORD Status; + Status = WaitForMultipleObjects(Size, + WatchList, + FALSE, + INFINITE); + if (Status == WAIT_OBJECT_0) + { + // We've been kicked, we have updates to our list (or we're exiting the thread) + } + else if ((Status >= WAIT_OBJECT_0 + 1) && (Status < Size)) + { + IconWatcherData *Icon; + Icon = This->GetListEntry(NULL, WatchList[Status], false); + + int len = FIELD_OFFSET(SYS_PAGER_COPY_DATA, nicon_data) + Icon->IconData.cbSize; + PSYS_PAGER_COPY_DATA pnotify_data = (PSYS_PAGER_COPY_DATA)new BYTE[len]; + pnotify_data->cookie = 1; + pnotify_data->notify_code = NIM_DELETE; + memcpy(&pnotify_data->nicon_data, &Icon->IconData, Icon->IconData.cbSize); + + COPYDATASTRUCT data; + data.dwData = 1; + data.cbData = len; + data.lpData = pnotify_data; + + BOOL Success = FALSE; + HWND parentHWND = ::GetParent(GetParent(This->m_hwndSysTray)); + if (parentHWND) + Success = ::SendMessage(parentHWND, WM_COPYDATA, (WPARAM)&Icon->IconData, (LPARAM)&data); + + delete pnotify_data; + + if (!Success) + { + // If we failed to handle the delete message, forcibly remove it + This->RemoveIconFromWatcher(&Icon->IconData); + } + } + else + { + if (Status == WAIT_FAILED) + { + Status = GetLastError(); + } + ERR("Failed to wait on process handles : %lu\n", Status); + This->m_Loop = false; + } + } + + return 0; + } +}; + + class CNotifyToolbar : public CWindowImplBaseT< CToolbar<NOTIFYICONDATA>, CControlWinTraits > { @@ -55,7 +303,7 @@ public: return m_VisibleButtonCount; } - int FindItemByIconData(IN CONST NOTIFYICONDATA *iconData, NOTIFYICONDATA ** pdata) + int FindItem(IN HWND hWnd, IN UINT uID, NOTIFYICONDATA ** pdata) { int count = GetButtonCount(); @@ -65,8 +313,8 @@ public: data = GetItemData(i); - if (data->hWnd == iconData->hWnd && - data->uID == iconData->uID) + if (data->hWnd == hWnd && + data->uID == uID) { if (pdata) *pdata = data; @@ -94,6 +342,28 @@ public: return -1; } + int FindItem(IN GUID& Guid, NOTIFYICONDATA ** pdata) + { + int count = GetButtonCount(); + + for (int i = 0; i < count; i++) + { + NOTIFYICONDATA * data; + + data = GetItemData(i); + + if (data->guidItem == Guid) + { + if (pdata) + *pdata = data; + return i; + } + } + + return -1; + } + + BOOL AddButton(IN CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; @@ -107,7 +377,7 @@ public: (iconData->dwState & NIS_HIDDEN) ? " HIDDEN" : "", (iconData->dwState & NIS_SHAREDICON) ? " SHARED" : ""); - int index = FindItemByIconData(iconData, &notifyItem); + int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); if (index >= 0) { TRACE("Icon %d from hWnd %08x ALREADY EXISTS!", iconData->uID, iconData->hWnd); @@ -188,7 +458,7 @@ public: (iconData->dwState & NIS_HIDDEN) ? " HIDDEN" : "", (iconData->dwState & NIS_SHAREDICON) ? " SHARED" : ""); - int index = FindItemByIconData(iconData, &notifyItem); + int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); if (index < 0) { WARN("Icon %d from hWnd %08x DOES NOT EXIST!", iconData->uID, iconData->hWnd); @@ -273,7 +543,7 @@ public: TRACE("Removing icon %d from hWnd %08x", iconData->uID, iconData->hWnd); - int index = FindItemByIconData(iconData, &notifyItem); + int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); if (index < 0) { TRACE("Icon %d from hWnd %08x ALREADY MISSING!", iconData->uID, iconData->hWnd); @@ -529,7 +799,8 @@ public: class CSysPagerWnd : public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits > + public CWindowImpl < CSysPagerWnd, CWindow, CControlWinTraits >, + public CIconWatcher { CNotifyToolbar Toolbar; @@ -563,6 +834,7 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { Toolbar.Initialize(m_hWnd); + CIconWatcher::Initialize(m_hWnd); // Explicitly request running applications to re-register their systray icons ::SendNotifyMessageW(HWND_BROADCAST, @@ -572,6 +844,12 @@ public: return TRUE; } + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + CIconWatcher::Uninitialize(); + return TRUE; + } + BOOL NotifyIconCmd(WPARAM wParam, LPARAM lParam) { PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT) lParam; @@ -591,12 +869,20 @@ public: { case NIM_ADD: ret = Toolbar.AddButton(iconData); + if (ret == TRUE) + { + AddIconToWatcher(iconData); + } break; case NIM_MODIFY: ret = Toolbar.UpdateButton(iconData); break; case NIM_DELETE: ret = Toolbar.RemoveButton(iconData); + if (ret == TRUE) + { + RemoveIconFromWatcher(iconData); + } break; default: TRACE("NotifyIconCmd received with unknown code %d.\n", data->notify_code); @@ -713,6 +999,7 @@ public: BEGIN_MSG_MAP(CSysPagerWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu)

1 0

01/01: Formatting, no code change
by Ged Murphy 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37a39f18432a08cb058f4… commit 37a39f18432a08cb058f4bf26406067effcfcd7e Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Sat Jan 20 18:22:44 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:22:44 2018 +0000 Formatting, no code change --- drivers/network/tcpip/tcpip/main.c | 704 ++++++++++++++++++------------------- 1 file changed, 352 insertions(+), 352 deletions(-) diff --git a/drivers/network/tcpip/tcpip/main.c b/drivers/network/tcpip/tcpip/main.c index 681e4d9347..1b8ab52df2 100644 --- a/drivers/network/tcpip/tcpip/main.c +++ b/drivers/network/tcpip/tcpip/main.c @@ -107,8 +107,8 @@ VOID TiWriteErrorLog( */ NTSTATUS TiCreateFileObject( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PFILE_FULL_EA_INFORMATION EaInfo; PTRANSPORT_CONTEXT Context; @@ -166,10 +166,10 @@ NTSTATUS TiCreateFileObject( TI_DbgPrint(MIN_TRACE, ("AddressCount: %d\n", Address->TAAddressCount)); if( Address->TAAddressCount == 1 ) { - TI_DbgPrint(MIN_TRACE, ("AddressLength: %u\n", - Address->Address[0].AddressLength)); - TI_DbgPrint(MIN_TRACE, ("AddressType: %u\n", - Address->Address[0].AddressType)); + TI_DbgPrint(MIN_TRACE, ("AddressLength: %u\n", + Address->Address[0].AddressLength)); + TI_DbgPrint(MIN_TRACE, ("AddressType: %u\n", + Address->Address[0].AddressType)); } ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); @@ -213,11 +213,11 @@ NTSTATUS TiCreateFileObject( } else if (EaInfo && - (EaInfo->EaNameLength == TDI_CONNECTION_CONTEXT_LENGTH) && - (RtlCompareMemory - (&EaInfo->EaName, TdiConnectionContext, - TDI_CONNECTION_CONTEXT_LENGTH) == - TDI_CONNECTION_CONTEXT_LENGTH)) + (EaInfo->EaNameLength == TDI_CONNECTION_CONTEXT_LENGTH) && + (RtlCompareMemory + (&EaInfo->EaName, TdiConnectionContext, + TDI_CONNECTION_CONTEXT_LENGTH) == + TDI_CONNECTION_CONTEXT_LENGTH)) { /* This is a request to open a connection endpoint */ @@ -282,8 +282,8 @@ NTSTATUS TiCreateFileObject( * This function does not pend */ NTSTATUS TiCloseFileObject( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PIO_STACK_LOCATION IrpSp; PTRANSPORT_CONTEXT Context; @@ -331,8 +331,8 @@ NTSTATUS TiCloseFileObject( NTSTATUS NTAPI TiDispatchOpenClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) /* * FUNCTION: Main dispath routine * ARGUMENTS: @@ -342,38 +342,38 @@ TiDispatchOpenClose( * Status of the operation */ { - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; // DbgPrint("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp); - IrpSp = IoGetCurrentIrpStackLocation(Irp); + IrpSp = IoGetCurrentIrpStackLocation(Irp); - switch (IrpSp->MajorFunction) { - /* Open an address file, connection endpoint, or control connection */ - case IRP_MJ_CREATE: - Status = TiCreateFileObject(DeviceObject, Irp); - break; + switch (IrpSp->MajorFunction) { + /* Open an address file, connection endpoint, or control connection */ + case IRP_MJ_CREATE: + Status = TiCreateFileObject(DeviceObject, Irp); + break; - /* Close an address file, connection endpoint, or control connection */ - case IRP_MJ_CLOSE: - Status = TiCloseFileObject(DeviceObject, Irp); - break; + /* Close an address file, connection endpoint, or control connection */ + case IRP_MJ_CLOSE: + Status = TiCloseFileObject(DeviceObject, Irp); + break; - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + } - //DbgPrint("Leaving. Status is (0x%X)\n", Status); + //DbgPrint("Leaving. Status is (0x%X)\n", Status); - return IRPFinish( Irp, Status ); + return IRPFinish( Irp, Status ); } NTSTATUS NTAPI TiDispatchInternal( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PDEVICE_OBJECT DeviceObject, + PIRP Irp) /* * FUNCTION: Internal IOCTL dispatch routine * ARGUMENTS: @@ -383,100 +383,100 @@ TiDispatchInternal( * Status of the operation */ { - NTSTATUS Status; - BOOLEAN Complete = TRUE; - PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + BOOLEAN Complete = TRUE; + PIO_STACK_LOCATION IrpSp; - IrpSp = IoGetCurrentIrpStackLocation(Irp); + IrpSp = IoGetCurrentIrpStackLocation(Irp); - TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatchInternal] Called. DeviceObject is at (0x%X), IRP is at (0x%X) MN (%d).\n", - DeviceObject, Irp, IrpSp->MinorFunction)); + TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatchInternal] Called. DeviceObject is at (0x%X), IRP is at (0x%X) MN (%d).\n", + DeviceObject, Irp, IrpSp->MinorFunction)); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; - switch (IrpSp->MinorFunction) { - case TDI_RECEIVE: - Status = DispTdiReceive(Irp); - Complete = FALSE; - break; + switch (IrpSp->MinorFunction) { + case TDI_RECEIVE: + Status = DispTdiReceive(Irp); + Complete = FALSE; + break; - case TDI_RECEIVE_DATAGRAM: - Status = DispTdiReceiveDatagram(Irp); - Complete = FALSE; - break; + case TDI_RECEIVE_DATAGRAM: + Status = DispTdiReceiveDatagram(Irp); + Complete = FALSE; + break; - case TDI_SEND: - Status = DispTdiSend(Irp); - Complete = FALSE; /* Completed in DispTdiSend */ - break; + case TDI_SEND: + Status = DispTdiSend(Irp); + Complete = FALSE; /* Completed in DispTdiSend */ + break; - case TDI_SEND_DATAGRAM: - Status = DispTdiSendDatagram(Irp); - Complete = FALSE; - break; + case TDI_SEND_DATAGRAM: + Status = DispTdiSendDatagram(Irp); + Complete = FALSE; + break; case TDI_ACCEPT: Status = DispTdiAccept(Irp); break; - case TDI_LISTEN: - Status = DispTdiListen(Irp); - Complete = FALSE; - break; + case TDI_LISTEN: + Status = DispTdiListen(Irp); + Complete = FALSE; + break; - case TDI_CONNECT: - Status = DispTdiConnect(Irp); - Complete = FALSE; /* Completed by the TCP event handler */ - break; + case TDI_CONNECT: + Status = DispTdiConnect(Irp); + Complete = FALSE; /* Completed by the TCP event handler */ + break; - case TDI_DISCONNECT: - Status = DispTdiDisconnect(Irp); - Complete = FALSE; - break; + case TDI_DISCONNECT: + Status = DispTdiDisconnect(Irp); + Complete = FALSE; + break; - case TDI_ASSOCIATE_ADDRESS: - Status = DispTdiAssociateAddress(Irp); - break; + case TDI_ASSOCIATE_ADDRESS: + Status = DispTdiAssociateAddress(Irp); + break; - case TDI_DISASSOCIATE_ADDRESS: - Status = DispTdiDisassociateAddress(Irp); - break; + case TDI_DISASSOCIATE_ADDRESS: + Status = DispTdiDisassociateAddress(Irp); + break; - case TDI_QUERY_INFORMATION: - Status = DispTdiQueryInformation(DeviceObject, Irp); - break; + case TDI_QUERY_INFORMATION: + Status = DispTdiQueryInformation(DeviceObject, Irp); + break; - case TDI_SET_INFORMATION: - Status = DispTdiSetInformation(Irp); - break; + case TDI_SET_INFORMATION: + Status = DispTdiSetInformation(Irp); + break; - case TDI_SET_EVENT_HANDLER: - Status = DispTdiSetEventHandler(Irp); - break; + case TDI_SET_EVENT_HANDLER: + Status = DispTdiSetEventHandler(Irp); + break; - case TDI_ACTION: - Status = STATUS_SUCCESS; - break; + case TDI_ACTION: + Status = STATUS_SUCCESS; + break; - /* An unsupported IOCTL code was submitted */ - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } + /* An unsupported IOCTL code was submitted */ + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + } - TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatchInternal] Leaving. Status = (0x%X).\n", Status)); + TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatchInternal] Leaving. Status = (0x%X).\n", Status)); - if( Complete ) - IRPFinish( Irp, Status ); + if( Complete ) + IRPFinish( Irp, Status ); - return Status; + return Status; } NTSTATUS NTAPI TiDispatch( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PDEVICE_OBJECT DeviceObject, + PIRP Irp) /* * FUNCTION: Dispatch routine for IRP_MJ_DEVICE_CONTROL requests * ARGUMENTS: @@ -486,62 +486,62 @@ TiDispatch( * Status of the operation */ { - NTSTATUS Status; - PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + PIO_STACK_LOCATION IrpSp; - IrpSp = IoGetCurrentIrpStackLocation(Irp); + IrpSp = IoGetCurrentIrpStackLocation(Irp); - TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatch] Called. IRP is at (0x%X).\n", Irp)); + TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatch] Called. IRP is at (0x%X).\n", Irp)); - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = 0; #if 0 - Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp); - if (NT_SUCCESS(Status)) { - TiDispatchInternal(DeviceObject, Irp); - Status = STATUS_PENDING; - } else { + Status = TdiMapUserRequest(DeviceObject, Irp, IrpSp); + if (NT_SUCCESS(Status)) { + TiDispatchInternal(DeviceObject, Irp); + Status = STATUS_PENDING; + } else { #else - if (TRUE) { + if (TRUE) { #endif /* See if this request is TCP/IP specific */ switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_TCP_QUERY_INFORMATION_EX: - TI_DbgPrint(MIN_TRACE, ("TCP_QUERY_INFORMATION_EX\n")); - Status = DispTdiQueryInformationEx(Irp, IrpSp); - break; + TI_DbgPrint(MIN_TRACE, ("TCP_QUERY_INFORMATION_EX\n")); + Status = DispTdiQueryInformationEx(Irp, IrpSp); + break; case IOCTL_TCP_SET_INFORMATION_EX: - TI_DbgPrint(MIN_TRACE, ("TCP_SET_INFORMATION_EX\n")); - Status = DispTdiSetInformationEx(Irp, IrpSp); - break; + TI_DbgPrint(MIN_TRACE, ("TCP_SET_INFORMATION_EX\n")); + Status = DispTdiSetInformationEx(Irp, IrpSp); + break; case IOCTL_SET_IP_ADDRESS: - TI_DbgPrint(MIN_TRACE, ("SET_IP_ADDRESS\n")); - Status = DispTdiSetIPAddress(Irp, IrpSp); - break; + TI_DbgPrint(MIN_TRACE, ("SET_IP_ADDRESS\n")); + Status = DispTdiSetIPAddress(Irp, IrpSp); + break; case IOCTL_DELETE_IP_ADDRESS: - TI_DbgPrint(MIN_TRACE, ("DELETE_IP_ADDRESS\n")); - Status = DispTdiDeleteIPAddress(Irp, IrpSp); - break; + TI_DbgPrint(MIN_TRACE, ("DELETE_IP_ADDRESS\n")); + Status = DispTdiDeleteIPAddress(Irp, IrpSp); + break; case IOCTL_QUERY_IP_HW_ADDRESS: - TI_DbgPrint(MIN_TRACE, ("QUERY_IP_HW_ADDRESS\n")); - Status = DispTdiQueryIpHwAddress(DeviceObject, Irp, IrpSp); - break; + TI_DbgPrint(MIN_TRACE, ("QUERY_IP_HW_ADDRESS\n")); + Status = DispTdiQueryIpHwAddress(DeviceObject, Irp, IrpSp); + break; default: - TI_DbgPrint(MIN_TRACE, ("Unknown IOCTL 0x%X\n", - IrpSp->Parameters.DeviceIoControl.IoControlCode)); - Status = STATUS_NOT_IMPLEMENTED; - break; + TI_DbgPrint(MIN_TRACE, ("Unknown IOCTL 0x%X\n", + IrpSp->Parameters.DeviceIoControl.IoControlCode)); + Status = STATUS_NOT_IMPLEMENTED; + break; + } } - } - TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatch] Leaving. Status = (0x%X).\n", Status)); + TI_DbgPrint(DEBUG_IRP, ("[TCPIP, TiDispatch] Leaving. Status = (0x%X).\n", Status)); - return IRPFinish( Irp, Status ); + return IRPFinish( Irp, Status ); } @@ -556,64 +556,64 @@ VOID NTAPI TiUnload( #if DBG KIRQL OldIrql; - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - if (!IsListEmpty(&AddressFileListHead)) { - TI_DbgPrint(MIN_TRACE, ("[TCPIP, TiUnload] Called. Open address file objects exists.\n")); - } - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + if (!IsListEmpty(&AddressFileListHead)) { + TI_DbgPrint(MIN_TRACE, ("[TCPIP, TiUnload] Called. Open address file objects exists.\n")); + } + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); #endif - /* Cancel timer */ - KeCancelTimer(&IPTimer); + /* Cancel timer */ + KeCancelTimer(&IPTimer); - /* Unregister loopback adapter */ - LoopUnregisterAdapter(NULL); + /* Unregister loopback adapter */ + LoopUnregisterAdapter(NULL); - /* Unregister protocol with NDIS */ - LANUnregisterProtocol(); + /* Unregister protocol with NDIS */ + LANUnregisterProtocol(); - /* Shutdown transport level protocol subsystems */ - TCPShutdown(); - UDPShutdown(); - RawIPShutdown(); - ICMPShutdown(); + /* Shutdown transport level protocol subsystems */ + TCPShutdown(); + UDPShutdown(); + RawIPShutdown(); + ICMPShutdown(); - /* Shutdown network level protocol subsystem */ - IPShutdown(); + /* Shutdown network level protocol subsystem */ + IPShutdown(); - /* Free NDIS buffer descriptors */ - if (GlobalBufferPool) - NdisFreeBufferPool(GlobalBufferPool); + /* Free NDIS buffer descriptors */ + if (GlobalBufferPool) + NdisFreeBufferPool(GlobalBufferPool); - /* Free NDIS packet descriptors */ - if (GlobalPacketPool) - NdisFreePacketPool(GlobalPacketPool); + /* Free NDIS packet descriptors */ + if (GlobalPacketPool) + NdisFreePacketPool(GlobalPacketPool); - /* Release all device objects */ + /* Release all device objects */ - if (TCPDeviceObject) - IoDeleteDevice(TCPDeviceObject); + if (TCPDeviceObject) + IoDeleteDevice(TCPDeviceObject); - if (UDPDeviceObject) - IoDeleteDevice(UDPDeviceObject); + if (UDPDeviceObject) + IoDeleteDevice(UDPDeviceObject); - if (RawIPDeviceObject) - IoDeleteDevice(RawIPDeviceObject); + if (RawIPDeviceObject) + IoDeleteDevice(RawIPDeviceObject); - if (IPDeviceObject) { - ChewShutdown(); - IoDeleteDevice(IPDeviceObject); - } + if (IPDeviceObject) { + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + } - if (EntityList) - ExFreePoolWithTag(EntityList, TDI_ENTITY_TAG); + if (EntityList) + ExFreePoolWithTag(EntityList, TDI_ENTITY_TAG); - TI_DbgPrint(MAX_TRACE, ("[TCPIP, TiUnload] Leaving.\n")); + TI_DbgPrint(MAX_TRACE, ("[TCPIP, TiUnload] Leaving.\n")); } NTSTATUS NTAPI DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) /* * FUNCTION: Main driver entry point * ARGUMENTS: @@ -623,189 +623,189 @@ DriverEntry( * Status of driver initialization */ { - NTSTATUS Status; - UNICODE_STRING strIpDeviceName = RTL_CONSTANT_STRING(DD_IP_DEVICE_NAME); - UNICODE_STRING strRawDeviceName = RTL_CONSTANT_STRING(DD_RAWIP_DEVICE_NAME); - UNICODE_STRING strUdpDeviceName = RTL_CONSTANT_STRING(DD_UDP_DEVICE_NAME); - UNICODE_STRING strTcpDeviceName = RTL_CONSTANT_STRING(DD_TCP_DEVICE_NAME); - UNICODE_STRING strNdisDeviceName = RTL_CONSTANT_STRING(TCPIP_PROTOCOL_NAME); - NDIS_STATUS NdisStatus; - LARGE_INTEGER DueTime; - - TI_DbgPrint(MAX_TRACE, ("[TCPIP, DriverEntry] Called\n")); - - /* TdiInitialize() ? */ - - /* FIXME: Create symbolic links in Win32 namespace */ - - /* Initialize our periodic timer and its associated DPC object. When the - timer expires, the IPTimeout deferred procedure call (DPC) is queued */ - KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); - KeInitializeTimer(&IPTimer); - - /* Create IP device object */ - Status = IoCreateDevice(DriverObject, 0, &strIpDeviceName, - FILE_DEVICE_NETWORK, 0, FALSE, &IPDeviceObject); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create IP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return Status; - } + NTSTATUS Status; + UNICODE_STRING strIpDeviceName = RTL_CONSTANT_STRING(DD_IP_DEVICE_NAME); + UNICODE_STRING strRawDeviceName = RTL_CONSTANT_STRING(DD_RAWIP_DEVICE_NAME); + UNICODE_STRING strUdpDeviceName = RTL_CONSTANT_STRING(DD_UDP_DEVICE_NAME); + UNICODE_STRING strTcpDeviceName = RTL_CONSTANT_STRING(DD_TCP_DEVICE_NAME); + UNICODE_STRING strNdisDeviceName = RTL_CONSTANT_STRING(TCPIP_PROTOCOL_NAME); + NDIS_STATUS NdisStatus; + LARGE_INTEGER DueTime; + + TI_DbgPrint(MAX_TRACE, ("[TCPIP, DriverEntry] Called\n")); + + /* TdiInitialize() ? */ + + /* FIXME: Create symbolic links in Win32 namespace */ + + /* Initialize our periodic timer and its associated DPC object. When the + timer expires, the IPTimeout deferred procedure call (DPC) is queued */ + KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); + KeInitializeTimer(&IPTimer); + + /* Create IP device object */ + Status = IoCreateDevice(DriverObject, 0, &strIpDeviceName, + FILE_DEVICE_NETWORK, 0, FALSE, &IPDeviceObject); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create IP device object. Status (0x%X).\n", Status)); + TiUnload(DriverObject); + return Status; + } - ChewInit( IPDeviceObject ); + ChewInit( IPDeviceObject ); - /* Create RawIP device object */ - Status = IoCreateDevice(DriverObject, 0, &strRawDeviceName, - FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return Status; - } - - /* Create UDP device object */ - Status = IoCreateDevice(DriverObject, 0, &strUdpDeviceName, - FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return Status; - } - - /* Create TCP device object */ - Status = IoCreateDevice(DriverObject, 0, &strTcpDeviceName, - FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return Status; - } - - /* Setup network layer and transport layer entities */ - KeInitializeSpinLock(&EntityListLock); - EntityList = ExAllocatePoolWithTag(NonPagedPool, - sizeof(TDIEntityID) * MAX_TDI_ENTITIES, - TDI_ENTITY_TAG ); - if (!EntityList) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - EntityCount = 0; - EntityMax = MAX_TDI_ENTITIES; - - /* Allocate NDIS packet descriptors */ - NdisAllocatePacketPoolEx(&NdisStatus, &GlobalPacketPool, 500, 1500, sizeof(PACKET_CONTEXT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Allocate NDIS buffer descriptors */ - NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 2000); - if (NdisStatus != NDIS_STATUS_SUCCESS) { - TiUnload(DriverObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Initialize address file list and protecting spin lock */ - InitializeListHead(&AddressFileListHead); - KeInitializeSpinLock(&AddressFileListLock); - - /* Initialize connection endpoint list and protecting spin lock */ - InitializeListHead(&ConnectionEndpointListHead); - KeInitializeSpinLock(&ConnectionEndpointListLock); - - /* Initialize interface list and protecting spin lock */ - InitializeListHead(&InterfaceListHead); - KeInitializeSpinLock(&InterfaceListLock); - - /* Initialize network level protocol subsystem */ - IPStartup(RegistryPath); - - /* Initialize transport level protocol subsystems */ - Status = RawIPStartup(); - if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); - return Status; - } - - Status = UDPStartup(); - if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); - return Status; - } - - Status = TCPStartup(); - if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); - return Status; - } - - Status = ICMPStartup(); - if( !NT_SUCCESS(Status) ) { - TiUnload(DriverObject); - return Status; - } - - /* Use direct I/O */ - IPDeviceObject->Flags |= DO_DIRECT_IO; - RawIPDeviceObject->Flags |= DO_DIRECT_IO; - UDPDeviceObject->Flags |= DO_DIRECT_IO; - TCPDeviceObject->Flags |= DO_DIRECT_IO; - - /* Initialize the driver object with this driver's entry points */ - DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; - - DriverObject->DriverUnload = TiUnload; - - /* Open loopback adapter */ - Status = LoopRegisterAdapter(NULL, NULL); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TiUnload(DriverObject); - return Status; - } - - /* Register protocol with NDIS */ - /* This used to be IP_DEVICE_NAME but the DDK says it has to match your entry in the SCM */ - Status = LANRegisterProtocol(&strNdisDeviceName); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE,("Failed to register protocol with NDIS; status 0x%x\n", Status)); - TiWriteErrorLog( - DriverObject, - EVENT_TRANSPORT_REGISTER_FAILED, - TI_ERROR_DRIVERENTRY, - Status, - NULL, - 0, - NULL); - TiUnload(DriverObject); - return Status; - } - - /* Start the periodic timer with an initial and periodic - relative expiration time of IP_TIMEOUT milliseconds */ - DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; - KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); - - TI_DbgPrint(MAX_TRACE, ("[TCPIP, DriverEntry] Finished\n")); - - - return STATUS_SUCCESS; + /* Create RawIP device object */ + Status = IoCreateDevice(DriverObject, 0, &strRawDeviceName, + FILE_DEVICE_NETWORK, 0, FALSE, &RawIPDeviceObject); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create RawIP device object. Status (0x%X).\n", Status)); + TiUnload(DriverObject); + return Status; + } + + /* Create UDP device object */ + Status = IoCreateDevice(DriverObject, 0, &strUdpDeviceName, + FILE_DEVICE_NETWORK, 0, FALSE, &UDPDeviceObject); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create UDP device object. Status (0x%X).\n", Status)); + TiUnload(DriverObject); + return Status; + } + + /* Create TCP device object */ + Status = IoCreateDevice(DriverObject, 0, &strTcpDeviceName, + FILE_DEVICE_NETWORK, 0, FALSE, &TCPDeviceObject); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create TCP device object. Status (0x%X).\n", Status)); + TiUnload(DriverObject); + return Status; + } + + /* Setup network layer and transport layer entities */ + KeInitializeSpinLock(&EntityListLock); + EntityList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(TDIEntityID) * MAX_TDI_ENTITIES, + TDI_ENTITY_TAG ); + if (!EntityList) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + TiUnload(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + EntityCount = 0; + EntityMax = MAX_TDI_ENTITIES; + + /* Allocate NDIS packet descriptors */ + NdisAllocatePacketPoolEx(&NdisStatus, &GlobalPacketPool, 500, 1500, sizeof(PACKET_CONTEXT)); + if (NdisStatus != NDIS_STATUS_SUCCESS) { + TiUnload(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Allocate NDIS buffer descriptors */ + NdisAllocateBufferPool(&NdisStatus, &GlobalBufferPool, 2000); + if (NdisStatus != NDIS_STATUS_SUCCESS) { + TiUnload(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize address file list and protecting spin lock */ + InitializeListHead(&AddressFileListHead); + KeInitializeSpinLock(&AddressFileListLock); + + /* Initialize connection endpoint list and protecting spin lock */ + InitializeListHead(&ConnectionEndpointListHead); + KeInitializeSpinLock(&ConnectionEndpointListLock); + + /* Initialize interface list and protecting spin lock */ + InitializeListHead(&InterfaceListHead); + KeInitializeSpinLock(&InterfaceListLock); + + /* Initialize network level protocol subsystem */ + IPStartup(RegistryPath); + + /* Initialize transport level protocol subsystems */ + Status = RawIPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = UDPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = TCPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = ICMPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + /* Use direct I/O */ + IPDeviceObject->Flags |= DO_DIRECT_IO; + RawIPDeviceObject->Flags |= DO_DIRECT_IO; + UDPDeviceObject->Flags |= DO_DIRECT_IO; + TCPDeviceObject->Flags |= DO_DIRECT_IO; + + /* Initialize the driver object with this driver's entry points */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; + + DriverObject->DriverUnload = TiUnload; + + /* Open loopback adapter */ + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); + TiUnload(DriverObject); + return Status; + } + + /* Register protocol with NDIS */ + /* This used to be IP_DEVICE_NAME but the DDK says it has to match your entry in the SCM */ + Status = LANRegisterProtocol(&strNdisDeviceName); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE,("Failed to register protocol with NDIS; status 0x%x\n", Status)); + TiWriteErrorLog( + DriverObject, + EVENT_TRANSPORT_REGISTER_FAILED, + TI_ERROR_DRIVERENTRY, + Status, + NULL, + 0, + NULL); + TiUnload(DriverObject); + return Status; + } + + /* Start the periodic timer with an initial and periodic + relative expiration time of IP_TIMEOUT milliseconds */ + DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; + KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); + + TI_DbgPrint(MAX_TRACE, ("[TCPIP, DriverEntry] Finished\n")); + + + return STATUS_SUCCESS; } VOID NTAPI IPAddInterface( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - ULONG Unknown4) + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4) { UNIMPLEMENTED; } @@ -813,7 +813,7 @@ IPAddInterface( VOID NTAPI IPDelInterface( - ULONG Unknown0) + ULONG Unknown0) { UNIMPLEMENTED; } @@ -821,8 +821,8 @@ IPDelInterface( VOID NTAPI LookupRoute( - ULONG Unknown0, - ULONG Unknown1) + ULONG Unknown0, + ULONG Unknown1) { UNIMPLEMENTED; }

1 0

01/01: [LWIP] dhcp.c: Cherry-pick lwIP 32aa9a4. CORE-8978
by Serge Gautherie 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63775c321597c6af6bc42… commit 63775c321597c6af6bc42e58614633dff4de6189 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 19 16:31:19 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 20 16:04:34 2018 +0100 [LWIP] dhcp.c: Cherry-pick lwIP 32aa9a4. CORE-8978 - Fix a while() check order. --- sdk/lib/drivers/lwip/src/core/dhcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/lwip/src/core/dhcp.c b/sdk/lib/drivers/lwip/src/core/dhcp.c index eb12c55021..cf0b081d26 100644 --- a/sdk/lib/drivers/lwip/src/core/dhcp.c +++ b/sdk/lib/drivers/lwip/src/core/dhcp.c @@ -1377,7 +1377,7 @@ again: offset_max = options_idx_max; options = (u8_t*)q->payload; /* at least 1 byte to read and no end marker, then at least 3 bytes to read? */ - while((q != NULL) && (options[offset] != DHCP_OPTION_END) && (offset < offset_max)) { + while ((q != NULL) && (offset < offset_max) && (options[offset] != DHCP_OPTION_END)) { u8_t op = options[offset]; u8_t len; u8_t decode_len = 0;

1 0

01/01: [NTOS] Remove unnecessary NULL checks and add a missing one. CIDs 1411958, 716670, 1322186
by Thomas Faber 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fda24da87224b6700669c… commit fda24da87224b6700669cb49c9c9b49511d6cf0e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 20 13:42:39 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 20 15:59:35 2018 +0100 [NTOS] Remove unnecessary NULL checks and add a missing one. CIDs 1411958, 716670, 1322186 --- ntoskrnl/cc/fs.c | 1 - ntoskrnl/dbgk/dbgkobj.c | 2 +- ntoskrnl/ex/init.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index d62e18dee0..4958478f3f 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -337,7 +337,6 @@ CcUninitializeCacheMap ( FileObject, TruncateSize, UninitializeCompleteEvent); if (TruncateSize != NULL && - FileObject->SectionObjectPointer != NULL && FileObject->SectionObjectPointer->SharedCacheMap != NULL) { SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c index d0f8c85c74..3f03e9b903 100644 --- a/ntoskrnl/dbgk/dbgkobj.c +++ b/ntoskrnl/dbgk/dbgkobj.c @@ -775,7 +775,7 @@ DbgkpPostFakeThreadMessages(IN PEPROCESS Process, { /* Dereference and fail */ if (pFirstThread) ObDereferenceObject(pFirstThread); - if (pLastThread) ObDereferenceObject(pLastThread); + ObDereferenceObject(pLastThread); return Status; } diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index e4ffdd63bd..e2413349ca 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1501,7 +1501,7 @@ Phase1InitializationDiscard(IN PVOID Context) if (!PoInitSystem(0)) KeBugCheck(INTERNAL_POWER_ERROR); /* Check for Y2K hack */ - Y2KHackRequired = strstr(CommandLine, "YEAR"); + Y2KHackRequired = CommandLine ? strstr(CommandLine, "YEAR") : NULL; if (Y2KHackRequired) Y2KHackRequired = strstr(Y2KHackRequired, "="); if (Y2KHackRequired) YearHack = atol(Y2KHackRequired + 1);

1 0

01/01: [USP10] Re-use script caches for the same font. CORE-14192
by Thomas Faber 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd992d022ff8b6151a592… commit cd992d022ff8b6151a59214ca0883d8f04bd4569 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 20 13:41:14 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 20 15:55:07 2018 +0100 [USP10] Re-use script caches for the same font. CORE-14192 This significantly speeds up WM_SETTEXT in multiline edit controls. --- dll/win32/usp10/usp10.c | 69 ++++++++++++++++-- dll/win32/usp10/usp10_internal.h | 3 + modules/rostests/winetests/usp10/usp10.c | 118 +++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 6 deletions(-) diff --git a/dll/win32/usp10/usp10.c b/dll/win32/usp10/usp10.c index 058fc6f368..abc40fc891 100644 --- a/dll/win32/usp10/usp10.c +++ b/dll/win32/usp10/usp10.c @@ -664,6 +664,16 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[80].props, &scriptInformation[81].props }; +static CRITICAL_SECTION cs_script_cache; +static CRITICAL_SECTION_DEBUG cs_script_cache_dbg = +{ + 0, 0, &cs_script_cache, + { &cs_script_cache_dbg.ProcessLocksList, &cs_script_cache_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": script_cache") } +}; +static CRITICAL_SECTION cs_script_cache = { &cs_script_cache_dbg, -1, 0, 0, 0, 0 }; +static struct list script_cache_list = LIST_INIT(script_cache_list); + typedef struct { ScriptCache *sc; int numGlyphs; @@ -842,12 +852,34 @@ static inline BOOL set_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *ab static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) { ScriptCache *sc; - int size; + unsigned size; + LOGFONTW lf; if (!psc) return E_INVALIDARG; if (*psc) return S_OK; if (!hdc) return E_PENDING; + if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf)) + { + return E_INVALIDARG; + } + /* Ensure canonical result by zeroing extra space in lfFaceName */ + size = strlenW(lf.lfFaceName); + memset(lf.lfFaceName + size, 0, sizeof(lf.lfFaceName) - size * sizeof(WCHAR)); + + EnterCriticalSection(&cs_script_cache); + LIST_FOR_EACH_ENTRY(sc, &script_cache_list, ScriptCache, entry) + { + if (!memcmp(&sc->lf, &lf, sizeof(lf))) + { + sc->refcount++; + LeaveCriticalSection(&cs_script_cache); + *psc = sc; + return S_OK; + } + } + LeaveCriticalSection(&cs_script_cache); + if (!(sc = heap_alloc_zero(sizeof(ScriptCache)))) return E_OUTOFMEMORY; if (!GetTextMetricsW(hdc, &sc->tm)) { @@ -861,18 +893,32 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) sc->otm->otmSize = size; GetOutlineTextMetricsW(hdc, size, sc->otm); } - if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) - { - heap_free(sc); - return E_INVALIDARG; - } sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); if (!set_cache_font_properties(hdc, sc)) { heap_free(sc); return E_INVALIDARG; } + sc->lf = lf; + sc->refcount = 1; *psc = sc; + + EnterCriticalSection(&cs_script_cache); + list_add_head(&script_cache_list, &sc->entry); + LIST_FOR_EACH_ENTRY(sc, &script_cache_list, ScriptCache, entry) + { + if (sc != *psc && !memcmp(&sc->lf, &lf, sizeof(lf))) + { + /* Another thread won the race. Use their cache instead of ours */ + list_remove(&sc->entry); + sc->refcount++; + LeaveCriticalSection(&cs_script_cache); + heap_free(*psc); + *psc = sc; + return S_OK; + } + } + LeaveCriticalSection(&cs_script_cache); TRACE("<- %p\n", sc); return S_OK; } @@ -1025,6 +1071,17 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { unsigned int i; INT n; + + EnterCriticalSection(&cs_script_cache); + if (--((ScriptCache *)*psc)->refcount > 0) + { + LeaveCriticalSection(&cs_script_cache); + *psc = NULL; + return S_OK; + } + list_remove(&((ScriptCache *)*psc)->entry); + LeaveCriticalSection(&cs_script_cache); + for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { heap_free(((ScriptCache *)*psc)->widths[i]); diff --git a/dll/win32/usp10/usp10_internal.h b/dll/win32/usp10/usp10_internal.h index da5f3fe8eb..c0e28d542c 100644 --- a/dll/win32/usp10/usp10_internal.h +++ b/dll/win32/usp10/usp10_internal.h @@ -37,6 +37,7 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include <wine/list.h> #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (ULONG)_x4 << 24 ) | \ @@ -194,6 +195,8 @@ typedef struct { } CacheGlyphPage; typedef struct { + struct list entry; + DWORD refcount; LOGFONTW lf; TEXTMETRICW tm; OUTLINETEXTMETRICW *otm; diff --git a/modules/rostests/winetests/usp10/usp10.c b/modules/rostests/winetests/usp10/usp10.c index 417d0b8888..1ea873786a 100644 --- a/modules/rostests/winetests/usp10/usp10.c +++ b/modules/rostests/winetests/usp10/usp10.c @@ -1836,6 +1836,7 @@ static void test_ScriptShape(HDC hdc) static const WCHAR test3[] = {0x30b7}; HRESULT hr; SCRIPT_CACHE sc = NULL; + SCRIPT_CACHE sc2 = NULL; WORD glyphs[4], glyphs2[4], logclust[4], glyphs3[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[4]; @@ -1865,6 +1866,10 @@ static void test_ScriptShape(HDC hdc) ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + hr = ScriptShape(hdc, &sc2, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); + ok(sc2 == sc, "caches %p, %p not identical\n", sc, sc2); + ScriptFreeCache(&sc2); memset(glyphs,-1,sizeof(glyphs)); memset(logclust,-1,sizeof(logclust)); @@ -2090,6 +2095,7 @@ static void test_ScriptPlace(HDC hdc) BOOL ret; HRESULT hr; SCRIPT_CACHE sc = NULL; + SCRIPT_CACHE sc2 = NULL; WORD glyphs[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; @@ -2127,6 +2133,11 @@ static void test_ScriptPlace(HDC hdc) ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + hr = ScriptPlace(hdc, &sc2, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); + ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); + ok(sc2 == sc, "caches %p, %p not identical\n", sc, sc2); + ScriptFreeCache(&sc2); + if (widths[0] != 0) { int old_width = widths[0]; @@ -4112,6 +4123,112 @@ static void test_ScriptString_pSize(HDC hdc) ok(hr == S_OK, "Failed to free ssa, hr %#x.\n", hr); } +static void test_script_cache_reuse(void) +{ + HRESULT hr; + HWND hwnd1, hwnd2; + HDC hdc1, hdc2; + LOGFONTA lf; + HFONT hfont1, hfont2; + HFONT prev_hfont1, prev_hfont2; + SCRIPT_CACHE sc = NULL; + SCRIPT_CACHE sc2; + LONG height; + + hwnd1 = create_test_window(); + hwnd2 = create_test_window(); + + hdc1 = GetDC(hwnd1); + hdc2 = GetDC(hwnd2); + ok(hdc1 != NULL && hdc2 != NULL, "Failed to get window dc.\n"); + + memset(&lf, 0, sizeof(LOGFONTA)); + lstrcpyA(lf.lfFaceName, "Tahoma"); + + lf.lfHeight = 10; + hfont1 = CreateFontIndirectA(&lf); + ok(hfont1 != NULL, "CreateFontIndirectA failed\n"); + hfont2 = CreateFontIndirectA(&lf); + ok(hfont2 != NULL, "CreateFontIndirectA failed\n"); + ok(hfont1 != hfont2, "Expected fonts %p and %p to differ\n", hfont1, hfont2); + + prev_hfont1 = SelectObject(hdc1, hfont1); + ok(prev_hfont1 != NULL, "SelectObject failed: %p\n", prev_hfont1); + prev_hfont2 = SelectObject(hdc2, hfont1); + ok(prev_hfont2 != NULL, "SelectObject failed: %p\n", prev_hfont2); + + /* Get a script cache */ + hr = ScriptCacheGetHeight(hdc1, &sc, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc != NULL, "Script cache is NULL\n"); + + /* Same font, same DC -> same SCRIPT_CACHE */ + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc1, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc == sc2, "Expected caches %p, %p to be identical\n", sc, sc2); + ScriptFreeCache(&sc2); + + /* Same font in different DC -> same SCRIPT_CACHE */ + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc2, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc == sc2, "Expected caches %p, %p to be identical\n", sc, sc2); + ScriptFreeCache(&sc2); + + /* Same font face & size, but different font handle */ + ok(SelectObject(hdc1, hfont2) != NULL, "SelectObject failed\n"); + ok(SelectObject(hdc2, hfont2) != NULL, "SelectObject failed\n"); + + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc1, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc == sc2, "Expected caches %p, %p to be identical\n", sc, sc2); + ScriptFreeCache(&sc2); + + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc2, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc == sc2, "Expected caches %p, %p to be identical\n", sc, sc2); + ScriptFreeCache(&sc2); + + /* Different font size -- now we get a different SCRIPT_CACHE */ + SelectObject(hdc1, prev_hfont1); + SelectObject(hdc2, prev_hfont2); + DeleteObject(hfont2); + lf.lfHeight = 20; + hfont2 = CreateFontIndirectA(&lf); + ok(hfont2 != NULL, "CreateFontIndirectA failed\n"); + ok(SelectObject(hdc1, hfont2) != NULL, "SelectObject failed\n"); + ok(SelectObject(hdc2, hfont2) != NULL, "SelectObject failed\n"); + + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc1, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc != sc2, "Expected caches %p, %p to be different\n", sc, sc2); + ScriptFreeCache(&sc2); + + sc2 = NULL; + hr = ScriptCacheGetHeight(hdc2, &sc2, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(sc2 != NULL, "Script cache is NULL\n"); + ok(sc != sc2, "Expected caches %p, %p to be different\n", sc, sc2); + ScriptFreeCache(&sc2); + + ScriptFreeCache(&sc); + SelectObject(hdc1, prev_hfont1); + SelectObject(hdc2, prev_hfont2); + DeleteObject(hfont1); + DeleteObject(hfont2); + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); +} + static void init_tests(void) { HMODULE module = GetModuleHandleA("usp10.dll"); @@ -4185,6 +4302,7 @@ START_TEST(usp10) test_ScriptGetLogicalWidths(); test_ScriptIsComplex(); + test_script_cache_reuse(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

01/01: [CMAKE/WIDL] Add rudimentary dependency tracking in add_rpcproxy_files CORE-14204
by Mark Jansen 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e9fb41b9f6bf9a677651… commit 7e9fb41b9f6bf9a677651f080853d5f4f50b52e3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 15 21:04:56 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 20 15:46:25 2018 +0100 [CMAKE/WIDL] Add rudimentary dependency tracking in add_rpcproxy_files CORE-14204 --- sdk/cmake/widl-support.cmake | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sdk/cmake/widl-support.cmake b/sdk/cmake/widl-support.cmake index 30c4c0b966..267459383b 100644 --- a/sdk/cmake/widl-support.cmake +++ b/sdk/cmake/widl-support.cmake @@ -45,11 +45,22 @@ function(add_rpcproxy_files) foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) - list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h - COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} native-widl) + # Most proxy idl's have names like <proxyname>_<original>.idl + # We use this to create a dependency from the proxy to the original idl + string(REPLACE "_" ";" SPLIT_FILE ${FILE}) + list(LENGTH SPLIT_FILE len) + unset(EXTRA_DEP) + if(len STREQUAL "2") + list(GET SPLIT_FILE 1 SPLIT_FILE) + if(EXISTS "${REACTOS_SOURCE_DIR}/sdk/include/psdk/${SPLIT_FILE}") + set(EXTRA_DEP ${REACTOS_SOURCE_DIR}/sdk/include/psdk/${SPLIT_FILE}) + endif() + endif() + list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.h + COMMAND native-widl ${INCLUDES} ${DEFINES} ${IDL_FLAGS} -p -o ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c -h -H ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${EXTRA_DEP} native-widl) endforeach() # Extra pass to generate dlldata

1 0

01/01: [NFI] Remove the $Extend specific case. This fixes a FIXME
by Pierre Schweitzer 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a34d807311c1e5d8c73d1… commit a34d807311c1e5d8c73d1156d0e545667b327e23 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 20 15:35:05 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 20 15:35:05 2018 +0100 [NFI] Remove the $Extend specific case. This fixes a FIXME --- .../rosapps/applications/rosinternals/nfi/nfi.c | 57 +++++++++++----------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/modules/rosapps/applications/rosinternals/nfi/nfi.c b/modules/rosapps/applications/rosinternals/nfi/nfi.c index b7b28792b6..3aa54a6d6b 100644 --- a/modules/rosapps/applications/rosinternals/nfi/nfi.c +++ b/modules/rosapps/applications/rosinternals/nfi/nfi.c @@ -164,6 +164,26 @@ void PrintUsage(void) /* FIXME */ } +void AddToCache(PWSTR Name, DWORD Length, ULONGLONG MftId) +{ + PNAME_CACHE_ENTRY CacheEntry; + + /* Allocate an entry big enough to store name and cache info */ + CacheEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(NAME_CACHE_ENTRY) + Length); + if (CacheEntry == NULL) + { + return; + } + + /* Insert in head (likely more perf) */ + CacheEntry->Next = CacheHead; + CacheHead = CacheEntry; + /* Set up entry with full path */ + CacheEntry->MftId = MftId; + CacheEntry->NameLen = Length; + CopyMemory(CacheEntry->Name, Name, Length); +} + void PrintPrettyName(PNTFS_ATTR_RECORD Attributes, PNTFS_ATTR_RECORD AttributesEnd, ULONGLONG MftId) { BOOLEAN FirstRun, Found; @@ -176,6 +196,13 @@ void PrintPrettyName(PNTFS_ATTR_RECORD Attributes, PNTFS_ATTR_RECORD AttributesE if (MftId <= NTFS_FILE_EXTEND) { _tprintf(_T("%s\n"), KnownEntries[MftId]); + + /* $Extend can contain entries, add it in cache */ + if (MftId == NTFS_FILE_EXTEND) + { + AddToCache(L"\\$Extend", sizeof(L"\\$Extend") - sizeof(UNICODE_NULL), NTFS_FILE_EXTEND); + } + return; } @@ -221,21 +248,6 @@ TryAgain: Length = Name->NameLength + 1; Display[Length] = UNICODE_NULL; } - /* Specific case for $Extend\ files - * FIXME: Should be made more generic? - */ - else if (ParentId == NTFS_FILE_EXTEND) - { - Display[0] = L'\\'; - Length = wcslen(L"$Extend"); - CopyMemory(&Display[1], L"$Extend", Length * sizeof(WCHAR)); - ++Length; - Display[Length] = L'\\'; - ++Length; - CopyMemory(Display + Length, Name->Name, Name->NameLength * sizeof(WCHAR)); - Length += Name->NameLength; - Display[Length] = UNICODE_NULL; - } /* Default case */ else { @@ -279,20 +291,7 @@ TryAgain: /* If that's a directory, put it in the cache */ if (Name->FileAttributes & NTFS_FILE_TYPE_DIRECTORY) { - PNAME_CACHE_ENTRY CacheEntry; - - /* Allocate an entry big enough to store name and cache info */ - CacheEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(NAME_CACHE_ENTRY) + Length * sizeof(WCHAR)); - if (CacheEntry != NULL) - { - /* Insert in head (likely more perf) */ - CacheEntry->Next = CacheHead; - CacheHead = CacheEntry; - /* Set up entry with full path */ - CacheEntry->MftId = MftId; - CacheEntry->NameLen = Length * sizeof(WCHAR); - CopyMemory(CacheEntry->Name, Display, Length * sizeof(WCHAR)); - } + AddToCache(Display, Length * sizeof(WCHAR), MftId); } /* Now, just quit */

1 0

01/01: [NFI] Add a first skeleton of what NFI could be.
by Pierre Schweitzer 20 Jan '18

20 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a46d9999dd96d9a036924… commit a46d9999dd96d9a036924712d4eae80d06c8ebcd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 20 14:52:39 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 20 14:54:00 2018 +0100 [NFI] Add a first skeleton of what NFI could be. All it will do for now is dumping the MFT / Files and their attributes. It lacks many features, could be really improved and is bugged. Note that logical sectors dump seems to be broken. MS NFI and this one don't agree on values. Developed against W2K3. --- .../applications/rosinternals/CMakeLists.txt | 1 + .../applications/rosinternals/nfi/CMakeLists.txt | 5 + .../rosapps/applications/rosinternals/nfi/nfi.c | 589 +++++++++++++++++++++ .../rosapps/applications/rosinternals/nfi/nfi.rc | 4 + 4 files changed, 599 insertions(+) diff --git a/modules/rosapps/applications/rosinternals/CMakeLists.txt b/modules/rosapps/applications/rosinternals/CMakeLists.txt index 1932f92bf5..298b745d09 100644 --- a/modules/rosapps/applications/rosinternals/CMakeLists.txt +++ b/modules/rosapps/applications/rosinternals/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(movefile) +add_subdirectory(nfi) add_subdirectory(ntfsinfo) add_subdirectory(pendmoves) diff --git a/modules/rosapps/applications/rosinternals/nfi/CMakeLists.txt b/modules/rosapps/applications/rosinternals/nfi/CMakeLists.txt new file mode 100644 index 0000000000..9fa5aec5dd --- /dev/null +++ b/modules/rosapps/applications/rosinternals/nfi/CMakeLists.txt @@ -0,0 +1,5 @@ +list(APPEND SOURCE nfi.c nfi.rc) +add_executable(nfi ${SOURCE}) +set_module_type(nfi win32cui UNICODE) +add_importlibs(nfi msvcrt kernel32 ntdll) +add_cd_file(TARGET nfi DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/rosinternals/nfi/nfi.c b/modules/rosapps/applications/rosinternals/nfi/nfi.c new file mode 100644 index 0000000000..b7b28792b6 --- /dev/null +++ b/modules/rosapps/applications/rosinternals/nfi/nfi.c @@ -0,0 +1,589 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NTFS Information tool + * FILE: rosinternals/nfi/nfi.c + * PURPOSE: Query information from NTFS volume using FSCTL + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> + +typedef struct +{ + ULONG Type; + USHORT UsaOffset; + USHORT UsaCount; + ULONGLONG Lsn; +} NTFS_RECORD_HEADER, *PNTFS_RECORD_HEADER; + +#define NRH_FILE_TYPE 0x454C4946 + +typedef enum +{ + AttributeStandardInformation = 0x10, + AttributeAttributeList = 0x20, + AttributeFileName = 0x30, + AttributeObjectId = 0x40, + AttributeSecurityDescriptor = 0x50, + AttributeVolumeName = 0x60, + AttributeVolumeInformation = 0x70, + AttributeData = 0x80, + AttributeIndexRoot = 0x90, + AttributeIndexAllocation = 0xA0, + AttributeBitmap = 0xB0, + AttributeReparsePoint = 0xC0, + AttributeEAInformation = 0xD0, + AttributeEA = 0xE0, + AttributePropertySet = 0xF0, + AttributeLoggedUtilityStream = 0x100, + AttributeEnd = 0xFFFFFFFF +} ATTRIBUTE_TYPE, *PATTRIBUTE_TYPE; + +typedef struct _FILE_RECORD_HEADER +{ + NTFS_RECORD_HEADER Ntfs; + USHORT SequenceNumber; + USHORT LinkCount; + USHORT AttributeOffset; + USHORT Flags; + ULONG BytesInUse; + ULONG BytesAllocated; + ULONGLONG BaseFileRecord; + USHORT NextAttributeNumber; +} FILE_RECORD_HEADER, *PFILE_RECORD_HEADER; + +typedef struct +{ + ULONG Type; + ULONG Length; + UCHAR IsNonResident; + UCHAR NameLength; + USHORT NameOffset; + USHORT Flags; + USHORT Instance; + union + { + struct + { + ULONG ValueLength; + USHORT ValueOffset; + UCHAR Flags; + UCHAR Reserved; + } Resident; + struct + { + ULONGLONG LowestVCN; + ULONGLONG HighestVCN; + USHORT MappingPairsOffset; + USHORT CompressionUnit; + UCHAR Reserved[4]; + LONGLONG AllocatedSize; + LONGLONG DataSize; + LONGLONG InitializedSize; + LONGLONG CompressedSize; + } NonResident; + }; +} NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; + +typedef struct +{ + ULONGLONG DirectoryFileReferenceNumber; + ULONGLONG CreationTime; + ULONGLONG ChangeTime; + ULONGLONG LastWriteTime; + ULONGLONG LastAccessTime; + ULONGLONG AllocatedSize; + ULONGLONG DataSize; + ULONG FileAttributes; + union + { + struct + { + USHORT PackedEaSize; + USHORT AlignmentOrReserved; + } EaInfo; + ULONG ReparseTag; + } Extended; + UCHAR NameLength; + UCHAR NameType; + WCHAR Name[1]; +} FILENAME_ATTRIBUTE, *PFILENAME_ATTRIBUTE; + +#define NTFS_FILE_NAME_POSIX 0 +#define NTFS_FILE_NAME_WIN32 1 +#define NTFS_FILE_NAME_DOS 2 +#define NTFS_FILE_NAME_WIN32_AND_DOS 3 + +#define NTFS_FILE_MFT 0 +#define NTFS_FILE_MFTMIRR 1 +#define NTFS_FILE_LOGFILE 2 +#define NTFS_FILE_VOLUME 3 +#define NTFS_FILE_ATTRDEF 4 +#define NTFS_FILE_ROOT 5 +#define NTFS_FILE_BITMAP 6 +#define NTFS_FILE_BOOT 7 +#define NTFS_FILE_BADCLUS 8 +#define NTFS_FILE_QUOTA 9 +#define NTFS_FILE_UPCASE 10 +#define NTFS_FILE_EXTEND 11 + +PWSTR KnownEntries[NTFS_FILE_EXTEND + 1] = +{ + _T("Master File Table ($Mft)"), + _T("Master File Table Mirror ($MftMirr)"), + _T("Log File ($LogFile)"), + _T("DASD ($Volume)"), + _T("Attribute Definition Table ($AttrDef)"), + _T("Root Directory"), + _T("Volume Bitmap ($BitMap)"), + _T("Boot Sectors ($Boot)"), + _T("Bad Cluster List ($BadClus)"), + _T("Security ($Secure)"), + _T("Upcase Table ($UpCase)"), + _T("Extend Table ($Extend)") +}; + +#define NTFS_MFT_MASK 0x0000FFFFFFFFFFFFULL + +#define NTFS_FILE_TYPE_DIRECTORY 0x10000000 + +typedef struct _NAME_CACHE_ENTRY +{ + struct _NAME_CACHE_ENTRY * Next; + ULONGLONG MftId; + ULONG NameLen; + WCHAR Name[1]; +} NAME_CACHE_ENTRY, *PNAME_CACHE_ENTRY; + +PNAME_CACHE_ENTRY CacheHead = NULL; + +void PrintUsage(void) +{ + /* FIXME */ +} + +void PrintPrettyName(PNTFS_ATTR_RECORD Attributes, PNTFS_ATTR_RECORD AttributesEnd, ULONGLONG MftId) +{ + BOOLEAN FirstRun, Found; + PNTFS_ATTR_RECORD Attribute; + + FirstRun = TRUE; + Found = FALSE; + + /* Setup name for "standard" files */ + if (MftId <= NTFS_FILE_EXTEND) + { + _tprintf(_T("%s\n"), KnownEntries[MftId]); + return; + } + + /* We'll first try to use the Win32 name + * If we fail finding it, we'll loop again for any other name + */ +TryAgain: + /* Loop all the attributes */ + Attribute = Attributes; + while (Attribute < AttributesEnd && Attribute->Type != AttributeEnd) + { + WCHAR Display[MAX_PATH]; + PFILENAME_ATTRIBUTE Name; + ULONGLONG ParentId; + ULONG Length; + + /* Move to the next arg if: + * - Not a file name + * - Not resident (should never happen!) + */ + if (Attribute->Type != AttributeFileName || Attribute->IsNonResident) + { + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + continue; + } + + /* Get the attribute data */ + Name = (PFILENAME_ATTRIBUTE)((ULONG_PTR)Attribute + Attribute->Resident.ValueOffset); + /* If not Win32, only accept if it wasn't the first run */ + if ((Name->NameType == NTFS_FILE_NAME_POSIX || Name->NameType == NTFS_FILE_NAME_DOS) && FirstRun) + { + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + continue; + } + + /* We accepted that name, get the parent ID to setup name */ + ParentId = Name->DirectoryFileReferenceNumber & NTFS_MFT_MASK; + /* If root, easy, just print \ */ + if (ParentId == NTFS_FILE_ROOT) + { + Display[0] = L'\\'; + CopyMemory(&Display[1], Name->Name, Name->NameLength * sizeof(WCHAR)); + Length = Name->NameLength + 1; + Display[Length] = UNICODE_NULL; + } + /* Specific case for $Extend\ files + * FIXME: Should be made more generic? + */ + else if (ParentId == NTFS_FILE_EXTEND) + { + Display[0] = L'\\'; + Length = wcslen(L"$Extend"); + CopyMemory(&Display[1], L"$Extend", Length * sizeof(WCHAR)); + ++Length; + Display[Length] = L'\\'; + ++Length; + CopyMemory(Display + Length, Name->Name, Name->NameLength * sizeof(WCHAR)); + Length += Name->NameLength; + Display[Length] = UNICODE_NULL; + } + /* Default case */ + else + { + PNAME_CACHE_ENTRY CacheEntry; + + /* Did we already cache the name? */ + for (CacheEntry = CacheHead; CacheEntry != NULL; CacheEntry = CacheEntry->Next) + { + if (ParentId == CacheEntry->MftId) + { + break; + } + } + + /* Nothing written yet */ + Length = 0; + /* We cached it */ + if (CacheEntry != NULL) + { + /* Set up name. The cache entry contains full path */ + Length = CacheEntry->NameLen / sizeof(WCHAR); + CopyMemory(Display, CacheEntry->Name, CacheEntry->NameLen); + Display[Length] = L'\\'; + ++Length; + } + else + { + /* FIXME: Do something, like trying to read parent... */ + _tprintf(_T("Parent: %I64d\n"), ParentId); + } + + /* Copy our name */ + CopyMemory(Display + Length, Name->Name, Name->NameLength * sizeof(WCHAR)); + Length += Name->NameLength; + Display[Length] = UNICODE_NULL; + } + + /* Display the name */ + _tprintf(_T("%s\n"), Display); + + /* If that's a directory, put it in the cache */ + if (Name->FileAttributes & NTFS_FILE_TYPE_DIRECTORY) + { + PNAME_CACHE_ENTRY CacheEntry; + + /* Allocate an entry big enough to store name and cache info */ + CacheEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(NAME_CACHE_ENTRY) + Length * sizeof(WCHAR)); + if (CacheEntry != NULL) + { + /* Insert in head (likely more perf) */ + CacheEntry->Next = CacheHead; + CacheHead = CacheEntry; + /* Set up entry with full path */ + CacheEntry->MftId = MftId; + CacheEntry->NameLen = Length * sizeof(WCHAR); + CopyMemory(CacheEntry->Name, Display, Length * sizeof(WCHAR)); + } + } + + /* Now, just quit */ + FirstRun = FALSE; + Found = TRUE; + + break; + } + + /* If was first run (Win32 search), retry with other names */ + if (FirstRun) + { + FirstRun = FALSE; + goto TryAgain; + } + + /* If we couldn't find a name, print unknown */ + if (!Found) + { + _tprintf(_T("(unknown/unnamed)\n")); + } +} + +PUCHAR DecodeRun(PUCHAR DataRun, LONGLONG *DataRunOffset, ULONGLONG *DataRunLength) +{ + UCHAR DataRunOffsetSize; + UCHAR DataRunLengthSize; + CHAR i; + + /* Get the offset size (in bytes) of the run */ + DataRunOffsetSize = (*DataRun >> 4) & 0xF; + /* Get the length size (in bytes) of the run */ + DataRunLengthSize = *DataRun & 0xF; + + /* Initialize values */ + *DataRunOffset = 0; + *DataRunLength = 0; + + /* Move to next byte */ + DataRun++; + + /* First, extract (byte after byte) run length with the size extracted from header */ + for (i = 0; i < DataRunLengthSize; i++) + { + *DataRunLength += ((ULONG64)*DataRun) << (i * 8); + /* Next byte */ + DataRun++; + } + + /* If offset size is 0, return -1 to show that's sparse run */ + if (DataRunOffsetSize == 0) + { + *DataRunOffset = -1; + } + /* Otherwise, extract offset */ + else + { + /* Extract (byte after byte) run offset with the size extracted from header */ + for (i = 0; i < DataRunOffsetSize - 1; i++) + { + *DataRunOffset += ((ULONG64)*DataRun) << (i * 8); + /* Next byte */ + DataRun++; + } + /* The last byte contains sign so we must process it different way. */ + *DataRunOffset = ((LONG64)(CHAR)(*(DataRun++)) << (i * 8)) + *DataRunOffset; + } + + /* Return next run */ + return DataRun; +} + +void PrintAttributeInfo(PNTFS_ATTR_RECORD Attribute, DWORD MaxSize) +{ + BOOL Known = TRUE; + WCHAR AttributeName[0xFF + 3]; + + /* First of all, try to get attribute name */ + if (Attribute->NameLength != 0 && Attribute->NameOffset < MaxSize && Attribute->NameOffset + Attribute->NameLength < MaxSize) + { + AttributeName[0] = L' '; + CopyMemory(AttributeName + 1, (PUCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset), Attribute->NameLength * sizeof(WCHAR)); + AttributeName[Attribute->NameLength + 1] = L' '; + AttributeName[Attribute->NameLength + 2] = UNICODE_NULL; + } + else + { + AttributeName[0] = L' '; + AttributeName[1] = UNICODE_NULL; + } + + /* Display attribute type, its name (if any) and whether it's resident */ + switch (Attribute->Type) + { + case AttributeFileName: + _tprintf(_T("\t$FILE_NAME%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeStandardInformation: + _tprintf(_T("\t$STANDARD_INFORMATION%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeData: + _tprintf(_T("\t$DATA%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeBitmap: + _tprintf(_T("\t$BITMAP%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeIndexRoot: + _tprintf(_T("\t$INDEX_ROOT%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeIndexAllocation: + _tprintf(_T("\t$INDEX_ALLOCATION%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeObjectId: + _tprintf(_T("\t$OBJECT_ID%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeSecurityDescriptor: + _tprintf(_T("\t$SECURITY_DESCRIPTOR%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeVolumeName: + _tprintf(_T("\t$VOLUME_NAME%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeVolumeInformation: + _tprintf(_T("\t$VOLUME_INFORMATION%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + case AttributeAttributeList: + _tprintf(_T("\t$ATTRIBUTE_LIST%s(%s)\n"), AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + break; + + default: + _tprintf(_T("\tUnknown (%x)%s(%s)\n"), Attribute->Type, AttributeName, (Attribute->IsNonResident ? _T("nonresident") : _T("resident"))); + Known = FALSE; + break; + } + + /* If attribute is non resident, display the logical sectors it covers */ + if (Known && Attribute->IsNonResident) + { + PUCHAR Run; + ULONGLONG Offset = 0; + + /* Get the runs mapping */ + Run = (PUCHAR)((ULONG_PTR)Attribute + Attribute->NonResident.MappingPairsOffset); + /* As long as header isn't 0x00, then, there's a run */ + while (*Run != 0) + { + LONGLONG CurrOffset; + ULONGLONG CurrLen; + + /* Decode the run, and move to the next one */ + Run = DecodeRun(Run, &CurrOffset, &CurrLen); + + /* We don't print sparse runs */ + if (CurrOffset != -1) + { + Offset += CurrOffset; + _tprintf(_T("\t\tlogical sectors %I64d-%I64d (0x%I64x-0x%I64x)\n"), Offset, Offset + CurrLen, Offset, Offset + CurrLen); + } + } + } +} + +int +__cdecl +_tmain(int argc, const TCHAR *argv[]) +{ + TCHAR VolumeName[] = _T("\\\\.\\C:"); + HANDLE VolumeHandle; + NTFS_VOLUME_DATA_BUFFER VolumeInfo; + DWORD LengthReturned; + ULONGLONG File; + PNTFS_FILE_RECORD_OUTPUT_BUFFER OutputBuffer; + TCHAR Letter; + PNAME_CACHE_ENTRY CacheEntry; + + if (argc == 1) + { + PrintUsage(); + return 0; + } + + /* Setup volume name */ + Letter = argv[1][0]; + if ((Letter >= 'A' && Letter <= 'Z') || + (Letter >= 'a' && Letter <= 'z')) + { + VolumeName[4] = Letter; + } + + /* Open volume */ + VolumeHandle = CreateFile(VolumeName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (VolumeHandle == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed opening the volume '%s' (%lx)\n"), VolumeName, GetLastError()); + return 1; + } + + /* Get NTFS volume info */ + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &VolumeInfo, sizeof(VolumeInfo), &LengthReturned, NULL)) + { + _ftprintf(stderr, _T("Failed requesting volume '%s' data (%lx)\n"), VolumeName, GetLastError()); + CloseHandle(VolumeHandle); + return 1; + } + + /* Validate output */ + if (LengthReturned < sizeof(VolumeInfo)) + { + _ftprintf(stderr, _T("Failed reading volume '%s' data (%lx)\n"), VolumeName, GetLastError()); + CloseHandle(VolumeHandle); + return 1; + } + + /* Allocate a buffer big enough to hold a file record */ + OutputBuffer = HeapAlloc(GetProcessHeap(), 0, VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); + if (OutputBuffer == NULL) + { + _ftprintf(stderr, _T("Failed to allocate %x bytes\n"), VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); + CloseHandle(VolumeHandle); + return 1; + } + + /* Forever loop, extract all the files! */ + for (File = 0;; ++File) + { + NTFS_FILE_RECORD_INPUT_BUFFER InputBuffer; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_RECORD Attribute, AttributesEnd; + + /* Get the file record */ + InputBuffer.FileReferenceNumber.QuadPart = File; + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_FILE_RECORD, &InputBuffer, sizeof(InputBuffer), + OutputBuffer, VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER), + &LengthReturned, NULL)) + { + continue; + } + + /* Don't deal with it if we already browsed it + * FSCTL_GET_NTFS_FILE_RECORD always returns previous record if demanded + * isn't allocated + */ + if (OutputBuffer->FileReferenceNumber.QuadPart != File) + { + continue; + } + + /* Sanity check */ + FileRecord = (PFILE_RECORD_HEADER)OutputBuffer->FileRecordBuffer; + if (FileRecord->Ntfs.Type != NRH_FILE_TYPE) + { + continue; + } + + /* Print ID */ + _tprintf(_T("\nFile %I64d\n"), OutputBuffer->FileReferenceNumber.QuadPart); + + /* Get attributes list */ + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + AttributesEnd = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse); + + /* Print the file name */ + PrintPrettyName(Attribute, AttributesEnd, File); + + /* And print attributes information for each attribute */ + while (Attribute < AttributesEnd && Attribute->Type != AttributeEnd) + { + PrintAttributeInfo(Attribute, VolumeInfo.BytesPerFileRecordSegment); + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + } + + /* Free memory! */ + while (CacheHead != NULL) + { + CacheEntry = CacheHead; + CacheHead = CacheEntry->Next; + HeapFree(GetProcessHeap(), 0, CacheEntry); + } + + /* Cleanup and exit */ + HeapFree(GetProcessHeap(), 0, OutputBuffer); + CloseHandle(VolumeHandle); + return 0; +} diff --git a/modules/rosapps/applications/rosinternals/nfi/nfi.rc b/modules/rosapps/applications/rosinternals/nfi/nfi.rc new file mode 100644 index 0000000000..89e0d39042 --- /dev/null +++ b/modules/rosapps/applications/rosinternals/nfi/nfi.rc @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "NTFS File sector Information\0" +#define REACTOS_STR_INTERNAL_NAME "nfi\0" +#define REACTOS_STR_ORIGINAL_FILENAME "nfi.exe\0" +#include <reactos/version.rc>

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