Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ssawant] 75074: [QCKLNCH] -Added CISFBand.h and CISFBand.cpp -Adjusted CMakeLists.txt -Other adjustment to start implementing own CISFBand for quick launch.
by ssawant＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: ssawant Date: Sat Jun 17 15:28:17 2017 New Revision: 75074 URL: http://svn.reactos.org/svn/reactos?rev=75074&view=rev Log: [QCKLNCH] -Added CISFBand.h and CISFBand.cpp -Adjusted CMakeLists.txt -Other adjustment to start implementing own CISFBand for quick launch. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -0,0 +1,313 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CISFBand.cpp + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qcklnch); + +//Subclassing Button + + LRESULT CALLBACK MyWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) + { + switch (uMsg) + { + case WM_COMMAND: + { + MessageBox(0, L"Button Clicked!!", L"Testing", MB_OK | MB_ICONINFORMATION); + } + } + return DefSubclassProc(hWnd, uMsg, wParam, lParam); + } + +//CISFBand + + CISFBand::CISFBand() : m_hWnd(NULL), m_BandID(0) {} + + CISFBand::~CISFBand() {} + +/*****************************************************************************/ + +//IObjectWithSite + HRESULT STDMETHODCALLTYPE CISFBand::SetSite(IUnknown *pUnkSite) + { + //MessageBox(0, L"CISFBand::SetSite called!", L"Testing", MB_OK | MB_ICONINFORMATION); + + /* HRESULT hRet; + HWND hwndParent; + + TRACE("CISFBand::SetSite(0x%p)\n", pUnkSite); + + hRet = IUnknown_GetWindow(pUnkSite, &hwndParent); + if (FAILED(hRet)) + { + TRACE("Querying site window failed: 0x%x\n", hRet); + return hRet; + } + m_Site = pUnkSite; + m_hWnd = CreateWindowEx(0, L"BUTTON", L">>", WS_CHILD, CW_USEDEFAULT, CW_USEDEFAULT, 50, 50, hwndParent, 0, m_hInstance, 0); + SetWindowSubclass(hwndParent, MyWndProc, 0, 0); //when button is clicked, parent receives WM_COMMAND, and thus subclassed to show a test message box + */ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::GetSite( + IN REFIID riid, + OUT VOID **ppvSite) + { + //MessageBox(0, L"GetSite called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + //TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + + /* HRESULT hr; + if (m_Site != NULL) + { + hr = m_Site->QueryInterface(riid, ppvSite); + if (FAILED(hr)) return hr; + }*/ + + return E_NOTIMPL; + } + +/*****************************************************************************/ +//IDeskBand + HRESULT STDMETHODCALLTYPE CISFBand::GetWindow(OUT HWND *phwnd) + { + //MessageBox(0, L"GetWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + /*if (!m_hWnd) + return E_FAIL; + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd;*/ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::ContextSensitiveHelp( + IN BOOL fEnterMode) + { + /* FIXME: Implement */ + + //MessageBox(0, L"ContextSensitiveHelp called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::ShowDW( + IN BOOL bShow) + { + //MessageBox(0, L"ShowDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + /*if (m_hWnd) + { + ShowWindow(m_hWnd, bShow ? SW_SHOW : SW_HIDE); + }*/ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::CloseDW( + IN DWORD dwReserved) + { + //MessageBox(0, L"CloseDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + /*if (m_hWnd) + { + ShowWindow(m_hWnd, SW_HIDE); + DestroyWindow(m_hWnd); + m_hWnd = NULL; + }*/ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::ResizeBorderDW( + LPCRECT prcBorder, + IUnknown *punkToolbarSite, + BOOL fReserved) + { + /* No need to implement this method */ + + //MessageBox(0, L"ResizeBorderDW called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::GetBandInfo( //Need a check + IN DWORD dwBandID, + IN DWORD dwViewMode, + IN OUT DESKBANDINFO *pdbi) + { + //MessageBox(0, L"GetBandInfo called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + //TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); + + return E_NOTIMPL; + } + + /*****************************************************************************/ + //IDeskBar + HRESULT STDMETHODCALLTYPE CISFBand::SetClient( + IN IUnknown *punkClient) + { + //TRACE("IDeskBar::SetClient(0x%p)\n", punkClient); + + //MessageBox(0, L"SetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::GetClient( + OUT IUnknown **ppunkClient) + { + //TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient); + + //MessageBox(0, L"GetClient called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::OnPosRectChangeDB( + IN RECT *prc) + { + //TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom); + + //MessageBox(0, L"OnPosRectChangeDB called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + +/*****************************************************************************/ +//IPersistStream + HRESULT STDMETHODCALLTYPE CISFBand::GetClassID( + OUT CLSID *pClassID) + { + //MessageBox(0, L"GetClassID called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + //TRACE("CISFBand::GetClassID(0x%p)\n", pClassID); + /* We're going to return the (internal!) CLSID of the quick launch band */ + /* *pClassID = CLSID_QuickLaunchBand; */ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::IsDirty() + { + /* The object hasn't changed since the last save! */ + + //MessageBox(0, L"IsDirty called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::Load( + IN IStream *pStm) + { + //TRACE("CISFBand::Load called\n"); + /* Nothing to do */ + + //MessageBox(0, L"Load called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::Save( + IN IStream *pStm, + IN BOOL fClearDirty) + { + /* Nothing to do */ + + //MessageBox(0, L"Save called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::GetSizeMax( + OUT ULARGE_INTEGER *pcbSize) + { + //TRACE("CISFBand::GetSizeMax called\n"); + //pcbSize->QuadPart = 0; + + //MessageBox(0, L"GetSizeMax called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + + +/*****************************************************************************/ +//IWinEventHandler + HRESULT STDMETHODCALLTYPE CISFBand::ProcessMessage( + IN HWND hWnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam, + OUT LRESULT *plrResult) + { + //TRACE("CISFBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + + //MessageBox(0, L"ProcessMessage called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::ContainsWindow( + IN HWND hWnd) + { + //MessageBox(0, L"ContainsWindow called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + /*if (hWnd == m_hWnd || + IsChild(m_hWnd, hWnd)) + { + TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); + return S_OK; + }*/ + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) + { + //MessageBox(0, L"OnWinEvent called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + //UNIMPLEMENTED; + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::IsWindowOwner(HWND hWnd) + { + //MessageBox(0, L"IsWindowOwner called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + //return (hWnd == m_hWnd) ? S_OK : S_FALSE; + + return E_NOTIMPL; + } + +/*****************************************************************************/ +// *** IOleCommandTarget methods *** + HRESULT STDMETHODCALLTYPE CISFBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) + { + //MessageBox(0, L"QueryStatus called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + //UNIMPLEMENTED; + + return E_NOTIMPL; + } + + HRESULT STDMETHODCALLTYPE CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) + { + /*if (IsEqualIID(*pguidCmdGroup, IID_IBandSite)) + { + return S_OK; + } + + if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) + { + return S_OK; + }*/ + + //MessageBox(0, L"Exec called!", L"Test Caption", MB_OK | MB_ICONINFORMATION); + + return E_NOTIMPL; + } + Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h (added) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -0,0 +1,167 @@ +/* + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/qcklnch/CISFBand.h + * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension) + * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> + */ +#pragma once + +//COM class for cisfband +class CISFBand : + public CComCoClass<CISFBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IObjectWithSite, + public IDeskBand, + public IDeskBar, + public IPersistStream, + public IWinEventHandler, + public IOleCommandTarget +{ + CComPtr<IUnknown> m_Site; + CComPtr<IUnknown> m_punkISFB; + + HINSTANCE m_hInstance; + HWND m_hWnd; + HWND m_hWndStartButton; + DWORD m_BandID; + +public: + + CISFBand(); + virtual ~CISFBand(); + +//IObjectWithSite + + virtual HRESULT STDMETHODCALLTYPE GetSite( + /*[in]*/ REFIID riid, + /*[out]*/ void **ppvSite + ); + + virtual HRESULT STDMETHODCALLTYPE SetSite( + /*[in]*/ IUnknown *pUnkSite + ); + +//IDeskBand + + virtual HRESULT STDMETHODCALLTYPE GetWindow( + OUT HWND *phwnd + ); + + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp( + IN BOOL fEnterMode + ); + + virtual HRESULT STDMETHODCALLTYPE ShowDW( + IN BOOL bShow + ); + + virtual HRESULT STDMETHODCALLTYPE CloseDW( + IN DWORD dwReserved + ); + + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW( + LPCRECT prcBorder, + IUnknown *punkToolbarSite, + BOOL fReserved + ); + + virtual HRESULT STDMETHODCALLTYPE GetBandInfo( + IN DWORD dwBandID, + IN DWORD dwViewMode, + IN OUT DESKBANDINFO *pdbi + ); + +//IDeskBar + + virtual HRESULT STDMETHODCALLTYPE GetClient( + /*[out]*/ IUnknown **ppunkClient + ); + + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB( + /*[in]*/ LPRECT prc + ); + + virtual HRESULT STDMETHODCALLTYPE SetClient( + /*[in, optional]*/ IUnknown *punkClient + ); + +//IPersistStream + + virtual HRESULT STDMETHODCALLTYPE GetClassID( + /*[out]*/ OUT CLSID *pClassID + ); + + virtual HRESULT STDMETHODCALLTYPE GetSizeMax( + /*[out]*/ ULARGE_INTEGER *pcbSize + ); + + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + + virtual HRESULT STDMETHODCALLTYPE Load( + /*[in]*/ IStream *pStm + ); + + virtual HRESULT STDMETHODCALLTYPE Save( + /*[in]*/ IStream *pStm, + /*[in]*/ BOOL fClearDirty + ); + +//IWinEventHandler + + virtual HRESULT STDMETHODCALLTYPE ProcessMessage( + IN HWND hWnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam, + OUT LRESULT *plrResult + ); + + virtual HRESULT STDMETHODCALLTYPE ContainsWindow( + IN HWND hWnd + ); + + virtual HRESULT STDMETHODCALLTYPE OnWinEvent( + HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *theResult + ); + + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner( + HWND hWnd + ); + +//IOleCommandTarget + + virtual HRESULT STDMETHODCALLTYPE Exec( + /*[in]*/ const GUID *pguidCmdGroup, + /*[in]*/ DWORD nCmdID, + /*[in]*/ DWORD nCmdexecopt, + /*[in]*/ VARIANT *pvaIn, + /*[in, out]*/ VARIANT *pvaOut + ); + + virtual HRESULT STDMETHODCALLTYPE QueryStatus( + /*[in]*/ const GUID *pguidCmdGroup, + /*[in]*/ ULONG cCmds, + /*[in, out]*/ OLECMD prgCmds[], + /*[in, out]*/ OLECMDTEXT *pCmdText + ); + +//***************************************************************************************************** + + DECLARE_NOT_AGGREGATABLE(CISFBand) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CISFBand) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + END_COM_MAP() +}; Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -16,8 +16,9 @@ add_library(qcklnch SHARED qcklnch.cpp - qcklnch.rc - CQuickLaunchBand.cpp + qcklnch.rc + CQuickLaunchBand.cpp + CISFBand.cpp ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def) set_module_type(qcklnch win32dll UNICODE) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -38,30 +38,11 @@ return hr; } -//Subclassing Button - - LRESULT CALLBACK MyWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) - { - switch (uMsg) - { - case WM_COMMAND: - { - MessageBox(0, L"Button Clicked!!", L"Testing", MB_OK | MB_ICONINFORMATION); - } - } - return DefSubclassProc(hWnd, uMsg, wParam, lParam); - } - //CQuickLaunchBand - CQuickLaunchBand::CQuickLaunchBand() : - m_hWnd(NULL), - m_BandID(0) - { - - } - - CQuickLaunchBand::~CQuickLaunchBand() { } + CQuickLaunchBand::CQuickLaunchBand() : m_hWnd(NULL), m_BandID(0) {} + + CQuickLaunchBand::~CQuickLaunchBand() {} /*****************************************************************************/ //ATL Construct @@ -89,12 +70,12 @@ //LPITEMIDLIST pidl; //hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl); - if (SUCCEEDED(hr)) - { + //if (SUCCEEDED(hr)) + //{ //MessageBox(0, L"pidl success!", L"Testing", MB_OK | MB_ICONINFORMATION); pISFB->InitializeSFB(pISF, 0); - } + //} } } } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -30,9 +30,7 @@ HINSTANCE m_hInstance; HWND m_hWnd; HWND m_hWndStartButton; - DWORD m_BandID; - - + DWORD m_BandID; public: Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h [iso-8859-1] Sat Jun 17 15:28:17 2017 @@ -35,8 +35,7 @@ #include <wine/debug.h> #include <wine/unicode.h> -//#include "resource.h" - #undef DbgPrint -#include "CQuickLaunchBand.h" +#include "CQuickLaunchBand.h" +#include "CISFBand.h"

1 0

[pschweitzer] 75073: [GFLAGS] Add a quick'n'dirty implementation of gflags utility. It only covers some page heap usage (enough to enable/disable DPH :-)). It's syntax compatible with MS one, and w...
by pschweitzer＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: pschweitzer Date: Sat Jun 17 12:34:08 2017 New Revision: 75073 URL: http://svn.reactos.org/svn/reactos?rev=75073&view=rev Log: [GFLAGS] Add a quick'n'dirty implementation of gflags utility. It only covers some page heap usage (enough to enable/disable DPH :-)). It's syntax compatible with MS one, and with what's written down in ROS wiki. See: https://www.reactos.org/wiki/Debugging#Debug_Page_Heap_.28DPH.29 Added: trunk/rosapps/applications/cmdutils/gflags/ trunk/rosapps/applications/cmdutils/gflags/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/gflags/gflags.c (with props) trunk/rosapps/applications/cmdutils/gflags/gflags.rc (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Jun 17 12:34:08 2017 @@ -1,6 +1,7 @@ add_subdirectory(appwiz) add_subdirectory(arping) add_subdirectory(cat) +add_subdirectory(gflags) add_subdirectory(ntfsinfo) add_subdirectory(tee) add_subdirectory(touch) Added: trunk/rosapps/applications/cmdutils/gflags/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/gfla… ============================================================================== --- trunk/rosapps/applications/cmdutils/gflags/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/gflags/CMakeLists.txt [iso-8859-1] Sat Jun 17 12:34:08 2017 @@ -0,0 +1,10 @@ + +add_executable(gflags gflags.c gflags.rc) +set_module_type(gflags win32cui UNICODE) +add_importlibs(gflags advapi32 user32 msvcrt kernel32) + +if(MSVC) + add_importlibs(gflags ntdll) +endif() + +add_cd_file(TARGET gflags DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/cmdutils/gflags/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/gflags/gflags.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/gfla… ============================================================================== --- trunk/rosapps/applications/cmdutils/gflags/gflags.c (added) +++ trunk/rosapps/applications/cmdutils/gflags/gflags.c [iso-8859-1] Sat Jun 17 12:34:08 2017 @@ -0,0 +1,421 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ping utility + * FILE: applications/cmdutils/gflags/gflags.c + * PURPOSE: Global Flags utility + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <stdio.h> +#include <stdlib.h> + +static BOOL Set = FALSE; +static BOOL Unset = FALSE; +static BOOL Full = FALSE; +static PWSTR Image = NULL; +static WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; + +static DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) +{ + DWORD Len, Flags, Type; + + Len = MaxLen; + Flags = 0; + if (RegQueryValueEx(SubKey, Value, NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) + { + Flags = wcstoul(Buffer, NULL, 16); + } + + return Flags; +} + +static VOID ModifyStatus(VOID) +{ + LONG Ret; + DWORD MaxLen, GlobalFlags; + PVOID Buffer; + HKEY HandleKey, HandleSubKey; + + Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegOpenKeyEx failed (%d)\n", Ret); + return; + } + + Ret = RegCreateKeyEx(HandleKey, Image, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegCreateKeyEx failed (%d)\n", Ret); + return; + } + + Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegQueryInfoKey failed (%d)\n", Ret); + RegCloseKey(HandleSubKey); + RegCloseKey(HandleKey); + return; + } + + MaxLen = max(MaxLen, 11 * sizeof(WCHAR)); + Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); + if (Buffer == NULL) + { + wprintf(L"MS: HeapAlloc failed\n"); + RegCloseKey(HandleSubKey); + RegCloseKey(HandleKey); + return; + } + + GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); + if (Set) + { + GlobalFlags |= 0x02000000; + } + else + { + GlobalFlags &= ~0x02000000; + } + + if (GlobalFlags != 0) + { + wsprintf(Buffer, L"0x%08x", GlobalFlags); + Ret = RegSetValueEx(HandleSubKey, L"GlobalFlag", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); + } + } + else + { + Ret = RegDeleteValue(HandleSubKey, L"GlobalFlag"); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); + } + } + + if (Unset) + { + Ret = RegDeleteValue(HandleSubKey, L"PageHeapFlags"); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); + } + } + else + { + DWORD PageHeapFlags; + + PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + PageHeapFlags &= ~3; + + if (Full) + { + PageHeapFlags |= 1; + } + PageHeapFlags |= 2; + + wsprintf(Buffer, L"0x%x", PageHeapFlags); + Ret = RegSetValueEx(HandleSubKey, L"PageHeapFlags", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); + } + } + + if (Set) + { + DWORD Type, VerifierFlags, Len; + + VerifierFlags = 0; + Len = MaxLen; + if (RegQueryValueEx(HandleSubKey, L"VerifierFlags", NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && + Type == REG_DWORD && Len == sizeof(DWORD)) + { + VerifierFlags = ((DWORD *)Buffer)[0]; + VerifierFlags &= ~0x8001; + } + + if (Full) + { + VerifierFlags |= 1; + } + else + { + VerifierFlags |= 0x8000; + } + + Ret = RegSetValueEx(HandleSubKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); + } + } + + wprintf(L"path: %s\n", ImageExecOptionsString); + wprintf(L"\t%s: page heap %s\n", Image, (Set ? L"enabled" : L"disabled")); + + HeapFree(GetProcessHeap(), 0, Buffer); + RegCloseKey(HandleSubKey); + RegCloseKey(HandleKey); +} + +static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) +{ + LONG Ret; + BOOL Handled; + DWORD MaxLen, GlobalFlags; + HKEY HandleSubKey; + PVOID Buffer; + + Ret = RegOpenKeyEx(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"DII: RegOpenKeyEx failed (%d)\n", Ret); + return FALSE; + } + + Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"DII: RegQueryInfoKey failed (%d)\n", Ret); + RegCloseKey(HandleSubKey); + return FALSE; + } + + Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); + if (Buffer == NULL) + { + wprintf(L"DII: HeapAlloc failed\n"); + RegCloseKey(HandleSubKey); + return FALSE; + } + + Handled = FALSE; + GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); + if (GlobalFlags & 0x02000000) + { + DWORD PageHeapFlags; + + if (Image == NULL) + { + if (!*Header) + { + wprintf(L"path: %s\n", ImageExecOptionsString); + *Header = TRUE; + } + wprintf(L"\t%s: page heap enabled with flags (", SubKey); + } + else + { + wprintf(L"Page heap is enabled for %s with flags (", SubKey); + } + + PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + if (PageHeapFlags & 0x1) + { + wprintf(L"full "); + } + + if (PageHeapFlags & 0x2) + { + wprintf(L"traces"); + } + + wprintf(L")\n"); + + Handled = TRUE; + } + + HeapFree(GetProcessHeap(), 0, Buffer); + RegCloseKey(HandleSubKey); + + return Handled; +} + +static VOID DisplayStatus(VOID) +{ + LONG Ret; + HKEY HandleKey; + DWORD Index, MaxLen, Handled; + TCHAR * SubKey; + BOOL Header; + + Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_READ, &HandleKey); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"DS: RegOpenKeyEx failed (%d)\n", Ret); + return; + } + + Ret = RegQueryInfoKey(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"DS: RegQueryInfoKey failed (%d)\n", Ret); + RegCloseKey(HandleKey); + return; + } + + ++MaxLen; // NULL-char + SubKey = HeapAlloc(GetProcessHeap(), 0, MaxLen * sizeof(TCHAR)); + if (SubKey == NULL) + { + wprintf(L"DS: HeapAlloc failed\n"); + RegCloseKey(HandleKey); + return; + } + + Index = 0; + Handled = 0; + Header = FALSE; + do + { + Ret = RegEnumKey(HandleKey, Index, SubKey, MaxLen); + if (Ret != ERROR_NO_MORE_ITEMS) + { + if (Image == NULL || wcscmp(SubKey, Image) == 0) + { + if (DisplayImageInfo(HandleKey, SubKey, &Header)) + { + ++Handled; + } + } + + ++Index; + } + } while (Ret != ERROR_NO_MORE_ITEMS); + + if (Handled == 0) + { + if (Image == NULL) + { + wprintf(L"No application has page heap enabled.\n"); + } + else + { + wprintf(L"Page heap is not enabled for %s\n", Image); + } + } + + HeapFree(GetProcessHeap(), 0, SubKey); + RegCloseKey(HandleKey); +} + +static VOID Usage(VOID) +{ + // FIXME + wprintf(L"Usage\n"); +} + +static BOOL ParseCmdline(int argc, LPWSTR argv[]) +{ + INT i; + BOOL UsePageHeap = FALSE; + + if (argc < 2) + { + wprintf(L"Not enough args!\n", argc); + Usage(); + return FALSE; + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == L'/') + { + if (argv[i][1] == L'p' && argv[i][2] == UNICODE_NULL) + { + UsePageHeap = TRUE; + } + else if (argv[i][1] == L'p' && argv[i][2] != UNICODE_NULL) + { + wprintf(L"Invalid option: %s\n", argv[i]); + Usage(); + return FALSE; + } + else + { + if (wcscmp(argv[i], L"/enable") == 0) + { + Set = TRUE; + } + else if (wcscmp(argv[i], L"/disable") == 0) + { + Unset = TRUE; + } + else if (wcscmp(argv[i], L"/full") == 0) + { + Full = TRUE; + } + } + } + else if (Image == NULL) + { + Image = argv[i]; + } + else + { + wprintf(L"Invalid option: %s\n", argv[i]); + Usage(); + return FALSE; + } + } + + if (!UsePageHeap) + { + wprintf(L"Only page heap flags are supported\n"); + Usage(); + return FALSE; + } + + if (Set && Unset) + { + wprintf(L"ENABLE and DISABLED cannot be set together\n"); + Usage(); + return FALSE; + } + + if (Image == NULL && (Set || Unset || Full)) + { + wprintf(L"Can't ENABLE or DISABLE with no image\n"); + Usage(); + return FALSE; + } + + if (!Set && !Unset && Full) + { + wprintf(L"Cannot deal with full traces with no other indication\n"); + Usage(); + return FALSE; + } + + return TRUE; +} + +int wmain(int argc, LPWSTR argv[]) +{ + if (!ParseCmdline(argc, argv)) + { + return 1; + } + + if (!Set && !Unset) + { + DisplayStatus(); + } + else + { + ModifyStatus(); + } + + return 0; +} Propchange: trunk/rosapps/applications/cmdutils/gflags/gflags.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/gflags/gflags.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/gfla… ============================================================================== --- trunk/rosapps/applications/cmdutils/gflags/gflags.rc (added) +++ trunk/rosapps/applications/cmdutils/gflags/gflags.rc [iso-8859-1] Sat Jun 17 12:34:08 2017 @@ -0,0 +1,6 @@ +#include <windef.h> + +#define REACTOS_STR_FILE_DESCRIPTION "Global Flags utility" +#define REACTOS_STR_INTERNAL_NAME "gflags" +#define REACTOS_STR_ORIGINAL_FILENAME "gflags.exe" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/gflags/gflags.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 75072: [SHELL32] -CMenuBand: forward WM_WININICHANGE to CMenuToolbarBase so that when themes get enabled, the menu bar in explorer becomes flat immediately.
by gadamopoulos＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: gadamopoulos Date: Sat Jun 17 07:43:52 2017 New Revision: 75072 URL: http://svn.reactos.org/svn/reactos?rev=75072&view=rev Log: [SHELL32] -CMenuBand: forward WM_WININICHANGE to CMenuToolbarBase so that when themes get enabled, the menu bar in explorer becomes flat immediately. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Sat Jun 17 07:43:52 2017 @@ -720,6 +720,13 @@ BOOL bFlatMenus; SystemParametersInfo(SPI_GETFLATMENU, 0, &bFlatMenus, 0); AdjustForTheme(bFlatMenus); + + if (m_staticToolbar) + m_staticToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + + if (m_SFToolbar) + m_SFToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] Sat Jun 17 07:43:52 2017 @@ -113,6 +113,11 @@ return S_OK; } return S_FALSE; + case WM_WININICHANGE: + if (wParam == SPI_SETFLATMENU) + { + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + } } return S_FALSE;

1 0

[gadamopoulos] 75071: [BROWSEUI] - CShellBrowser: Propagate WM_WININICHANGE to all immediate children. - CInternetToolbar: Forward WM_WININICHANGE to the menu band to make aware that the flat menus...
by gadamopoulos＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: gadamopoulos Date: Sat Jun 17 07:28:35 2017 New Revision: 75071 URL: http://svn.reactos.org/svn/reactos?rev=75071&view=rev Log: [BROWSEUI] - CShellBrowser: Propagate WM_WININICHANGE to all immediate children. - CInternetToolbar: Forward WM_WININICHANGE to the menu band to make aware that the flat menus option changed. Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -1850,3 +1850,24 @@ return 0; } +LRESULT CInternetToolbar::OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HRESULT hr; + HWND hwndMenu; + + hr = IUnknown_GetWindow(fMenuBar, &hwndMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + CComPtr<IWinEventHandler> menuWinEventHandler; + hr = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + LRESULT lres; + hr = menuWinEventHandler->OnWinEvent(hwndMenu, uMsg, wParam, lParam, &lres); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + + return lres; +} Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -195,6 +195,7 @@ LRESULT OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnLUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BEGIN_MSG_MAP(CInternetToolbar) COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnTravelBack) @@ -215,6 +216,7 @@ MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnLUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) + MESSAGE_HANDLER(WM_WININICHANGE, OnWinIniChange) END_MSG_MAP() DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jun 17 07:28:35 2017 @@ -593,6 +593,7 @@ LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT PropagateMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnFolderOptions(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnMapNetworkDrive(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); @@ -638,6 +639,7 @@ MESSAGE_HANDLER(WM_MEASUREITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) + MESSAGE_HANDLER(WM_WININICHANGE, PropagateMessage) COMMAND_ID_HANDLER(IDM_FILE_CLOSE, OnClose) COMMAND_ID_HANDLER(IDM_TOOLS_FOLDEROPTIONS, OnFolderOptions) COMMAND_ID_HANDLER(IDM_TOOLS_MAPNETWORKDRIVE, OnMapNetworkDrive) @@ -3508,6 +3510,12 @@ return 0; } +LRESULT CShellBrowser::PropagateMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + SHPropagateMessage(m_hWnd, uMsg, wParam, lParam, TRUE); + return 0; +} + LRESULT CShellBrowser::OnClose(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { return SendMessage(WM_CLOSE);

1 0

[hbelusca] 75070: [NTOS]: Employ the simple CMP_ASSERT_KCB_LOCK() macro to perform these asserts.
by hbelusca＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: hbelusca Date: Sat Jun 17 01:22:17 2017 New Revision: 75070 URL: http://svn.reactos.org/svn/reactos?rev=75070&view=rev Log: [NTOS]: Employ the simple CMP_ASSERT_KCB_LOCK() macro to perform these asserts. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sat Jun 17 01:22:17 2017 @@ -305,9 +305,8 @@ NTAPI CmpRemoveKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { - /* Make sure that the registry and KCB are utterly locked */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Remove the key hash */ CmpRemoveKeyHash(&Kcb->KeyHash); @@ -434,9 +433,8 @@ PULONG_PTR CachedList; ULONG i; - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if the value list is cached */ if (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) @@ -482,8 +480,7 @@ PAGED_CODE(); /* Sanity checks */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(Kcb); ASSERT(Kcb->RefCount == 0); /* Cleanup the value cache */ @@ -521,9 +518,8 @@ { PCM_KEY_NODE KeyNode; - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if there's any cached subkey */ if (Kcb->ExtFlags & (CM_KCB_NO_SUBKEY | CM_KCB_SUBKEY_ONE | CM_KCB_SUBKEY_HINT)) @@ -619,9 +615,8 @@ /* Check if this is the last reference */ if ((InterlockedDecrement((PLONG)&Kcb->RefCount) & 0xFFFF) == 0) { - /* Sanity check */ - ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + /* Make sure we have the exclusive lock */ + CMP_ASSERT_KCB_LOCK(Kcb); /* Check if we should do a direct delete */ if (((CmpHoldLazyFlush) && @@ -1086,10 +1081,9 @@ } /* Make sure we have the exclusive lock */ - ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); - - /* do the insert */ + CMP_ASSERT_KCB_LOCK(KeyBody->KeyControlBlock); + + /* Do the insert */ InsertTailList(&KeyBody->KeyControlBlock->KeyBodyListHead, &KeyBody->KeyBodyList); @@ -1132,8 +1126,7 @@ /* Lock the KCB */ if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); - ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || - (CmpTestRegistryLockExclusive() == TRUE)); + CMP_ASSERT_KCB_LOCK(KeyBody->KeyControlBlock); /* Remove the entry */ RemoveEntryList(&KeyBody->KeyBodyList);

1 0

[hbelusca] 75069: [NTOS]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 17 Jun '17

17 Jun '17

Author: hbelusca Date: Sat Jun 17 01:21:21 2017 New Revision: 75069 URL: http://svn.reactos.org/svn/reactos?rev=75069&view=rev Log: [NTOS]: Whitespace fixes only. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sat Jun 17 01:21:21 2017 @@ -26,10 +26,10 @@ CmpInitializeCache(VOID) { ULONG Length, i; - + /* Calculate length for the table */ Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); - + /* Allocate it */ CmpCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpCacheTable) @@ -37,20 +37,20 @@ /* Take the system down */ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); } - + /* Zero out the table */ RtlZeroMemory(CmpCacheTable, Length); - + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { /* Setup the pushlock */ ExInitializePushLock(&CmpCacheTable[i].Lock); } - + /* Calculate length for the name cache */ Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); - + /* Now allocate the name cache table */ CmpNameCacheTable = CmpAllocate(Length, TRUE, TAG_CM); if (!CmpNameCacheTable) @@ -58,7 +58,7 @@ /* Take the system down */ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); } - + /* Zero out the table */ RtlZeroMemory(CmpNameCacheTable, Length); @@ -68,7 +68,7 @@ /* Setup the pushlock */ ExInitializePushLock(&CmpNameCacheTable[i].Lock); } - + /* Setup the delayed close table */ CmpInitializeDelayedCloseTable(); } @@ -374,13 +374,13 @@ /* Increase the reference count while we release the lock */ InterlockedIncrement((PLONG)&Kcb->RefCount); - + /* Go from shared to exclusive */ CmpConvertKcbSharedToExclusive(Kcb); /* Decrement the reference count; the lock is now held again */ InterlockedDecrement((PLONG)&Kcb->RefCount); - + /* Check if we still control the index */ if (Kcb->DelayedCloseIndex == 1) { @@ -1052,7 +1052,7 @@ /* Sanity check */ ASSERT(KeyBody->KeyControlBlock != NULL); - + /* Initialize the list entry */ InitializeListHead(&KeyBody->KeyBodyList); @@ -1069,7 +1069,7 @@ return; } } - + /* Array full, check if we need to unlock the KCB */ if (Flags & CMP_ENLIST_KCB_LOCKED_SHARED) { @@ -1129,12 +1129,12 @@ /* Sanity checks */ ASSERT(IsListEmpty(&KeyBody->KeyControlBlock->KeyBodyListHead) == FALSE); ASSERT(IsListEmpty(&KeyBody->KeyBodyList) == FALSE); - + /* Lock the KCB */ if (!LockHeld) CmpAcquireKcbLockExclusive(KeyBody->KeyControlBlock); ASSERT((CmpIsKcbLockedExclusive(KeyBody->KeyControlBlock) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); - + /* Remove the entry */ RemoveEntryList(&KeyBody->KeyBodyList); @@ -1177,14 +1177,14 @@ ASSERT(KeyBody->NotifyBlock == NULL); continue; } - + /* Lock isn't held, so we need to take a reference */ if (ObReferenceObjectSafe(KeyBody)) { /* Now we can flush */ CmpFlushNotify(KeyBody, LockHeld); ASSERT(KeyBody->NotifyBlock == NULL); - + /* Release the reference we took */ ObDereferenceObjectDeferDelete(KeyBody); continue; @@ -1195,7 +1195,7 @@ NextEntry = NextEntry->Flink; } } - + /* List has been parsed, exit */ break; }

1 0

[jimtabor] 75068: [User32] - Based on patch by Nikolay Sivov : Fix static control id. Fixes dialog tests, see CORE-13362.
by jimtabor＠svn.reactos.org 16 Jun '17

16 Jun '17

Author: jimtabor Date: Fri Jun 16 22:49:36 2017 New Revision: 75068 URL: http://svn.reactos.org/svn/reactos?rev=75068&view=rev Log: [User32] - Based on patch by Nikolay Sivov : Fix static control id. Fixes dialog tests, see CORE-13362. Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Fri Jun 16 22:49:36 2017 @@ -40,7 +40,7 @@ /* DEFINES *******************************************************************/ #define MSGBOX_IDICON (1088) -#define MSGBOX_IDTEXT (100) +#define MSGBOX_IDTEXT (0xffff) #define IDI_HANDW MAKEINTRESOURCEW(32513) #define IDI_QUESTIONW MAKEINTRESOURCEW(32514)

1 0

[jimtabor] 75067: [User32] - Skip desktop for positive index. See CORE-13362.
by jimtabor＠svn.reactos.org 16 Jun '17

16 Jun '17

Author: jimtabor Date: Fri Jun 16 22:44:21 2017 New Revision: 75067 URL: http://svn.reactos.org/svn/reactos?rev=75067&view=rev Log: [User32] - Skip desktop for positive index. See CORE-13362. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Fri Jun 16 22:44:21 2017 @@ -1092,7 +1092,7 @@ return 0; } - if (offset >= 0) + if (offset >= 0 && wndPtr->fnid != FNID_DESKTOP) { if (offset > (int)(wndPtr->cbwndExtra - size)) {

1 0

[hbelusca] 75066: [NTOS]: Fix a bit the CmUnloadKey() function: - When a hive is unloaded, we *must* set the HIVE_IS_UNLOADING flag before doing anything else (as other code in Cm depends on this); ...
by hbelusca＠svn.reactos.org 16 Jun '17

16 Jun '17

Author: hbelusca Date: Fri Jun 16 21:06:04 2017 New Revision: 75066 URL: http://svn.reactos.org/svn/reactos?rev=75066&view=rev Log: [NTOS]: Fix a bit the CmUnloadKey() function: - When a hive is unloaded, we *must* set the HIVE_IS_UNLOADING flag before doing anything else (as other code in Cm depends on this); - If we don't force a hive unload, we *must* check whether there are other opened handles to keys inside this hive, and if so, we must fail. If this is a force-unload however, we *must* invalidate/close all the opened handles to keys inside this hive, BUT this is left UNIMPLEMENTED at the moment (and therefore expect the already existing problems linked to this to still happen). - Move the HvFree(Hive); call at the very end, just before deleting the Cm hive, and as is done in CmpDestroyHive(). 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] Fri Jun 16 21:06:04 2017 @@ -2198,6 +2198,27 @@ return STATUS_INVALID_PARAMETER; } + /* Mark this hive as being unloaded */ + Hive->HiveFlags |= HIVE_IS_UNLOADING; + + /* Search for any opened keys in this hive, and take an appropriate action */ + if (Kcb->RefCount > 1) + { + if (Flags != REG_FORCE_UNLOAD) + { + if (CmCountOpenSubKeys(Kcb, FALSE) != 0) + { + /* There are open subkeys but we don't force hive unloading, fail */ + Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + return STATUS_CANNOT_DELETE; + } + } + else + { + DPRINT1("CmUnloadKey: Force unloading is UNIMPLEMENTED, expect dangling KCBs problems!\n"); + } + } + /* Flush the hive */ CmFlushKey(Kcb, TRUE); @@ -2206,9 +2227,8 @@ { DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); - /* Remove the unloading flag */ + /* Remove the unloading flag and return failure */ Hive->HiveFlags &= ~HIVE_IS_UNLOADING; - return STATUS_INSUFFICIENT_RESOURCES; } @@ -2243,15 +2263,15 @@ /* Destroy the view list */ CmpDestroyHiveViewList(CmHive); - /* Free the hive storage */ - HvFree(Hive); - /* Delete the flusher lock */ ExDeleteResourceLite(CmHive->FlusherLock); ExFreePoolWithTag(CmHive->FlusherLock, TAG_CMHIVE); /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CMHIVE); + + /* Free the hive storage */ + HvFree(Hive); /* Free the hive */ CmpFree(CmHive, TAG_CM);

1 0

[hbelusca] 75065: [NTOS]: Reorder the destruction code in CmpDestroyHive() to make it similar to the one in CmUnloadKey(). Same remark for a comment in NtUnloadKey2() too.
by hbelusca＠svn.reactos.org 16 Jun '17

16 Jun '17

Author: hbelusca Date: Fri Jun 16 21:02:27 2017 New Revision: 75065 URL: http://svn.reactos.org/svn/reactos?rev=75065&view=rev Log: [NTOS]: Reorder the destruction code in CmpDestroyHive() to make it similar to the one in CmUnloadKey(). Same remark for a comment in NtUnloadKey2() too. Modified: trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Fri Jun 16 21:02:27 2017 @@ -234,18 +234,18 @@ RemoveEntryList(&CmHive->HiveList); ExReleasePushLock(&CmpHiveListHeadLock); + /* Destroy the security descriptor cache */ + CmpDestroySecurityCache(CmHive); + + /* Destroy the view list */ + CmpDestroyHiveViewList(CmHive); + /* Delete the flusher lock */ ExDeleteResourceLite(CmHive->FlusherLock); ExFreePoolWithTag(CmHive->FlusherLock, TAG_CMHIVE); /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CMHIVE); - - /* Destroy the security descriptor cache */ - CmpDestroySecurityCache(CmHive); - - /* Destroy the view list */ - CmpDestroyHiveViewList(CmHive); /* Free the hive storage */ HvFree(&CmHive->Hive); Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Fri Jun 16 21:02:27 2017 @@ -1521,7 +1521,7 @@ { if (Flags != REG_FORCE_UNLOAD) { - /* Release two KCBs lock */ + /* Release the KCB locks */ CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); /* Release the hive loading lock */

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