diff --git a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp index 610022a4b7b..4ef2ab112e7 100644 --- a/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp +++ b/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp @@ -104,7 +104,7 @@ END_COM_MAP() }; CDesktopBrowser::CDesktopBrowser(): - m_hAccel(NULL), + m_hAccel(NULL), m_hWndShellView(NULL) { } @@ -184,7 +184,7 @@ HRESULT CDesktopBrowser::_Resize() } HRESULT CDesktopBrowser::Initialize(IShellDesktopTray *ShellDesk) -{ +{ CComPtr psfDesktop; HRESULT hRet; 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 */ - 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); } @@ -400,7 +400,7 @@ LRESULT CDesktopBrowser::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam if (m_hWndShellView) { /* 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) @@ -477,14 +477,14 @@ BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) + while ((bRet = ::GetMessageW(&Msg, NULL, 0, 0)) != 0) { if (bRet != -1) { if (shellView->TranslateAcceleratorW(&Msg) != S_OK) { - TranslateMessage(&Msg); - DispatchMessage(&Msg); + ::TranslateMessage(&Msg); + ::DispatchMessageW(&Msg); } } } diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 2431ee84c9c..b006b881460 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -950,7 +950,7 @@ HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType) { HWND 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)); } else