Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [EXPLORER] We need to leave one slot available for the m_WakeUpEvent handle

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb8cc0d098cc43b2ee9b3… commit cb8cc0d098cc43b2ee9b34133a06d2b93b56cb4f Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Sat Jan 20 18:50:10 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:50:10 2018 +0000 [EXPLORER] We need to leave one slot available for the m_WakeUpEvent handle --- base/shell/explorer/trayntfy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index ae52dee226..1864e33e96 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -155,7 +155,7 @@ public: // The likelyhood of someone having more than 64 icons in their tray is // pretty slim. We could spin up a new thread for each multiple of 64, but // it's not worth the effort, so we just won't bother watching those icons - if (m_WatcherList.GetCount() <= MAXIMUM_WAIT_OBJECTS) + if (m_WatcherList.GetCount() < MAXIMUM_WAIT_OBJECTS) { m_WatcherList.AddTail(Icon); SetEvent(m_WakeUpEvent);

6 years, 11 months

06/06: - Properly handle cases of more than 64 icons - Don't leak the list of handles on each pass through the loop - Make sure we clean up if the wait fails for whatever reason

by Ged Murphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be2bf9b8c59edeb4c9c57… commit be2bf9b8c59edeb4c9c57540a4b499ad0f351b81 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Sat Jan 20 18:09:23 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 - Properly handle cases of more than 64 icons - Don't leak the list of handles on each pass through the loop - Make sure we clean up if the wait fails for whatever reason --- base/shell/explorer/trayntfy.cpp | 56 +++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index d7e3b52754..ae52dee226 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -112,7 +112,8 @@ public: void Uninitialize() { m_Loop = false; - SetEvent(m_WakeUpEvent); + if (m_WakeUpEvent) + SetEvent(m_WakeUpEvent); EnterCriticalSection(&m_ListLock); @@ -134,22 +135,41 @@ public: bool AddIconToWatcher(_In_ NOTIFYICONDATA *iconData) { - IconWatcherData *Icon = new IconWatcherData(iconData); + DWORD ProcessId; + (void)GetWindowThreadProcessId(iconData->hWnd, &ProcessId); - (void)GetWindowThreadProcessId(iconData->hWnd, &Icon->ProcessId); - - Icon->hProcess = OpenProcess(SYNCHRONIZE, FALSE, Icon->ProcessId); - if (Icon->hProcess == NULL) + HANDLE hProcess; + hProcess = OpenProcess(SYNCHRONIZE, FALSE, ProcessId); + if (hProcess == NULL) + { return false; + } + + IconWatcherData *Icon = new IconWatcherData(iconData); + Icon->hProcess = hProcess; + Icon->ProcessId; + bool Added = false; EnterCriticalSection(&m_ListLock); - m_WatcherList.AddTail(Icon); - SetEvent(m_WakeUpEvent); + // The likelyhood of someone having more than 64 icons in their tray is + // pretty slim. We could spin up a new thread for each multiple of 64, but + // it's not worth the effort, so we just won't bother watching those icons + if (m_WatcherList.GetCount() <= MAXIMUM_WAIT_OBJECTS) + { + m_WatcherList.AddTail(Icon); + SetEvent(m_WakeUpEvent); + Added = true; + } LeaveCriticalSection(&m_ListLock); - return true; + if (!Added) + { + delete Icon; + } + + return Added; } bool RemoveIconFromWatcher(_In_ NOTIFYICONDATA *iconData) @@ -198,16 +218,19 @@ private: static UINT WINAPI WatcherThread(_In_opt_ LPVOID lpParam) { CIconWatcher* This = reinterpret_cast<CIconWatcher *>(lpParam); + HANDLE *WatchList = NULL; This->m_Loop = true; while (This->m_Loop) { - HANDLE *WatchList; - DWORD Size; - EnterCriticalSection(&This->m_ListLock); + DWORD Size; Size = This->m_WatcherList.GetCount() + 1; + ASSERT(Size <= MAXIMUM_WAIT_OBJECTS); + + if (WatchList) + delete WatchList; WatchList = new HANDLE[Size]; WatchList[0] = This->m_WakeUpEvent; @@ -274,10 +297,13 @@ private: Status = GetLastError(); } ERR("Failed to wait on process handles : %lu\n", Status); - This->m_Loop = false; + This->Uninitialize(); } } + if (WatchList) + delete WatchList; + return 0; } }; @@ -851,7 +877,7 @@ public: ret = Toolbar.AddButton(iconData); if (ret == TRUE) { - AddIconToWatcher(iconData); + (void)AddIconToWatcher(iconData); } break; case NIM_MODIFY: @@ -861,7 +887,7 @@ public: ret = Toolbar.RemoveButton(iconData); if (ret == TRUE) { - RemoveIconFromWatcher(iconData); + (void)RemoveIconFromWatcher(iconData); } break; default:

6 years, 11 months

05/06: Delete the lock on exit

by gedmurphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=851e0ca5a85683db1b0cb… commit 851e0ca5a85683db1b0cbd4345bf07cbc18cf6ee Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Jan 18 16:56:36 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 Delete the lock on exit --- base/shell/explorer/trayntfy.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 4df1a6240c..d7e3b52754 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -80,6 +80,8 @@ public: virtual ~CIconWatcher() { Uninitialize(); + DeleteCriticalSection(&m_ListLock); + if (m_WakeUpEvent) CloseHandle(m_WakeUpEvent); if (m_hWatcherThread)

6 years, 11 months

04/06: Properly delete the object and allow its destructor to cleanup

by gedmurphy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2abd068398267c89d3cdd… commit 2abd068398267c89d3cdd8e28251b8dec0a89ae1 Author: gedmurphy <gedmurphy(a)reactos.org> AuthorDate: Thu Jan 18 16:43:11 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 20 18:38:42 2018 +0000 Properly delete the object and allow its destructor to cleanup --- base/shell/explorer/trayntfy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 33ac6c85b3..4df1a6240c 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -122,7 +122,7 @@ public: { IconWatcherData *Icon; Icon = m_WatcherList.GetAt(Pos); - CloseHandle(Icon->hProcess); + delete Icon; } } m_WatcherList.RemoveAll();

6 years, 11 months

03/06: Minor update

by gedmurphy

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;

6 years, 11 months

02/06: forgot about the gcc build...

by gedmurphy

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)

6 years, 11 months

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

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)

6 years, 11 months

01/01: Formatting, no code change

by Ged Murphy

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; }

6 years, 11 months

01/01: [LWIP] dhcp.c: Cherry-pick lwIP 32aa9a4. CORE-8978

by Serge Gautherie

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;

6 years, 11 months

01/01: [NTOS] Remove unnecessary NULL checks and add a missing one. CIDs 1411958, 716670, 1322186

by Thomas Faber

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);

6 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018