Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 62214: [RSHELL] * CMenuBand: Bring the style closer to a menu.
by dquintana＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: dquintana Date: Sun Feb 16 12:48:41 2014 New Revision: 62214 URL: http://svn.reactos.org/svn/reactos?rev=62214&view=rev Log: [RSHELL] * CMenuBand: Bring the style closer to a menu. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 16 12:48:41 2014 @@ -823,9 +823,9 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) { LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_CUSTOMERASE | + TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP; - LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER; + LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_DRAWDDARROWS; if (dwFlags & SMINIT_VERTICAL) { @@ -949,7 +949,7 @@ MENUITEMINFOW info; TBBUTTON tbb = { 0 }; tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = BTNS_AUTOSIZE; + tbb.fsStyle = 0; info.cbSize = sizeof(info); info.fMask = MIIM_FTYPE | MIIM_ID; @@ -1002,7 +1002,7 @@ PWSTR MenuString; tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = BTNS_DROPDOWN | BTNS_AUTOSIZE; + tbb.fsStyle = 0; IEnumIDList * eidl; m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); @@ -1283,18 +1283,28 @@ int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); - if (hwndShlFld) SetWindowPos(hwndShlFld, NULL, - prc->left, - prc->top, - prc->right - prc->left, - sizeShlFldY.cy, - 0); - if (hwndStatic) SetWindowPos(hwndStatic, hwndShlFld, - prc->left, - prc->top + sizeShlFldY.cy, - prc->right - prc->left, - sy - sizeShlFldY.cy, - 0); + if (hwndShlFld) + { + SetWindowPos(hwndShlFld, NULL, + prc->left, + prc->top, + prc->right - prc->left, + sizeShlFldY.cy, + 0); + DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0); + SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); + } + if (hwndStatic) + { + SetWindowPos(hwndStatic, hwndShlFld, + prc->left, + prc->top + sizeShlFldY.cy, + prc->right - prc->left, + sy - sizeShlFldY.cy, + 0); + DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0); + SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); + } return S_OK; } @@ -1604,14 +1614,81 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - UNIMPLEMENTED; - return S_OK; + *theResult = 0; + if (uMsg == WM_NOTIFY) + { + NMHDR * hdr = (LPNMHDR) lParam; + NMTBCUSTOMDRAW * cdraw; + switch (hdr->code) + { + case NM_CUSTOMDRAW: + cdraw = (LPNMTBCUSTOMDRAW) hdr; + switch (cdraw->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + *theResult = CDRF_NOTIFYITEMDRAW; + return S_OK; + + case CDDS_ITEMPREPAINT: + + cdraw->clrBtnFace = GetSysColor(COLOR_MENU); + cdraw->clrBtnHighlight = GetSysColor(COLOR_MENUHILIGHT); + + cdraw->clrText = GetSysColor(COLOR_MENUTEXT); + cdraw->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); + cdraw->clrHighlightHotTrack = GetSysColor(COLOR_HIGHLIGHTTEXT); + + RECT rc = cdraw->nmcd.rc; + HDC hdc = cdraw->nmcd.hdc; + + HBRUSH bgBrush = GetSysColorBrush(COLOR_MENU); + HBRUSH hotBrush = GetSysColorBrush(COLOR_MENUHILIGHT); + + switch (cdraw->nmcd.uItemState) + { + case CDIS_HOT: + case CDIS_FOCUS: + FillRect(hdc, &rc, hotBrush); + break; + default: + FillRect(hdc, &rc, bgBrush); + break; + } + + *theResult = TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOETCHEDEFFECT | TBCDRF_HILITEHOTTRACK; + return S_OK; + } + return S_OK; + } + return S_OK; + + } + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) { - UNIMPLEMENTED; - return S_OK; + HWND hwndStatic = NULL; + HWND hwndShlFld = NULL; + HRESULT hr; + + if (m_staticToolbar != NULL) + hr = m_staticToolbar->GetWindow(&hwndStatic); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndStatic) + return S_OK; + + if (m_SFToolbar != NULL) + hr = m_SFToolbar->GetWindow(&hwndShlFld); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndShlFld) + return S_OK; + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS)

1 0

[dquintana] 62213: [RSHELL] * CMenuDeskBar: Improve code style, and implement some more methods.
by dquintana＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: dquintana Date: Sun Feb 16 12:48:29 2014 New Revision: 62213 URL: http://svn.reactos.org/svn/reactos?rev=62213&view=rev Log: [RSHELL] * CMenuDeskBar: Improve code style, and implement some more methods. Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sun Feb 16 12:48:29 2014 @@ -123,37 +123,30 @@ virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) + DECLARE_PROTECT_FINAL_CONSTRUCT() + +#if !WRAP_LOG + DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) + + BEGIN_MSG_MAP(CMenuDeskBar) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) + MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + END_MSG_MAP() + // message handlers LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) - DECLARE_PROTECT_FINAL_CONSTRUCT() - -#if !WRAP_LOG - DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) #endif - - BEGIN_MSG_MAP(CMenuDeskBar) - MESSAGE_HANDLER(WM_SIZE, OnSize) - /*MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) - MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) - MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) */ - MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) - MESSAGE_HANDLER(WM_PAINT, OnPaint) - END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) @@ -512,8 +505,13 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) { - // forward to owner - return E_NOTIMPL; + CComPtr<IInputObjectSite> ios; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios)); + if (FAILED(hr)) + return hr; + + return ios->OnFocusChangeIS(punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, @@ -546,42 +544,43 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - CComPtr<IServiceProvider> serviceProvider; - HRESULT hResult; - if (m_Site == NULL) return E_FAIL; - hResult = m_Site->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); - if (FAILED(hResult)) - return hResult; - // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser - // called for SID_IWebBrowserApp, IID_IConnectionPointContainer - // connection point called for DIID_DWebBrowserEvents2 to establish connection - return serviceProvider->QueryService(guidService, riid, ppvObject); + + return IUnknown_QueryService(m_Site, guidService, riid, ppvObject); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - // forward to contained bar - return S_OK; + return IUnknown_UIActivateIO(m_Client, fActivate, lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO() { - // forward to contained bar - return S_OK; + CComPtr<IInputObject> io; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); + if (FAILED(hr)) + return hr; + + return io->HasFocusIO(); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) { - // forward to contained bar - return S_OK; + CComPtr<IInputObject> io; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); + if (FAILED(hr)) + return hr; + + return io->TranslateAcceleratorIO(lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) { - CComPtr<IDeskBarClient> pDeskBandClient; - HRESULT hResult; + CComPtr<IDeskBarClient> pDeskBandClient; + HRESULT hResult; m_Client.Release(); @@ -708,43 +707,7 @@ return result; } -LRESULT CMenuDeskBar::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - SetCapture(); - m_Tracking = true; - m_LastLocation.x = LOWORD(lParam); - m_LastLocation.y = HIWORD(lParam); - return 0; -} - -LRESULT CMenuDeskBar::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - ReleaseCapture(); - m_Tracking = false; - return 0; -} - -LRESULT CMenuDeskBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - POINT newLocation; - //int delta; - - if (m_Tracking) - { - newLocation.x = (short) LOWORD(lParam); - newLocation.y = (short) HIWORD(lParam); - m_LastLocation = newLocation; - } - return 0; -} - LRESULT CMenuDeskBar::OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - m_Tracking = false; - return 0; -} - -LRESULT CMenuDeskBar::OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { m_Tracking = false; return 0;

1 0

[dquintana] 62212: [RSHELL] * CMenuSite: Improve code style.
by dquintana＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: dquintana Date: Sun Feb 16 12:48:09 2014 New Revision: 62212 URL: http://svn.reactos.org/svn/reactos?rev=62212&view=rev Log: [RSHELL] * CMenuSite: Improve code style. Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Sun Feb 16 12:48:09 2014 @@ -48,11 +48,11 @@ public IWinEventHandler, public IServiceProvider { - IUnknown * m_DeskBarSite; - IUnknown * m_BandObject; - IDeskBand * m_DeskBand; - IWinEventHandler * m_WinEventHandler; - HWND m_hWndBand; + CComPtr<IUnknown> m_DeskBarSite; + CComPtr<IUnknown> m_BandObject; + CComPtr<IDeskBand> m_DeskBand; + CComPtr<IWinEventHandler> m_WinEventHandler; + HWND m_hWndBand; public: CMenuSite(); @@ -119,7 +119,7 @@ virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode); private: - BOOL CreateSiteWindow(HWND hWndParent); + IUnknown * ToIUnknown() { return (IDeskBarClient*)this; } }; extern "C" @@ -201,26 +201,11 @@ IUnknown_SetSite(m_BandObject, NULL); - if (m_BandObject) - { - m_BandObject->Release(); - m_BandObject = NULL; - } - - if (m_DeskBand) - { - m_DeskBand->Release(); - m_DeskBand = NULL; - } - - if (m_WinEventHandler) - { - m_WinEventHandler->Release(); - m_WinEventHandler = NULL; - } - BOOL result = m_hWndBand != NULL; + m_BandObject = NULL; + m_DeskBand = NULL; + m_WinEventHandler = NULL; m_hWndBand = NULL; if (!punk) @@ -229,7 +214,7 @@ DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)))); DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)))); - IUnknown_SetSite(punk, (IDeskBarClient*)this); + IUnknown_SetSite(punk, this->ToIUnknown()); IUnknown_GetWindow(punk, &m_hWndBand); m_BandObject = punk; @@ -363,153 +348,101 @@ HRESULT STDMETHODCALLTYPE CMenuSite::SetDeskBarSite(IUnknown *punkSite) { - HWND hWndSite; - - ((IDeskBarClient*)this)->AddRef(); + HRESULT hr; + + CComPtr<IUnknown> protectThis(this->ToIUnknown()); if (punkSite) { - if (m_DeskBarSite) + HWND hWndSite; + + m_DeskBarSite = NULL; + + hr = IUnknown_GetWindow(punkSite, &hWndSite); + + if (FAILED(hr) || !hWndSite) + return E_FAIL; + + if (!m_hWnd) { - m_DeskBarSite->Release(); - m_DeskBarSite = NULL; + Create(hWndSite, NULL, L"MenuSite"); } - IUnknown_GetWindow(punkSite, &hWndSite); - - if (hWndSite) - { - CreateSiteWindow(hWndSite); - - m_DeskBarSite = punkSite; - - punkSite->AddRef(); - } - } - else - { - if (m_DeskBand) - { - m_DeskBand->CloseDW(0); - } - - IUnknown_SetSite(m_BandObject, NULL); - - if (m_BandObject) - { - m_BandObject->Release(); - m_BandObject = NULL; - } - - if (m_DeskBand) - { - m_DeskBand->Release(); - m_DeskBand = NULL; - } - - if (m_WinEventHandler) - { - m_WinEventHandler->Release(); - m_WinEventHandler = NULL; - } - - m_hWndBand = NULL; - - if (m_hWnd) - { - DestroyWindow(); - m_hWnd = NULL; - } - - if (m_DeskBarSite) - m_DeskBarSite->Release(); - - m_DeskBarSite = NULL; - } - - ((IDeskBarClient*)this)->Release(); - - if (!m_hWnd) + m_DeskBarSite = punkSite; + + return S_OK; + } + + if (m_DeskBand) + { + m_DeskBand->CloseDW(0); + } + + IUnknown_SetSite(m_BandObject, NULL); + + m_BandObject = NULL; + m_DeskBand = NULL; + m_WinEventHandler = NULL; + m_hWndBand = NULL; + m_hWnd = NULL; + m_DeskBarSite = NULL; + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateDBC(DWORD dwState) +{ + if (!m_DeskBand) + return S_OK; + + return m_DeskBand->ShowDW(dwState != 0); +} + +HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + if (lpMsg) return E_FAIL; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateDBC(DWORD dwState) -{ - if (!DBGASSERT(m_DeskBand)) - return S_OK; - - return m_DeskBand->ShowDW(dwState != 0); -} - -HRESULT STDMETHODCALLTYPE CMenuSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg) -{ - if (lpMsg && DBGASSERT(IsBadWritePtr(lpMsg, sizeof(*lpMsg)))) - return E_FAIL; - return IUnknown_UIActivateIO(m_BandObject, fActivate, lpMsg); } -BOOL CMenuSite::CreateSiteWindow(HWND hWndParent) -{ - if (m_hWnd) - { - return DBGASSERT(IsWindow()); - } - - Create(hWndParent, NULL, L"MenuSite"); - - return m_hWnd != NULL; -} - BOOL CMenuSite::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId) { - HWND hWndToCall; - IMenuPopup * pMenuPopup; - - ((IDeskBarClient*)this)->AddRef(); + HWND hWndTarget = NULL; + CComPtr<IUnknown> protectThis(this->ToIUnknown()); switch (uMsg) { case WM_SIZE: if (m_BandObject) { + CComPtr<IMenuPopup> pMenuPopup; if (SUCCEEDED(m_BandObject->QueryInterface(IID_PPV_ARG(IMenuPopup, &pMenuPopup)))) { RECT Rect = { 0 }; GetClientRect(&Rect); pMenuPopup->OnPosRectChangeDB(&Rect); - pMenuPopup->Release(); } } - hWndToCall = hWnd; + hWndTarget = hWnd; lResult = 1; break; case WM_NOTIFY: - hWndToCall = *(HWND *) lParam; + hWndTarget = ((NMHDR *)lParam)->hwndFrom; break; case WM_COMMAND: - hWndToCall = (HWND) lParam; + hWndTarget = (HWND) lParam; break; default: - ((IDeskBarClient*)this)->Release(); return FALSE; } - if (hWndToCall) - { - if (m_WinEventHandler) - { - if (m_WinEventHandler->IsWindowOwner(hWndToCall) == S_OK) - { - HRESULT hr = m_WinEventHandler->OnWinEvent(hWndToCall, uMsg, wParam, lParam, &lResult); - ((IDeskBarClient*)this)->Release(); - return hr == S_OK; - } - } - } - - ((IDeskBarClient*)this)->Release(); + if (hWndTarget && m_WinEventHandler && + m_WinEventHandler->IsWindowOwner(hWndTarget) == S_OK) + { + if (SUCCEEDED(m_WinEventHandler->OnWinEvent(hWndTarget, uMsg, wParam, lParam, &lResult))) + return TRUE; + } + return FALSE; }

1 0

[gadamopoulos] 62211: [appwiz] - Don't duplicate an export - Spotted by Victor Martinez
by gadamopoulos＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: gadamopoulos Date: Sun Feb 16 12:21:52 2014 New Revision: 62211 URL: http://svn.reactos.org/svn/reactos?rev=62211&view=rev Log: [appwiz] - Don't duplicate an export - Spotted by Victor Martinez Modified: trunk/reactos/dll/cpl/appwiz/appwiz.spec trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.spec… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.spec [iso-8859-1] Sun Feb 16 12:21:52 2014 @@ -1,4 +1,4 @@ @ stdcall CPlApplet(ptr long ptr ptr) -@ stdcall NewLinkHere(ptr long ptr ptr) +@ stdcall NewLinkHere(ptr long ptr ptr) NewLinkHereA @ stdcall NewLinkHereA(ptr long ptr ptr) @ stdcall NewLinkHereW(ptr long ptr ptr) Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sun Feb 16 12:21:52 2014 @@ -391,21 +391,6 @@ return TRUE; } - -LONG -CALLBACK -NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) -{ - WCHAR szFile[MAX_PATH]; - - if (MultiByteToWideChar(CP_ACP, 0, (LPSTR) lParam1, -1, szFile, MAX_PATH)) - { - return ShowCreateShortcutWizard(hwndCPl, szFile); - } - return -1; -} - - LONG CALLBACK NewLinkHereW(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)

1 0

[cwittich] 62210: [ws2_32] -do not initialize in case of error -don't touch vendor info
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 10:24:08 2014 New Revision: 62210 URL: http://svn.reactos.org/svn/reactos?rev=62210&view=rev Log: [ws2_32] -do not initialize in case of error -don't touch vendor info Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Sun Feb 16 10:24:08 2014 @@ -116,7 +116,6 @@ lpWSAData->wHighVersion = MAKEWORD(2,2); lstrcpyA(lpWSAData->szDescription, "WinSock 2.0"); lstrcpyA(lpWSAData->szSystemStatus, "Running"); - lpWSAData->lpVendorInfo = NULL; if (LOBYTE(wVersionRequested) == 1) { @@ -131,7 +130,8 @@ /*FIXME: increment internal counter */ - WSASETINITIALIZED; + if (ErrorCode == ERROR_SUCCESS) + WSASETINITIALIZED; return ErrorCode; } Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Sun Feb 16 10:24:08 2014 @@ -861,7 +861,7 @@ p = NtCurrentTeb()->WinSockData; - if( !p ) + if (!p || !WSAINITIALIZED) { WSASetLastError( WSANOTINITIALISED ); return NULL; @@ -1130,7 +1130,7 @@ DWORD ReadSize = 0; PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - if( !p ) + if (!p || !WSAINITIALIZED) { WSASetLastError( WSANOTINITIALISED ); return NULL; @@ -1314,7 +1314,7 @@ DWORD ReadSize = 0, ValidData = 0; PWINSOCK_THREAD_BLOCK p = NtCurrentTeb()->WinSockData; - if( !p ) + if( !p || !WSAINITIALIZED) { WSASetLastError( WSANOTINITIALISED ); return NULL; @@ -1496,7 +1496,7 @@ p = (PCHAR)cp; - if (!p) + if (!p || !WSAINITIALIZED) { WSASetLastError(WSAEFAULT); return INADDR_NONE;

1 0

[tkreuzer] 62209: [NTOSKRNL] Implement NtReadRequestData and NtWriteRequestData
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 09:54:05 2014 New Revision: 62209 URL: http://svn.reactos.org/svn/reactos?rev=62209&view=rev Log: [NTOSKRNL] Implement NtReadRequestData and NtWriteRequestData Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/lpc_x.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Sun Feb 16 09:54:05 2014 @@ -62,6 +62,18 @@ // #define LPCP_LOCK_HELD 1 #define LPCP_LOCK_RELEASE 2 + + +typedef struct _LPCP_DATA_INFO +{ + ULONG NumberOfEntries; + struct + { + PVOID BaseAddress; + ULONG DataLength; + } Entries[1]; +} LPCP_DATA_INFO, *PLPCP_DATA_INFO; + // // Internal Port Management @@ -131,6 +143,13 @@ VOID ); +BOOLEAN +NTAPI +LpcpValidateClientPort( + PETHREAD ClientThread, + PLPCP_PORT_OBJECT Port); + + // // Global data inside the Process Manager // Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] Sun Feb 16 09:54:05 2014 @@ -164,3 +164,10 @@ Thread->LpcWaitingOnPort = (PVOID)(((ULONG_PTR)Port) | LPCP_THREAD_FLAG_IS_PORT); } + +FORCEINLINE +PLPCP_DATA_INFO +LpcpGetDataInfoFromMessage(PPORT_MESSAGE Message) +{ + return (PLPCP_DATA_INFO)((PUCHAR)Message + Message->u2.s2.DataInfoOffset); +} Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Feb 16 09:54:05 2014 @@ -1798,3 +1798,17 @@ NTAPI MmSetSessionLocaleId( _In_ LCID LocaleId); + + +/* virtual.c *****************************************************************/ + +NTSTATUS +NTAPI +MmCopyVirtualMemory(IN PEPROCESS SourceProcess, + IN PVOID SourceAddress, + IN PEPROCESS TargetProcess, + OUT PVOID TargetAddress, + IN SIZE_T BufferSize, + IN KPROCESSOR_MODE PreviousMode, + OUT PSIZE_T ReturnSize); + Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Sun Feb 16 09:54:05 2014 @@ -88,6 +88,49 @@ /* Release the lock */ if (!LockHeld) KeReleaseGuardedMutex(&LpcpLock); +} + +PLPCP_MESSAGE +NTAPI +LpcpFindDataInfoMessage( + IN PLPCP_PORT_OBJECT Port, + IN ULONG MessageId, + IN LPC_CLIENT_ID ClientId) +{ + PLPCP_MESSAGE Message; + PLIST_ENTRY ListEntry; + PAGED_CODE(); + + /* Check if the port we want is the connection port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) > LPCP_UNCONNECTED_PORT) + { + /* Use it */ + Port = Port->ConnectionPort; + if (!Port) + { + /* Return NULL */ + return NULL; + } + } + + /* Loop all entries in the list */ + for (ListEntry = Port->LpcDataInfoChainHead.Flink; + ListEntry != &Port->LpcDataInfoChainHead; + ListEntry = ListEntry->Flink) + { + Message = CONTAINING_RECORD(ListEntry, LPCP_MESSAGE, Entry); + + /* Check if this is the desired message */ + if ((Message->Request.MessageId == MessageId) && + (Message->Request.ClientId.UniqueProcess == ClientId.UniqueProcess) && + (Message->Request.ClientId.UniqueThread == ClientId.UniqueThread)) + { + /* It is, return it */ + return Message; + } + } + + return NULL; } VOID @@ -132,7 +175,7 @@ /* Copy the Message Data */ RtlCopyMemory(Destination + 1, Data, - ((Destination->u1.Length & 0xFFFF) + 3) &~3); + ALIGN_UP_BY(Destination->u1.s1.DataLength, sizeof(ULONG))); } /* PUBLIC FUNCTIONS **********************************************************/ @@ -710,6 +753,199 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +LpcpCopyRequestData( + IN BOOLEAN Write, + IN HANDLE PortHandle, + IN PPORT_MESSAGE Message, + IN ULONG Index, + IN PVOID Buffer, + IN ULONG BufferLength, + OUT PULONG Returnlength) +{ + KPROCESSOR_MODE PreviousMode; + PORT_MESSAGE CapturedMessage; + PLPCP_PORT_OBJECT Port = NULL; + PETHREAD ClientThread = NULL; + ULONG LocalReturnlength; + PLPCP_MESSAGE InfoMessage; + PLPCP_DATA_INFO DataInfo; + PVOID DataInfoBaseAddress; + NTSTATUS Status; + PAGED_CODE(); + + /* Check the previous mode */ + PreviousMode = ExGetPreviousMode(); + if (PreviousMode == KernelMode) + { + CapturedMessage = *Message; + } + else + { + _SEH2_TRY + { + ProbeForRead(Message, sizeof(*Message), sizeof(PVOID)); + CapturedMessage = *Message; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + + /* Make sure there is any data to copy */ + if (CapturedMessage.u2.s2.DataInfoOffset == 0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Reference the port handle */ + Status = ObReferenceObjectByHandle(PortHandle, + PORT_ALL_ACCESS, + LpcPortObjectType, + PreviousMode, + (PVOID*)&Port, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port handle: 0x%ls\n", Status); + return Status; + } + + /* Look up the client thread */ + Status = PsLookupProcessThreadByCid(&CapturedMessage.ClientId, + NULL, + &ClientThread); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lookup client thread for [0x%lx:0x%lx]: 0x%ls\n", + CapturedMessage.ClientId.UniqueProcess, + CapturedMessage.ClientId.UniqueThread, Status); + goto Cleanup; + } + + /* Acquire the global LPC lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Check for message id mismatch */ + if ((ClientThread->LpcReplyMessageId != CapturedMessage.MessageId) || + (CapturedMessage.MessageId == 0)) + { + DPRINT1("LpcReplyMessageId mismatch: 0x%lx/0x%lx.\n", + ClientThread->LpcReplyMessageId, CapturedMessage.MessageId); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Validate the port */ + if (!LpcpValidateClientPort(ClientThread, Port)) + { + DPRINT1("LpcpValidateClientPort failed\n"); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Find the message with the data */ + InfoMessage = LpcpFindDataInfoMessage(Port, + CapturedMessage.MessageId, + CapturedMessage.ClientId); + if (InfoMessage == NULL) + { + DPRINT1("LpcpFindDataInfoMessage failed\n"); + Status = STATUS_INVALID_PARAMETER; + goto CleanupWithLock; + } + + /* Get the data info */ + DataInfo = LpcpGetDataInfoFromMessage(&InfoMessage->Request); + + /* Check if the index is within bounds */ + if (Index >= DataInfo->NumberOfEntries) + { + DPRINT1("Message data index %lu out of bounds (%lu in msg)\n", + Index, DataInfo->NumberOfEntries); + Status = STATUS_INVALID_PARAMETER; + goto CleanupWithLock; + } + + /* Check if the caller wants to read/write more data than expected */ + if (BufferLength > DataInfo->Entries[Index].DataLength) + { + DPRINT1("Trying to read more data (%lu) than available (%lu)\n", + BufferLength, DataInfo->Entries[Index].DataLength); + Status = STATUS_INVALID_PARAMETER; + goto CleanupWithLock; + } + + /* Get the data pointer */ + DataInfoBaseAddress = DataInfo->Entries[Index].BaseAddress; + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + if (Write) + { + /* Copy data from the caller to the message sender */ + Status = MmCopyVirtualMemory(PsGetCurrentProcess(), + Buffer, + ClientThread->ThreadsProcess, + DataInfoBaseAddress, + BufferLength, + PreviousMode, + &LocalReturnlength); + } + else + { + /* Copy data from the message sender to the caller */ + Status = MmCopyVirtualMemory(ClientThread->ThreadsProcess, + DataInfoBaseAddress, + PsGetCurrentProcess(), + Buffer, + BufferLength, + PreviousMode, + &LocalReturnlength); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmCopyVirtualMemory failed: 0x%ls\n", Status); + goto Cleanup; + } + + /* Check if the caller asked to return the copied length */ + if (Returnlength != NULL) + { + _SEH2_TRY + { + *Returnlength = LocalReturnlength; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore */ + DPRINT1("Exception writing Returnlength, ignoring\n"); + } + _SEH2_END; + } + +Cleanup: + + if (ClientThread != NULL) + ObDereferenceObject(ClientThread); + + ObDereferenceObject(Port); + + return Status; + +CleanupWithLock: + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + goto Cleanup; +} + /* * @unimplemented */ @@ -720,10 +956,16 @@ IN ULONG Index, IN PVOID Buffer, IN ULONG BufferLength, - OUT PULONG Returnlength) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + OUT PULONG ReturnLength) +{ + /* Call the internal function */ + return LpcpCopyRequestData(FALSE, + PortHandle, + Message, + Index, + Buffer, + BufferLength, + ReturnLength); } /* @@ -738,8 +980,14 @@ IN ULONG BufferLength, OUT PULONG ReturnLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Call the internal function */ + return LpcpCopyRequestData(TRUE, + PortHandle, + Message, + Index, + Buffer, + BufferLength, + ReturnLength); } /* EOF */ Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/send.c [iso-8859-1] Sun Feb 16 09:54:05 2014 @@ -207,34 +207,34 @@ { /* No type */ case 0: - + /* Assume LPC request */ MessageType = LPC_REQUEST; break; - + /* LPC request callback */ case LPC_REQUEST: - + /* This is a callback */ Callback = TRUE; break; - + /* Anything else */ case LPC_CLIENT_DIED: case LPC_PORT_CLOSED: case LPC_EXCEPTION: case LPC_DEBUG_EVENT: case LPC_ERROR_EVENT: - + /* Nothing to do */ break; - + default: - + /* Invalid message type */ return STATUS_INVALID_PARAMETER; } - + /* Set the request type */ LpcRequest->u2.s2.Type = MessageType; @@ -401,10 +401,10 @@ (&Message->Request) + 1, 0, NULL); - + /* Acquire the lock */ KeAcquireGuardedMutex(&LpcpLock); - + /* Check if we replied to a thread */ if (Message->RepliedToThread) { @@ -633,6 +633,47 @@ return Status; } +NTSTATUS +NTAPI +LpcpVerifyMessageDataInfo( + _In_ PPORT_MESSAGE Message, + _Out_ PULONG NumberOfDataEntries) +{ + PLPCP_DATA_INFO DataInfo; + PUCHAR EndOfEntries; + + /* Check if we have no data info at all */ + if (Message->u2.s2.DataInfoOffset == 0) + { + *NumberOfDataEntries = 0; + return STATUS_SUCCESS; + } + + /* Make sure the data info structure is within the message */ + if (((ULONG)Message->u1.s1.TotalLength < + sizeof(PORT_MESSAGE) + sizeof(LPCP_DATA_INFO)) || + ((ULONG)Message->u2.s2.DataInfoOffset < sizeof(PORT_MESSAGE)) || + ((ULONG)Message->u2.s2.DataInfoOffset > + ((ULONG)Message->u1.s1.TotalLength - sizeof(LPCP_DATA_INFO)))) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get a pointer to the data info */ + DataInfo = LpcpGetDataInfoFromMessage(Message); + + /* Make sure the full data info with all entries is within the message */ + EndOfEntries = (PUCHAR)&DataInfo->Entries[DataInfo->NumberOfEntries]; + if ((EndOfEntries > ((PUCHAR)Message + (ULONG)Message->u1.s1.TotalLength)) || + (EndOfEntries < (PUCHAR)Message)) + { + return STATUS_INVALID_PARAMETER; + } + + *NumberOfDataEntries = DataInfo->NumberOfEntries; + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -642,6 +683,8 @@ IN PPORT_MESSAGE LpcRequest, IN OUT PPORT_MESSAGE LpcReply) { + PORT_MESSAGE LocalLpcRequest; + ULONG NumberOfDataEntries; PLPCP_PORT_OBJECT Port, QueuePort, ReplyPort, ConnectionPort = NULL; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; @@ -650,6 +693,7 @@ BOOLEAN Callback; PKSEMAPHORE Semaphore; ULONG MessageType; + PLPCP_DATA_INFO DataInfo; PAGED_CODE(); LPCTRACE(LPC_SEND_DEBUG, "Handle: %p. Messages: %p/%p. Type: %lx\n", @@ -661,32 +705,78 @@ /* Check if the thread is dying */ if (Thread->LpcExitThreadCalled) return STATUS_THREAD_IS_TERMINATING; + /* Check for user mode access */ + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Probe the full request message and copy the base structure */ + ProbeForRead(LpcRequest, sizeof(*LpcRequest), sizeof(ULONG)); + ProbeForRead(LpcRequest, LpcRequest->u1.s1.TotalLength, sizeof(ULONG)); + LocalLpcRequest = *LpcRequest; + + /* Probe the reply message for write */ + ProbeForWrite(LpcReply, sizeof(*LpcReply), sizeof(ULONG)); + + /* Make sure the data entries in the request message are valid */ + Status = LpcpVerifyMessageDataInfo(LpcRequest, &NumberOfDataEntries); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LpcpVerifyMessageDataInfo failed\n"); + return Status; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + LocalLpcRequest = *LpcRequest; + Status = LpcpVerifyMessageDataInfo(LpcRequest, &NumberOfDataEntries); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LpcpVerifyMessageDataInfo failed\n"); + return Status; + } + } + /* Check if this is an LPC Request */ - if (LpcpGetMessageType(LpcRequest) == LPC_REQUEST) + if (LpcpGetMessageType(&LocalLpcRequest) == LPC_REQUEST) { /* Then it's a callback */ Callback = TRUE; } - else if (LpcpGetMessageType(LpcRequest)) + else if (LpcpGetMessageType(&LocalLpcRequest)) { /* This is a not kernel-mode message */ + DPRINT1("Not a kernel-mode message!\n"); return STATUS_INVALID_PARAMETER; } else { /* This is a kernel-mode message without a callback */ - LpcRequest->u2.s2.Type |= LPC_REQUEST; + LocalLpcRequest.u2.s2.Type |= LPC_REQUEST; Callback = FALSE; } /* Get the message type */ - MessageType = LpcRequest->u2.s2.Type; + MessageType = LocalLpcRequest.u2.s2.Type; + + /* Due to the above probe, we know that TotalLength is positive */ + NT_ASSERT(LocalLpcRequest.u1.s1.TotalLength >= 0); /* Validate the length */ - if (((ULONG)LpcRequest->u1.s1.DataLength + sizeof(PORT_MESSAGE)) > - (ULONG)LpcRequest->u1.s1.TotalLength) + if ((((ULONG)(USHORT)LocalLpcRequest.u1.s1.DataLength + sizeof(PORT_MESSAGE)) > + (ULONG)LocalLpcRequest.u1.s1.TotalLength)) { /* Fail */ + DPRINT1("Invalid message length: %u, %u\n", + LocalLpcRequest.u1.s1.DataLength, + LocalLpcRequest.u1.s1.TotalLength); return STATUS_INVALID_PARAMETER; } @@ -700,10 +790,13 @@ if (!NT_SUCCESS(Status)) return Status; /* Validate the message length */ - if (((ULONG)LpcRequest->u1.s1.TotalLength > Port->MaxMessageLength) || - ((ULONG)LpcRequest->u1.s1.TotalLength <= (ULONG)LpcRequest->u1.s1.DataLength)) + if (((ULONG)LocalLpcRequest.u1.s1.TotalLength > Port->MaxMessageLength) || + ((ULONG)LocalLpcRequest.u1.s1.TotalLength <= (ULONG)LocalLpcRequest.u1.s1.DataLength)) { /* Fail */ + DPRINT1("Invalid message length: %u, %u\n", + LocalLpcRequest.u1.s1.DataLength, + LocalLpcRequest.u1.s1.TotalLength); ObDereferenceObject(Port); return STATUS_PORT_MESSAGE_TOO_LONG; } @@ -713,6 +806,7 @@ if (!Message) { /* Fail if we couldn't allocate a message */ + DPRINT1("Failed to allocate a message!\n"); ObDereferenceObject(Port); return STATUS_NO_MEMORY; } @@ -729,6 +823,22 @@ /* No callback, just copy the message */ _SEH2_TRY { + /* Check if we have data info entries */ + if (LpcRequest->u2.s2.DataInfoOffset != 0) + { + /* Get the data info and check if the number of entries matches + what we expect */ + DataInfo = LpcpGetDataInfoFromMessage(LpcRequest); + if (DataInfo->NumberOfEntries != NumberOfDataEntries) + { + LpcpFreeToPortZone(Message, 0); + ObDereferenceObject(Port); + DPRINT1("NumberOfEntries has changed: %u, %u\n", + DataInfo->NumberOfEntries, NumberOfDataEntries); + return STATUS_INVALID_PARAMETER; + } + } + /* Copy it */ LpcpMoveMessage(&Message->Request, LpcRequest, @@ -739,6 +849,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Fail */ + DPRINT1("Got exception!\n"); LpcpFreeToPortZone(Message, 0); ObDereferenceObject(Port); _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -759,6 +870,7 @@ if (!QueuePort) { /* We have no connected port, fail */ + DPRINT1("No connected port\n"); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; @@ -767,28 +879,21 @@ /* This will be the rundown port */ ReplyPort = QueuePort; - /* Check if this is a communication port */ + /* Check if this is a client port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CLIENT_PORT) { - /* Copy the port context and use the connection port */ + /* Copy the port context */ Message->PortContext = QueuePort->PortContext; - ConnectionPort = QueuePort = Port->ConnectionPort; - if (!ConnectionPort) - { - /* Fail */ - LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); - ObDereferenceObject(Port); - return STATUS_PORT_DISCONNECTED; - } - } - else if ((Port->Flags & LPCP_PORT_TYPE_MASK) != - LPCP_COMMUNICATION_PORT) + } + + if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT) { /* Use the connection port for anything but communication ports */ ConnectionPort = QueuePort = Port->ConnectionPort; if (!ConnectionPort) { /* Fail */ + DPRINT1("No connection port\n"); LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); ObDereferenceObject(Port); return STATUS_PORT_DISCONNECTED; @@ -883,6 +988,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + DPRINT1("Got exception!\n"); Status = _SEH2_GetExceptionCode(); } _SEH2_END;

1 0

[tkreuzer] 62208: [NTOSKRNL] Implement SystemLookasideInformation case in NtQuerySystemInformation
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 09:27:01 2014 New Revision: 62208 URL: http://svn.reactos.org/svn/reactos?rev=62208&view=rev Log: [NTOSKRNL] Implement SystemLookasideInformation case in NtQuerySystemInformation Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Feb 16 09:27:01 2014 @@ -178,6 +178,62 @@ /* Done */ return Status; +} + +VOID +NTAPI +ExUnlockUserBuffer(PMDL Mdl) +{ + MmUnlockPages(Mdl); + ExFreePoolWithTag(Mdl, TAG_MDL); +} + +NTSTATUS +NTAPI +ExLockUserBuffer( + PVOID BaseAddress, + ULONG Length, + KPROCESSOR_MODE AccessMode, + LOCK_OPERATION Operation, + PVOID *MappedSystemVa, + PMDL *OutMdl) +{ + PMDL Mdl; + PAGED_CODE(); + + *MappedSystemVa = NULL; + *OutMdl = NULL; + + /* Allocate an MDL for the buffer */ + Mdl = IoAllocateMdl(BaseAddress, Length, FALSE, TRUE, NULL); + if (Mdl == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Enter SEH for probing */ + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, AccessMode, Operation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(Mdl, TAG_MDL); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Return the safe kernel mode buffer */ + *MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); + if (*MappedSystemVa == NULL) + { + ExUnlockUserBuffer(Mdl); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return the MDL */ + *OutMdl = Mdl; + return STATUS_SUCCESS; } /* FUNCTIONS *****************************************************************/ @@ -1799,13 +1855,151 @@ return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); } +static +VOID +ExpCopyLookasideInformation( + PSYSTEM_LOOKASIDE_INFORMATION *InfoPointer, + PULONG RemainingPointer, + PLIST_ENTRY ListHead, + BOOLEAN ListUsesMisses) + +{ + PSYSTEM_LOOKASIDE_INFORMATION Info; + PGENERAL_LOOKASIDE LookasideList; + PLIST_ENTRY ListEntry; + ULONG Remaining; + + /* Get info pointer and remaining count of free array element */ + Info = *InfoPointer; + Remaining = *RemainingPointer; + + /* Loop as long as we have lookaside lists and free array elements */ + for (ListEntry = ListHead->Flink; + (ListEntry != ListHead) && (Remaining > 0); + ListEntry = ListEntry->Flink, Remaining--) + { + LookasideList = CONTAINING_RECORD(ListEntry, GENERAL_LOOKASIDE, ListEntry); + + /* Fill the next array element */ + Info->CurrentDepth = LookasideList->Depth; + Info->MaximumDepth = LookasideList->MaximumDepth; + Info->TotalAllocates = LookasideList->TotalAllocates; + Info->TotalFrees = LookasideList->TotalFrees; + Info->Type = LookasideList->Type; + Info->Tag = LookasideList->Tag; + Info->Size = LookasideList->Size; + + /* Check how the lists track misses/hits */ + if (ListUsesMisses) + { + /* Copy misses */ + Info->AllocateMisses = LookasideList->AllocateMisses; + Info->FreeMisses = LookasideList->FreeMisses; + } + else + { + /* Calculate misses */ + Info->AllocateMisses = LookasideList->TotalAllocates + - LookasideList->AllocateHits; + Info->FreeMisses = LookasideList->TotalFrees + - LookasideList->FreeHits; + } + } + + /* Return the updated pointer and remaining count */ + *InfoPointer = Info; + *RemainingPointer = Remaining; +} /* Class 45 - Lookaside Information */ QSI_DEF(SystemLookasideInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemLookasideInformation not implemented\n"); - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + PSYSTEM_LOOKASIDE_INFORMATION Info; + PMDL Mdl; + ULONG MaxCount, Remaining; + KIRQL OldIrql; + NTSTATUS Status; + + /* First we need to lock down the memory, since we are going to access it + at high IRQL */ + PreviousMode = ExGetPreviousMode(); + Status = ExLockUserBuffer(Buffer, + Size, + PreviousMode, + IoWriteAccess, + (PVOID*)&Info, + &Mdl); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lock the user buffer: 0x%lx\n", Status); + return Status; + } + + /* Calculate how many items we can store */ + Remaining = MaxCount = Size / sizeof(SYSTEM_LOOKASIDE_INFORMATION); + if (Remaining == 0) + { + goto Leave; + } + + /* Copy info from pool lookaside lists */ + ExpCopyLookasideInformation(&Info, + &Remaining, + &ExPoolLookasideListHead, + FALSE); + if (Remaining == 0) + { + goto Leave; + } + + /* Copy info from system lookaside lists */ + ExpCopyLookasideInformation(&Info, + &Remaining, + &ExSystemLookasideListHead, + TRUE); + if (Remaining == 0) + { + goto Leave; + } + + /* Acquire spinlock for ExpNonPagedLookasideListHead */ + OldIrql = KfAcquireSpinLock(&ExpNonPagedLookasideListLock); + + /* Copy info from non-paged lookaside lists */ + ExpCopyLookasideInformation(&Info, + &Remaining, + &ExpNonPagedLookasideListHead, + TRUE); + + /* Release spinlock for ExpNonPagedLookasideListHead */ + KfReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql); + + if (Remaining == 0) + { + goto Leave; + } + + /* Acquire spinlock for ExpPagedLookasideListHead */ + OldIrql = KfAcquireSpinLock(&ExpPagedLookasideListLock); + + /* Copy info from paged lookaside lists */ + ExpCopyLookasideInformation(&Info, + &Remaining, + &ExpPagedLookasideListHead, + TRUE); + + /* Release spinlock for ExpPagedLookasideListHead */ + KfReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql); + +Leave: + + /* Release the locked user buffer */ + ExUnlockUserBuffer(Mdl); + + /* Return the size of the actually written data */ + *ReqSize = (MaxCount - Remaining) * sizeof(SYSTEM_LOOKASIDE_INFORMATION); + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Feb 16 09:27:01 2014 @@ -27,6 +27,11 @@ extern ULONG ExpAltTimeZoneBias; extern LIST_ENTRY ExSystemLookasideListHead; extern PCALLBACK_OBJECT PowerStateCallback; +extern LIST_ENTRY ExPoolLookasideListHead; +extern LIST_ENTRY ExpNonPagedLookasideListHead; +extern LIST_ENTRY ExpPagedLookasideListHead; +extern KSPIN_LOCK ExpNonPagedLookasideListLock; +extern KSPIN_LOCK ExpPagedLookasideListLock; typedef struct _EXHANDLE {

1 0

[tkreuzer] 62207: [NTOSKRNL] - Halfplement SeReportSecurityEvent, stub SeSetAuditParameter and enable both exports, which are SP1!
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 09:08:22 2014 New Revision: 62207 URL: http://svn.reactos.org/svn/reactos?rev=62207&view=rev Log: [NTOSKRNL] - Halfplement SeReportSecurityEvent, stub SeSetAuditParameter and enable both exports, which are SP1! Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sun Feb 16 09:08:22 2014 @@ -1373,9 +1373,9 @@ @ stdcall SeRegisterLogonSessionTerminatedRoutine(ptr) @ stdcall SeReleaseSecurityDescriptor(ptr long long) @ stdcall SeReleaseSubjectContext(ptr) -;@ cdecl -arch=x86_64 SeReportSecurityEvent +@ stdcall SeReportSecurityEvent(long ptr ptr ptr) @ stdcall SeSetAccessStateGenericMapping(ptr ptr) -;SeSetAuditParameter +@ stdcall SeSetAuditParameter(ptr long long ptr) @ stdcall SeSetSecurityDescriptorInfo(ptr ptr ptr ptr long ptr) @ stdcall SeSetSecurityDescriptorInfoEx(ptr ptr ptr ptr long long ptr) @ stdcall SeSinglePrivilegeCheck(long long long) Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sun Feb 16 09:08:22 2014 @@ -311,4 +311,86 @@ } } +NTSTATUS +NTAPI +SeReportSecurityEvent( + _In_ ULONG Flags, + _In_ PUNICODE_STRING SourceName, + _In_opt_ PSID UserSid, + _In_ PSE_ADT_PARAMETER_ARRAY AuditParameters) +{ + SECURITY_SUBJECT_CONTEXT SubjectContext; + PTOKEN EffectiveToken; + PISID Sid; + NTSTATUS Status; + + /* Validate parameters */ + if ((Flags != 0) || + (SourceName == NULL) || + (SourceName->Buffer == NULL) || + (SourceName->Length == 0) || + (AuditParameters == NULL) || + (AuditParameters->ParameterCount > SE_MAX_AUDIT_PARAMETERS - 4)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validate the source name */ + Status = RtlValidateUnicodeString(0, SourceName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Check if we have a user SID */ + if (UserSid != NULL) + { + /* Validate it */ + if (!RtlValidSid(UserSid)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Use the user SID */ + Sid = UserSid; + } + else + { + /* No user SID, capture the security subject context */ + SeCaptureSubjectContext(&SubjectContext); + + /* Extract the effective token */ + EffectiveToken = SubjectContext.ClientToken ? + SubjectContext.ClientToken : SubjectContext.PrimaryToken; + + /* Use the user-and-groups SID */ + Sid = EffectiveToken->UserAndGroups->Sid; + } + + UNIMPLEMENTED; + + /* Check if we captured the subject context */ + if (Sid != UserSid) + { + /* Release it */ + SeReleaseSubjectContext(&SubjectContext); + } + + /* Return success */ + return STATUS_SUCCESS; +} + +_Const_ +NTSTATUS +NTAPI +SeSetAuditParameter( + _Inout_ PSE_ADT_PARAMETER_ARRAY AuditParameters, + _In_ SE_ADT_PARAMETER_TYPE Type, + _In_range_(<, SE_MAX_AUDIT_PARAMETERS) ULONG Index, + _In_reads_(_Inexpressible_("depends on SE_ADT_PARAMETER_TYPE")) PVOID Data) +{ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + /* EOF */

1 0

[tkreuzer] 62206: [NTOSKRNL] - Fix logic in PsReferenceEffectiveToken
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 08:56:34 2014 New Revision: 62206 URL: http://svn.reactos.org/svn/reactos?rev=62206&view=rev Log: [NTOSKRNL] - Fix logic in PsReferenceEffectiveToken Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sun Feb 16 08:56:34 2014 @@ -698,25 +698,7 @@ /* Check if we don't have impersonation info */ Process = Thread->ThreadsProcess; - if (!Thread->ActiveImpersonationInfo) - { - /* Fast Reference the Token */ - Token = ObFastReferenceObject(&Process->Token); - - /* Check if we got the Token or if we got locked */ - if (!Token) - { - /* Lock the Process */ - PspLockProcessSecurityShared(Process); - - /* Do a Locked Fast Reference */ - Token = ObFastReferenceObjectLocked(&Process->Token); - - /* Unlock the Process */ - PspUnlockProcessSecurityShared(Process); - } - } - else + if (Thread->ActiveImpersonationInfo) { /* Lock the Process */ PspLockProcessSecurityShared(Process); @@ -737,6 +719,22 @@ PspUnlockProcessSecurityShared(Process); return Token; } + + /* Unlock the Process */ + PspUnlockProcessSecurityShared(Process); + } + + /* Fast Reference the Token */ + Token = ObFastReferenceObject(&Process->Token); + + /* Check if we got the Token or if we got locked */ + if (!Token) + { + /* Lock the Process */ + PspLockProcessSecurityShared(Process); + + /* Do a Locked Fast Reference */ + Token = ObFastReferenceObjectLocked(&Process->Token); /* Unlock the Process */ PspUnlockProcessSecurityShared(Process);

1 0

[tkreuzer] 62205: [NTOSKRNL] - Do not fail in CmLoadKey, when a trust class key was passed. Instead just ignore it.
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 08:54:38 2014 New Revision: 62205 URL: http://svn.reactos.org/svn/reactos?rev=62205&view=rev Log: [NTOSKRNL] - Do not fail in CmLoadKey, when a trust class key was passed. Instead just ignore it. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun Feb 16 08:54:38 2014 @@ -1896,8 +1896,7 @@ if (KeyBody) { /* Fail */ - DPRINT1("Trusted classes not yet supported\n"); - return STATUS_NOT_IMPLEMENTED; + DPRINT("Trusted classes not yet supported\n"); } /* Build a service QoS for a security context */

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