Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-18 19:47:14 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class CDefView :
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;
@ -245,7 +245,7 @@ class CDefView :
// *** 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);
@ -290,7 +290,7 @@ class CDefView :
CDefView *pThis;
LRESULT result;
// must hold a reference during message handling
// Must hold a reference during message handling
pThis = reinterpret_cast<CDefView *>(hWnd);
pThis->AddRef();
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
*/
BOOL CDefView::CreateList()
{ DWORD dwStyle, dwExStyle;
{
DWORD dwStyle, dwExStyle;
TRACE("%p\n", this);
@ -792,7 +793,7 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
nItem = LV_FindItemByPidl(pidl);
if ( -1 != nItem )
if (-1 != nItem)
{
lvItem.mask = LVIF_IMAGE;
lvItem.iItem = nItem;
@ -813,7 +814,7 @@ BOOLEAN CDefView::LV_ProdItem(PCUITEMID_CHILD pidl)
* - 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);
@ -981,9 +982,9 @@ LRESULT CDefView::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
TRACE("%p\n", this);
if(CreateList())
if (CreateList())
{
if(InitList())
if (InitList())
{
FillList();
}
@ -1029,7 +1030,7 @@ HMENU CDefView::BuildFileMenu()
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,8 +1238,7 @@ cleanup:
*/
LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
WORD x;
WORD y;
WORD x, y;
UINT uCommand;
HMENU hMenu;
HRESULT hResult;
@ -1375,7 +1375,7 @@ void CDefView::DoActivate(UINT uState)
}
else
{
if(m_hMenu)
if (m_hMenu)
{
if (!m_menusLoaded)
{
@ -2069,24 +2069,22 @@ HRESULT WINAPI CDefView::EnableModeless(BOOL fEnable)
HRESULT WINAPI CDefView::UIActivate(UINT uState)
{
/*
CHAR szName[MAX_PATH];
*/
// 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)
{
@ -2133,14 +2131,14 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTI
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 @@ HRESULT WINAPI CDefView::DestroyViewWindow()
{
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 STDMETHODCALLTYPE CDefView::QueryService(REFGUID guidService, REFIID rii
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));

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