Author: hbelusca Date: Mon Jun 13 19:39:35 2016 New Revision: 71632
URL: http://svn.reactos.org/svn/reactos?rev=71632&view=rev Log: [SHELL32]: Fix some whitespace and comments.
Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView.... ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Jun 13 19:39:35 2016 @@ -91,17 +91,17 @@ PCUITEMID_CHILD *m_apidl; PIDLIST_ABSOLUTE m_pidlParent; LISTVIEW_SORT_INFO m_sortInfo; - ULONG m_hNotify; /* change notification handle */ + ULONG m_hNotify; /* Change notification handle */ HACCEL m_hAccel; DWORD m_dwAspects; DWORD m_dwAdvf; CComPtr<IAdviseSink> m_pAdvSink; // for drag and drop - CComPtr<IDropTarget> m_pCurDropTarget; /* The sub-item, which is currently dragged over */ - CComPtr<IDataObject> m_pCurDataObject; /* The dragged data-object */ - LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ - UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ - POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ + CComPtr<IDropTarget> m_pCurDropTarget; /* The sub-item, which is currently dragged over */ + CComPtr<IDataObject> m_pCurDataObject; /* The dragged data-object */ + LONG m_iDragOverItem; /* Dragged over item's index, iff m_pCurDropTarget != NULL */ + UINT m_cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT m_ptLastMousePos; /* Mouse position at last DragOver call */ // CComPtr<IContextMenu> m_pCM;
@@ -245,7 +245,7 @@ // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject);
- // message handlers + // Message handlers LRESULT OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); @@ -287,10 +287,10 @@
static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CDefView *pThis; - LRESULT result; - - // must hold a reference during message handling + CDefView *pThis; + LRESULT result; + + // Must hold a reference during message handling pThis = reinterpret_cast<CDefView *>(hWnd); pThis->AddRef(); result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam); @@ -345,9 +345,9 @@ #define ID_LISTVIEW 1
/*windowsx.h */ -#define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp) -#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp) -#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp) +#define GET_WM_COMMAND_ID(wp, lp) LOWORD(wp) +#define GET_WM_COMMAND_HWND(wp, lp) (HWND)(lp) +#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp)
typedef void (CALLBACK *PFNSHGETSETTINGSPROC)(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
@@ -509,7 +509,8 @@ * - creates the list view window */ BOOL CDefView::CreateList() -{ DWORD dwStyle, dwExStyle; +{ + DWORD dwStyle, dwExStyle;
TRACE("%p\n", this);
@@ -618,8 +619,8 @@ */ BOOL CDefView::InitList() { - SHELLDETAILS sd; - WCHAR szTemp[50]; + SHELLDETAILS sd; + WCHAR szTemp[50]; HIMAGELIST big_icons, small_icons;
TRACE("%p\n", this); @@ -715,7 +716,7 @@ */ BOOLEAN CDefView::LV_AddItem(PCUITEMID_CHILD pidl) { - LVITEMW lvItem; + LVITEMW lvItem;
TRACE("(%p)(pidl=%p)\n", this, pidl);
@@ -792,7 +793,7 @@
nItem = LV_FindItemByPidl(pidl);
- if ( -1 != nItem ) + if (-1 != nItem) { lvItem.mask = LVIF_IMAGE; lvItem.iItem = nItem; @@ -813,7 +814,7 @@ * - sorts the list * - fills the list into the view */ -INT CALLBACK CDefView::fill_list( LPVOID ptr, LPVOID arg ) +INT CALLBACK CDefView::fill_list(LPVOID ptr, LPVOID arg) { PITEMID_CHILD pidl = static_cast<PITEMID_CHILD>(ptr); CDefView *pThis = static_cast<CDefView *>(arg); @@ -975,15 +976,15 @@ */ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - CComPtr<IDropTarget> pdt; - SHChangeNotifyEntry ntreg; - CComPtr<IPersistFolder2> ppf2; + CComPtr<IDropTarget> pdt; + SHChangeNotifyEntry ntreg; + CComPtr<IPersistFolder2> ppf2;
TRACE("%p\n", this);
- if(CreateList()) - { - if(InitList()) + if (CreateList()) + { + if (InitList()) { FillList(); } @@ -1029,7 +1030,7 @@
HMENU hmenu = CreatePopupMenu();
- //FIXME: get proper numbers ? + // FIXME: get proper numbers ? const UINT first = 0x7800; const UINT last = 0x7A00; hr = cm->QueryContextMenu(hmenu, 0, first, last, 0); @@ -1237,11 +1238,10 @@ */ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - WORD x; - WORD y; - UINT uCommand; - HMENU hMenu; - HRESULT hResult; + WORD x, y; + UINT uCommand; + HMENU hMenu; + HRESULT hResult;
// for some reason I haven't figured out, we sometimes recurse into this method if (m_pCM != NULL) @@ -1375,7 +1375,7 @@ } else { - if(m_hMenu) + if (m_hMenu) { if (!m_menusLoaded) { @@ -2069,24 +2069,22 @@
HRESULT WINAPI CDefView::UIActivate(UINT uState) { - /* - CHAR szName[MAX_PATH]; - */ - LRESULT lResult; - int nPartArray[1] = { -1}; + // CHAR szName[MAX_PATH]; + LRESULT lResult; + int nPartArray[1] = { -1};
TRACE("(%p)->(state=%x) stub\n", this, uState);
- /*don't do anything if the state isn't really changing*/ + /* don't do anything if the state isn't really changing */ if (m_uState == uState) { return S_OK; }
- /*OnActivate handles the menu merging and internal state*/ + /* OnActivate handles the menu merging and internal state */ DoActivate(uState);
- /*only do This if we are active*/ + /* only do This if we are active */ if (uState != SVUIA_DEACTIVATE) {
@@ -2118,7 +2116,7 @@
HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd) { - OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } }; + OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } };
*phWnd = 0;
@@ -2133,14 +2131,14 @@ if (psb == NULL || m_hWnd) return E_UNEXPECTED;
- /*set up the member variables*/ + /* Set up the member variables */ m_pShellBrowser = psb; m_FolderSettings = *lpfs;
- /*get our parent window*/ + /* Get our parent window */ m_pShellBrowser->GetWindow(&m_hWndParent);
- /* try to get the ICommDlgBrowserInterface, adds a reference !!! */ + /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ m_pCommDlgBrowser = NULL; if (SUCCEEDED(m_pShellBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &m_pCommDlgBrowser)))) { @@ -2177,7 +2175,7 @@ { TRACE("(%p)\n", this);
- /*Make absolutely sure all our UI is cleaned up.*/ + /* Make absolutely sure all our UI is cleaned up */ UIActivate(SVUIA_DEACTIVATE);
if (m_hAccel) @@ -3048,8 +3046,7 @@
HRESULT CDefView::_MergeToolbar() { - CComPtr<IExplorerToolbar> ptb; // [sp+8h] [bp-4h]@1 - + CComPtr<IExplorerToolbar> ptb; HRESULT hr = S_OK;
hr = IUnknown_QueryService(m_pShellBrowser, IID_IExplorerToolbar, IID_PPV_ARG(IExplorerToolbar, &ptb));
Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldesk... ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Mon Jun 13 19:39:35 2016 @@ -131,9 +131,9 @@
HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx) { - CComPtr<IShellFolder> psfDesktopFolder; - CSFV csfv; - HRESULT hRet; + CComPtr<IShellFolder> psfDesktopFolder; + CSFV csfv; + HRESULT hRet;
hWnd = hWndx; ShellDesk = ShellDeskx; @@ -160,9 +160,9 @@
static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) { - CComPtr<IShellDesktopTray> ShellDesk; - CComObject<CDesktopBrowser> *pThis; - HRESULT hRet; + CComPtr<IShellDesktopTray> ShellDesk; + CComObject<CDesktopBrowser> *pThis; + HRESULT hRet;
ShellDesk = (IShellDesktopTray *)lpCreateStruct->lpCreateParams; if (ShellDesk == NULL) @@ -316,7 +316,7 @@
HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) { - HWND hWnd; + HWND hWnd;
if (pret == NULL) return E_POINTER; @@ -396,13 +396,13 @@
LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) { - HWND hwndTray; - HRESULT hres; - - hres = this->ShellDesk->GetTrayWindow(&hwndTray); - - if (SUCCEEDED(hres)) - PostMessageW(hwndTray, uMsg, wParam, lParam); + HWND hWndTray; + HRESULT hRet; + + hRet = ShellDesk->GetTrayWindow(&hWndTray); + + if (SUCCEEDED(hRet)) + PostMessageW(hWndTray, uMsg, wParam, lParam);
return 0; } @@ -550,6 +550,7 @@ case WM_SETFOCUS: SetFocus(pThis->hWndShellView); break; + default: DefMsgHandler: Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);
-
hbelusca＠svn.reactos.org