Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 10:22:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]: Fix some whitespace and comments.

Browse source 
svn path=/trunk/; revision=71632
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-13 19:39:35 +00:00
parent 20324ae269
commit fc0c674649
2 changed files with 56 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

27
reactos/dll/win32/shell32/CDefView.cpp
View file

@ -91,7 +91,7 @@ class CDefView :
PCUITEMID_CHILD *m_apidl; PCUITEMID_CHILD *m_apidl;
PIDLIST_ABSOLUTE m_pidlParent; PIDLIST_ABSOLUTE m_pidlParent;
LISTVIEW_SORT_INFO m_sortInfo; LISTVIEW_SORT_INFO m_sortInfo;
ULONG m_hNotify; /* change notification handle */ ULONG m_hNotify; /* Change notification handle */
HACCEL m_hAccel; HACCEL m_hAccel;
DWORD m_dwAspects; DWORD m_dwAspects;
DWORD m_dwAdvf; DWORD m_dwAdvf;
@ -245,7 +245,7 @@ class CDefView :
// *** IServiceProvider methods *** // *** IServiceProvider methods ***
virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); 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 OnShowWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
LRESULT OnGetDlgCode(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); LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
@ -290,7 +290,7 @@ class CDefView :
CDefView *pThis; CDefView *pThis;
LRESULT result; LRESULT result;
// must hold a reference during message handling // Must hold a reference during message handling
pThis = reinterpret_cast<CDefView *>(hWnd); pThis = reinterpret_cast<CDefView *>(hWnd);
pThis->AddRef(); pThis->AddRef();
result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam); result = CWindowImpl<CDefView, CWindow, CControlWinTraits>::WindowProc(hWnd, uMsg, wParam, lParam);
@ -509,7 +509,8 @@ void CDefView::SetStyle(DWORD dwAdd, DWORD dwRemove)
* - creates the list view window * - creates the list view window
*/ */
BOOL CDefView::CreateList() BOOL CDefView::CreateList()
{ DWORD dwStyle, dwExStyle; {
DWORD dwStyle, dwExStyle;
TRACE("%p\n", this); TRACE("%p\n", this);
@ -1237,8 +1238,7 @@ cleanup:
*/ */
LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{ {
WORD x; WORD x, y;
WORD y;
UINT uCommand; UINT uCommand;
HMENU hMenu; HMENU hMenu;
HRESULT hResult; HRESULT hResult;
@ -2069,9 +2069,7 @@ HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable)
HRESULT WINAPI CDefView::UIActivate(UINT uState) HRESULT WINAPI CDefView::UIActivate(UINT uState)
{ {
/* // CHAR szName[MAX_PATH];
CHAR szName[MAX_PATH];
*/
LRESULT lResult; LRESULT lResult;
int nPartArray[1] = { -1}; int nPartArray[1] = { -1};
@ -2133,14 +2131,14 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
if (psb == NULL || m_hWnd) if (psb == NULL || m_hWnd)
return E_UNEXPECTED; return E_UNEXPECTED;
/*set up the member variables*/ /* Set up the member variables */
m_pShellBrowser = psb; m_pShellBrowser = psb;
m_FolderSettings = *lpfs; m_FolderSettings = *lpfs;
/*get our parent window*/ /* Get our parent window */
m_pShellBrowser->GetWindow(&m_hWndParent); m_pShellBrowser->GetWindow(&m_hWndParent);
/* try to get the ICommDlgBrowserInterface, adds a reference !!! */ /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */
m_pCommDlgBrowser = NULL; m_pCommDlgBrowser = NULL;
if (SUCCEEDED(m_pShellBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &m_pCommDlgBrowser)))) if (SUCCEEDED(m_pShellBrowser->QueryInterface(IID_PPV_ARG(ICommDlgBrowser, &m_pCommDlgBrowser))))
{ {
@ -2177,7 +2175,7 @@ HRESULT WINAPI CDefView::DestroyViewWindow()
{ {
TRACE("(%p)\n", this); 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); UIActivate(SVUIA_DEACTIVATE);
if (m_hAccel) if (m_hAccel)
@ -3048,8 +3046,7 @@ HRESULT STDMETHODCALLTYPE CDefView::QueryService(REFGUID guidService, REFIID rii
HRESULT CDefView::_MergeToolbar() HRESULT CDefView::_MergeToolbar()
{ {
CComPtr<IExplorerToolbar> ptb; // [sp+8h] [bp-4h]@1 CComPtr<IExplorerToolbar> ptb;
HRESULT hr = S_OK; HRESULT hr = S_OK;
hr = IUnknown_QueryService(m_pShellBrowser, IID_IExplorerToolbar, IID_PPV_ARG(IExplorerToolbar, &ptb)); hr = IUnknown_QueryService(m_pShellBrowser, IID_IExplorerToolbar, IID_PPV_ARG(IExplorerToolbar, &ptb));

11
reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
View file

@ -396,13 +396,13 @@ BOOL CDesktopBrowser::MessageLoop()
LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
HWND hwndTray; HWND hWndTray;
HRESULT hres; HRESULT hRet;
hres = this->ShellDesk->GetTrayWindow(&hwndTray); hRet = ShellDesk->GetTrayWindow(&hWndTray);
if (SUCCEEDED(hres)) if (SUCCEEDED(hRet))
PostMessageW(hwndTray, uMsg, wParam, lParam); PostMessageW(hWndTray, uMsg, wParam, lParam);
return 0; return 0;
} }
@ -550,6 +550,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
case WM_SETFOCUS: case WM_SETFOCUS:
SetFocus(pThis->hWndShellView); SetFocus(pThis->hWndShellView);
break; break;
default: default:
DefMsgHandler: DefMsgHandler:
Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);