Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 00:32:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Remove some trailing spaces; use explicitly global namespace for some functions.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2019-12-29 15:57:57 +01:00
parent d967b5aa25
commit be19fda765
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
View file

@ -104,7 +104,7 @@ END_COM_MAP()
}; };
CDesktopBrowser::CDesktopBrowser(): CDesktopBrowser::CDesktopBrowser():
m_hAccel(NULL), m_hAccel(NULL),
m_hWndShellView(NULL) m_hWndShellView(NULL)
{ {
} }
@ -184,7 +184,7 @@ HRESULT CDesktopBrowser::_Resize()
} }
HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk) HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk)
{ {
CComPtr<IShellFolder> psfDesktop; CComPtr<IShellFolder> psfDesktop;
HRESULT hRet; HRESULT hRet;
hRet = SHGetDesktopFolder(&psfDesktop); hRet = SHGetDesktopFolder(&psfDesktop);
@ -284,7 +284,7 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT
* find an open shell window that shows the requested pidl and activate it * find an open shell window that shows the requested pidl and activate it
*/ */
DWORD dwFlags = ((wFlags & SBSP_EXPLOREMODE) != 0) ? SH_EXPLORER_CMDLINE_FLAG_E : 0; DWORD dwFlags = ((wFlags & SBSP_EXPLOREMODE) != 0) ? SH_EXPLORER_CMDLINE_FLAG_E : 0;
return SHOpenNewFrame(ILClone(pidl), NULL, 0, dwFlags); return SHOpenNewFrame(ILClone(pidl), NULL, 0, dwFlags);
} }
@ -400,7 +400,7 @@ LRESULT CDesktopBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam
if (m_hWndShellView) if (m_hWndShellView)
{ {
/* Forward the message */ /* Forward the message */
SendMessageW(m_hWndShellView, uMsg, wParam, lParam); ::SendMessageW(m_hWndShellView, uMsg, wParam, lParam);
} }
if (uMsg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA && m_hWndShellView != NULL) if (uMsg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA && m_hWndShellView != NULL)
@ -477,14 +477,14 @@ BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop)
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return FALSE; return FALSE;
while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) while ((bRet = ::GetMessageW(&Msg, NULL, 0, 0)) != 0)
{ {
if (bRet != -1) if (bRet != -1)
{ {
if (shellView->TranslateAcceleratorW(&Msg) != S_OK) if (shellView->TranslateAcceleratorW(&Msg) != S_OK)
{ {
TranslateMessage(&Msg); ::TranslateMessage(&Msg);
DispatchMessage(&Msg); ::DispatchMessageW(&Msg);
} }
} }
} }

2
dll/win32/shell32/shellmenu/CMenuToolbars.cpp
View file

@ -950,7 +950,7 @@ HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType)
{ {
HWND tlw; HWND tlw;
m_menuBand->_GetTopLevelWindow(&tlw); m_menuBand->_GetTopLevelWindow(&tlw);
SendMessageW(tlw, WM_CANCELMODE, 0, 0); ::SendMessageW(tlw, WM_CANCELMODE, 0, 0);
PostMessageW(WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE)); PostMessageW(WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE));
} }
else else