Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 68771: [SHDOCVW] -Rename some unused stubs to resolve conflicts with shell32
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 14:04:53 2015 New Revision: 68771 URL: http://svn.reactos.org/svn/reactos?rev=68771&view=rev Log: [SHDOCVW] -Rename some unused stubs to resolve conflicts with shell32 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Wed Aug 19 14:04:53 2015 @@ -16,8 +16,8 @@ 116 stub -noname DDECreatePostNotify 117 stub -noname DDEHandleViewFolderNotify 118 stdcall -noname ShellDDEInit(long) -119 stub -noname SHCreateDesktop -120 stub -noname SHDesktopMessageLoop +119 stub -noname SHCreateDesktopDEPRECATED +120 stub -noname SHDesktopMessageLoopDEPRECATED 121 stdcall -noname StopWatchModeFORWARD() 122 stdcall -noname StopWatchFlushFORWARD() 123 stdcall -noname StopWatchWFORWARD(long str long long long)

1 0

[gadamopoulos] 68770: Add two files that I missed
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 13:55:15 2015 New Revision: 68770 URL: http://svn.reactos.org/svn/reactos?rev=68770&view=rev Log: Add two files that I missed Added: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt (with props) trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h (with props) Added: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt [iso-8859-1] Wed Aug 19 13:55:15 2015 @@ -0,0 +1,13 @@ +PROJECT(SHELL) + +set_cpp(WITH_RUNTIME) + +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +list(APPEND SOURCE + CDesktopBrowser.cpp + dde.cpp) + +add_library(shelldesktop ${SOURCE}) Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h (added) +++ trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h [iso-8859-1] Wed Aug 19 13:55:15 2015 @@ -0,0 +1,36 @@ + +#include <stdio.h> +#include <tchar.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <winnls.h> +#include <wincon.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlwapi.h> +#include <shlguid_undoc.h> +#include <strsafe.h> +#include <browseui_undoc.h> + +#include <atlbase.h> +#include <atlcom.h> +#include <atlwin.h> +#include <undocshell.h> +#include <undocuser.h> + +#include <shellutils.h> +#include "../shresdef.h" + +#include <wine/debug.h> + +extern "C" HINSTANCE shell32_hInstance; Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/shelldesktop.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 68769: [SHELLDESKTOP] - Create a new sublibrary for shell32 that will contain the implementation of CDesktopBrowser and desktop dde support. Link it to both shell32 and rshell. Also ...
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 13:51:20 2015 New Revision: 68769 URL: http://svn.reactos.org/svn/reactos?rev=68769&view=rev Log: [SHELLDESKTOP] - Create a new sublibrary for shell32 that will contain the implementation of CDesktopBrowser and desktop dde support. Link it to both shell32 and rshell. Also add a win8+ hack. Added: trunk/reactos/dll/win32/shell32/shelldesktop/ (with props) trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp - copied, changed from r68767, trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/shelldesktop/dde.cpp - copied, changed from r68767, trunk/reactos/dll/win32/shell32/dde.cpp Removed: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/dde.cpp trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/base/shell/rshell/rshell.spec trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMakeLis… ============================================================================== --- trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -18,11 +18,13 @@ target_link_libraries(rshell shellmenu + shelldesktop atlnew uuid wine) add_importlibs(rshell + browseui uxtheme shlwapi advapi32 Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -20,6 +20,7 @@ #include "shellmenu.h" +extern "C" HINSTANCE shell32_hInstance = NULL; DWORD WINAPI WinList_Init(void) Modified: trunk/reactos/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/rshell.s… ============================================================================== --- trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -7,4 +7,6 @@ @ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr); @ stdcall CMergedFolder_Constructor(ptr ptr); -@ stdcall ShellDDEInit(long); +@ stdcall ShellDDEInit(long); +@ stdcall SHCreateDesktop(ptr); +@ stdcall SHDesktopMessageLoop(ptr); Removed: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp (removed) @@ -1,620 +0,0 @@ -/* - * Shell Desktop - * - * Copyright 2008 Thomas Bluemel - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(desktop); - -#define SHDESK_TAG 'KSED' - -static const WCHAR szProgmanClassName [] = L"Progman"; -static const WCHAR szProgmanWindowName [] = L"Program Manager"; - -class CDesktopBrowser : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellBrowser, - public ICommDlgBrowser, - public IServiceProvider -{ -public: - DWORD Tag; - HACCEL m_hAccel; -private: - HWND hWnd; - HWND hWndShellView; - HWND hWndDesktopListView; - CComPtr<IShellDesktopTray> ShellDesk; - CComPtr<IShellView> DesktopView; - CComPtr<IShellBrowser> DefaultShellBrowser; - LPITEMIDLIST pidlDesktopDirectory; - LPITEMIDLIST pidlDesktop; - - LRESULT _NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam); - -public: - CDesktopBrowser(); - ~CDesktopBrowser(); - HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx); - HWND FindDesktopListView (); - BOOL CreateDeskWnd(); - HWND DesktopGetWindowControl(IN UINT id); - LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam); - BOOL MessageLoop(); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IShellBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths); - virtual HRESULT STDMETHODCALLTYPE SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject); - virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(HMENU hmenuShared); - virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(LPCOLESTR pszStatusText); - virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(BOOL fEnable); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorSB(MSG *pmsg, WORD wID); - virtual HRESULT STDMETHODCALLTYPE BrowseObject(LPCITEMIDLIST pidl, UINT wFlags); - virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(DWORD grfMode, IStream **ppStrm); - virtual HRESULT STDMETHODCALLTYPE GetControlWindow(UINT id, HWND *lphwnd); - virtual HRESULT STDMETHODCALLTYPE SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret); - virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(struct IShellView **ppshv); - virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags); - - // *** ICommDlgBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand (struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE OnStateChange (struct IShellView *ppshv, ULONG uChange); - virtual HRESULT STDMETHODCALLTYPE IncludeObject (struct IShellView *ppshv, LPCITEMIDLIST pidl); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - -BEGIN_COM_MAP(CDesktopBrowser) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) -END_COM_MAP() -}; - -CDesktopBrowser::CDesktopBrowser() -{ - Tag = SHDESK_TAG; - hWnd = NULL; - hWndShellView = NULL; - hWndDesktopListView = NULL; - DefaultShellBrowser = NULL; - pidlDesktopDirectory = NULL; - pidlDesktop = NULL; -} - -CDesktopBrowser::~CDesktopBrowser() -{ - if (DesktopView.p != NULL) - { - if (hWndShellView != NULL) - DesktopView->DestroyViewWindow(); - - hWndShellView = NULL; - hWndDesktopListView = NULL; - } - - if (pidlDesktopDirectory != NULL) - { - ILFree(pidlDesktopDirectory); - pidlDesktopDirectory = NULL; - } - - if (pidlDesktop != NULL) - { - ILFree(pidlDesktop); - pidlDesktop = NULL; - } -} - -HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx) -{ - CComPtr<IShellFolder> psfDesktopFolder; - CSFV csfv; - HRESULT hRet; - - hWnd = hWndx; - ShellDesk = ShellDeskx; - ShellDesk->AddRef(); - - pidlDesktopDirectory = SHCloneSpecialIDList(hWnd, CSIDL_DESKTOPDIRECTORY, FALSE); - hRet = SHGetSpecialFolderLocation(hWnd, CSIDL_DESKTOP, &pidlDesktop); - if (FAILED(hRet)) - return hRet; - - hRet = SHGetDesktopFolder(&psfDesktopFolder); - if (FAILED(hRet)) - return hRet; - - ZeroMemory(&csfv, sizeof(csfv)); - csfv.cbSize = sizeof(csfv); - csfv.pshf = psfDesktopFolder; - csfv.psvOuter = NULL; - - hRet = SHCreateShellFolderViewEx(&csfv, &DesktopView); - - return hRet; -} - -static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) -{ - CComPtr<IShellDesktopTray> ShellDesk; - CComObject<CDesktopBrowser> *pThis; - HRESULT hRet; - - ShellDesk = (IShellDesktopTray *)lpCreateStruct->lpCreateParams; - if (ShellDesk == NULL) - { - WARN("No IShellDesk interface provided!"); - return NULL; - } - - pThis = new CComObject<CDesktopBrowser>; - if (pThis == NULL) - return NULL; - pThis->AddRef(); - - hRet = pThis->Initialize(hWnd, ShellDesk); - if (FAILED(hRet)) - { - pThis->Release(); - return NULL; - } - - return pThis; -} - -HWND CDesktopBrowser::FindDesktopListView () -{ - return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL); -} - -BOOL CDesktopBrowser::CreateDeskWnd() -{ - FOLDERSETTINGS fs; - RECT rcClient; - HRESULT hRet; - - if (!GetClientRect(hWnd, &rcClient)) - { - return FALSE; - } - - fs.ViewMode = FVM_ICON; - fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - hRet = DesktopView->CreateViewWindow(NULL, &fs, (IShellBrowser *)this, &rcClient, &hWndShellView); - if (!SUCCEEDED(hRet)) - return FALSE; - - SetShellWindowEx(hWnd, FindDesktopListView()); - - return TRUE; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetWindow(HWND *phwnd) -{ - if (hWnd != NULL) - { - *phwnd = hWnd; - return S_OK; - } - - *phwnd = NULL; - return E_UNEXPECTED; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::ContextSensitiveHelp(BOOL fEnterMode) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::RemoveMenusSB(HMENU hmenuShared) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetStatusTextSB(LPCOLESTR lpszStatusText) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::EnableModelessSB(BOOL fEnable) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, WORD wID) -{ - if (!::TranslateAcceleratorW(hWnd, m_hAccel, lpmsg)) - return S_FALSE; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) -{ - /* - * We should use IShellWindows interface here in order to attempt to - * find an open shell window that shows the requested pidl and activate it - */ - - return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) -{ - return E_NOTIMPL; -} - -HWND CDesktopBrowser::DesktopGetWindowControl(IN UINT id) -{ - switch (id) - { - case FCW_TOOLBAR: - case FCW_STATUS: - case FCW_TREE: - case FCW_PROGRESS: - return NULL; - - default: - return NULL; - } - -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetControlWindow(UINT id, HWND *lphwnd) -{ - HWND hWnd; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *lphwnd = hWnd; - return S_OK; - } - - *lphwnd = NULL; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) -{ - HWND hWnd; - - if (pret == NULL) - return E_POINTER; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *pret = SendMessageW(hWnd, - uMsg, - wParam, - lParam); - return S_OK; - } - - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryActiveShellView(IShellView **ppshv) -{ - *ppshv = DesktopView; - if (DesktopView != NULL) - DesktopView->AddRef(); - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnViewWindowActive(IShellView *ppshv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnDefaultCommand(IShellView *ppshv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnStateChange(IShellView *ppshv, ULONG uChange) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::IncludeObject(IShellView *ppshv, LPCITEMIDLIST pidl) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryService(REFGUID guidService, REFIID riid, PVOID *ppv) -{ - /* FIXME - handle guidService */ - return QueryInterface(riid, ppv); -} - -BOOL CDesktopBrowser::MessageLoop() -{ - MSG Msg; - BOOL bRet; - - while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) - { - if (bRet != -1) - { - if (DesktopView->TranslateAcceleratorW(&Msg) != S_OK) - { - TranslateMessage(&Msg); - DispatchMessage(&Msg); - } - } - } - - return TRUE; -} - -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); - - return 0; -} - -LRESULT CDesktopBrowser::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (LOWORD(wParam)) - { - case FCIDM_DESKBROWSER_CLOSE: - return _NotifyTray(TWM_DOEXITWINDOWS, 0, 0); - case FCIDM_DESKBROWSER_FOCUS: - if (GetKeyState(VK_SHIFT)) - return _NotifyTray(TWM_CYCLEFOCUS, 1, 0xFFFFFFFF); - else - return _NotifyTray(TWM_CYCLEFOCUS, 1, 1); - case FCIDM_DESKBROWSER_SEARCH: - SHFindFiles(NULL, NULL); - break; - case FCIDM_DESKBROWSER_REFRESH: - break; - } - - return 0; -} - -LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) -{ - CDesktopBrowser *pThis = NULL; - LRESULT Ret = FALSE; - - if (uMsg != WM_NCCREATE) - { - pThis = reinterpret_cast<CDesktopBrowser *>(GetWindowLongPtrW(hwnd, 0)); - if (pThis == NULL) - goto DefMsgHandler; - } - - if (pThis != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_ERASEBKGND: - return (LRESULT)PaintDesktop((HDC)wParam); - - case WM_GETISHELLBROWSER: - Ret = (LRESULT)((IShellBrowser *)pThis); - break; - - case WM_SIZE: - if (wParam == SIZE_MINIMIZED) - { - /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, - SW_RESTORE); - } - else - { - RECT rcDesktop; - - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); - - /* FIXME: Update work area */ - DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop); - } - break; - - case WM_SYSCOLORCHANGE: - case WM_SETTINGCHANGE: - { - if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0) - { - if (pThis->hWndShellView != NULL) - { - /* Forward the message */ - SendMessageW(pThis->hWndShellView, - uMsg, - wParam, - lParam); - } - } - break; - } - - case WM_CREATE: - { - pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd); - - if (!pThis->CreateDeskWnd()) - WARN("Could not create the desktop view control!\n"); - - pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(3)); - - break; - } - - case WM_NCCREATE: - { - LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; - pThis = SHDESK_Create(hwnd, CreateStruct); - if (pThis == NULL) - { - WARN("Failed to create desktop structure\n"); - break; - } - - SetWindowLongPtrW(hwnd, - 0, - (LONG_PTR)pThis); - Ret = TRUE; - break; - } - - case WM_NCDESTROY: - { - pThis->Release(); - break; - } - - case WM_EXPLORER_OPEN_NEW_WINDOW: - TRACE("Proxy Desktop message 1035 received.\n"); - SHOnCWMCommandLine((HANDLE)lParam); - break; - - case WM_COMMAND: - return pThis->OnCommand(uMsg, wParam, lParam); - - case WM_SETFOCUS: - SetFocus(pThis->hWndShellView); - break; - default: -DefMsgHandler: - Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - break; - } - } - - return Ret; -} - -static BOOL -RegisterProgmanWindowClass(VOID) -{ - WNDCLASSW wcProgman; - - wcProgman.style = CS_DBLCLKS; - wcProgman.lpfnWndProc = CDesktopBrowser::ProgmanWindowProc; - wcProgman.cbClsExtra = 0; - wcProgman.cbWndExtra = sizeof(CDesktopBrowser *); - wcProgman.hInstance = shell32_hInstance; - wcProgman.hIcon = NULL; - wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = NULL; - wcProgman.lpszMenuName = NULL; - wcProgman.lpszClassName = szProgmanClassName; - - return RegisterClassW(&wcProgman) != 0; -} - - -/************************************************************************* - * SHCreateDesktop [SHELL32.200] - * - */ -HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) -{ - HWND hWndDesk; - RECT rcDesk; - - if (ShellDesk == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - if (RegisterProgmanWindowClass() == 0) - { - WARN("Failed to register the Progman window class!\n"); - return NULL; - } - - rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesk.right = rcDesk.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesk.bottom = rcDesk.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); - - if (IsRectEmpty(&rcDesk)) - { - rcDesk.left = rcDesk.top = 0; - rcDesk.right = GetSystemMetrics(SM_CXSCREEN); - rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); - } - - hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, - NULL, NULL, shell32_hInstance, (LPVOID)ShellDesk); - if (hWndDesk != NULL) - return (HANDLE)GetWindowLongPtrW(hWndDesk, 0); - - return NULL; -} - -/************************************************************************* - * SHCreateDesktop [SHELL32.201] - * - */ -BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) -{ - CDesktopBrowser *Desk = static_cast<CDesktopBrowser *>(hDesktop); - - if (Desk == NULL || Desk->Tag != SHDESK_TAG) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - return Desk->MessageLoop(); -} Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -1,5 +1,6 @@ PROJECT(SHELL) +add_subdirectory(shelldesktop) add_subdirectory(shellmenu) set_cpp(WITH_RUNTIME) @@ -20,9 +21,7 @@ list(APPEND SOURCE CIDLDataObj.cpp CQueryAssociations.cpp - dde.cpp debughlp.cpp - CDesktopBrowser.cpp dialogs/dialogs.cpp dialogs/drive.cpp dialogs/drvdefext.cpp @@ -82,7 +81,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) -target_link_libraries(shell32 shellmenu atlnew wine uuid recyclebin) +target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) add_delay_importlibs(shell32 uxtheme ole32 userenv version fmifs) add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) add_pch(shell32 precomp.h SOURCE) Removed: trunk/reactos/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.cpp?… ============================================================================== --- trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dde.cpp (removed) @@ -1,423 +0,0 @@ -/* - * Shell DDE Handling - * - * Copyright 2004 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" -#include <ddeml.h> -#include <strsafe.h> - -WINE_DEFAULT_DEBUG_CHANNEL(shelldde); - -typedef DWORD(CALLBACK * pfnCommandHandler)(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS); - -struct DDECommandHandler -{ - WCHAR Command[32]; - pfnCommandHandler Handler; -}; - -extern DDECommandHandler HandlerList []; -extern const int HandlerListLength; - -/* DDE Instance ID */ -static DWORD dwDDEInst; - -/* String handles */ -static HSZ hszProgmanTopic; -static HSZ hszProgmanService; -static HSZ hszShell; -static HSZ hszAppProperties; -static HSZ hszFolders; - -static BOOL bInitialized; - -static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); - - return TRUE; -} - -static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); -} - -static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); - - return FALSE; -} - -static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szItem[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); - - TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); - - return NULL; -} - -static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) -{ - LPITEMIDLIST ret = NULL; - - // Ensure it really is an IDLIST-formatted parameter - // Format for IDLIST params: ":pid:shared" - if (*strField != L':') - return NULL; - - HANDLE hData = (HANDLE) StrToIntW(strField + 1); - PWSTR strSecond = StrChrW(strField + 1, L':'); - - if (strSecond) - { - int pid = StrToIntW(strSecond + 1); - void* pvShared = SHLockShared(hData, pid); - if (pvShared) - { - ret = ILClone((LPCITEMIDLIST) pvShared); - SHUnlockShared(pvShared); - SHFreeShared(hData, pid); - } - } - return ret; -} - -static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WCHAR *pszCommand; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - - pszCommand = (WCHAR*) DdeAccessData(hdata, NULL); - if (!pszCommand) - return DDE_FNOTPROCESSED; - - StringCchCopyW(szCommand, _countof(szCommand), pszCommand); - - DdeUnaccessData(hdata); - - TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); - - /* - [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode - [ExploreFolder("%l", %I, %S)] -- Open a folder in "explore" mode (file tree is shown to the left by default) - [FindFolder("%l", %I)] -- Open a folder in "find" mode (search panel is shown to the left by default) - [ShellFile("%1","%1",%S)] -- Execute the contents of the specified .SCF file - - Approximate grammar (Upper names define rules, <lower> names define terminals, single-quotes are literals): - - Rules - Command = ('[' Function ']') | Function - Function = <identifier> '(' Parameters ')' - Parameters = (<quoted-string> (',' <idlist> (',' <number>)?)?)? - - Terminals - <identifier> = [a-zA-Z]+ - <quoted-string> = \"([^\"]|\\.)\" - <idlist> = \:[0-9]+\:[0-9]+ - <number> = [0-9]+ - */ - - WCHAR Command[MAX_PATH] = L""; - WCHAR Path[MAX_PATH] = L""; - LPITEMIDLIST IdList = NULL; - INT UnknownParameter = 0; - - // Simplified parsing (assumes the command will not be TOO broken): - - PWSTR cmd = szCommand; - // 1. if starts with [, skip first char - if (*cmd == L'[') - cmd++; - - if (*cmd == L']') - { - ERR("Empty command. Nothing to run.\n"); - return DDE_FNOTPROCESSED; - } - - // Read until first (, and take text before ( as command name - { - PWSTR cmdEnd = StrChrW(cmd, L'('); - - if (!cmdEnd) - { - ERR("Could not find '('. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - *cmdEnd = 0; - - StringCchCopy(Command, _countof(Command), cmd); - - cmd = cmdEnd + 1; - } - - // Read first param after (, expecting quoted string - if (*cmd != L')') - { - // Copy unescaped string - PWSTR dst = Path; - BOOL isQuote = FALSE; - - PWSTR arg = cmd; - - while (*arg && (isQuote || *arg != L',')) - { - if (*arg == L'"') - { - isQuote = !isQuote; - if (isQuote && arg != cmd) // do not copy the " at the beginning of the string - { - *(dst++) = L'"'; - } - } - else - { - *(dst++) = *arg; - } - - arg++; - } - - cmd = arg + 1; - - while (*cmd == L' ') - cmd++; - } - - // Read second param, expecting an idlist in shared memory - if (*cmd != L')') - { - if (*cmd != ':') - { - ERR("Expected ':'. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - PWSTR idlistEnd = StrChrW(cmd, L','); - - if (!idlistEnd) - idlistEnd = StrChrW(cmd, L')'); - - if (!idlistEnd) - { - ERR("Expected ',' or ')'. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - IdList = _ILReadFromSharedMemory(cmd); - - cmd = idlistEnd + 1; - } - - // Read third param, expecting an integer - if (*cmd != L')') - { - UnknownParameter = StrToIntW(cmd); - } - - TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); - - // Find handler in list - for (int i = 0; i < HandlerListLength; i++) - { - DDECommandHandler & handler = HandlerList[i]; - if (StrCmpW(handler.Command, Command) == 0) - { - return handler.Handler(Command, Path, IdList, UnknownParameter); - } - } - - // No handler found - ERR("Unknown command %S\n", Command); - return DDE_FNOTPROCESSED; -} - -static void Dde_OnDisconnect(HCONV hconv) -{ - TRACE("Dde_OnDisconnect: hconv=%p\n", hconv); -} - -static HDDEDATA CALLBACK DdeCallback( - UINT uType, - UINT uFmt, - HCONV hconv, - HSZ hsz1, - HSZ hsz2, - HDDEDATA hdata, - ULONG_PTR dwData1, - ULONG_PTR dwData2) -{ - switch (uType) - { - case XTYP_CONNECT: - return (HDDEDATA) (DWORD_PTR) Dde_OnConnect(hsz1, hsz2); - case XTYP_CONNECT_CONFIRM: - Dde_OnConnectConfirm(hconv, hsz1, hsz2); - return NULL; - case XTYP_WILDCONNECT: - return (HDDEDATA) (DWORD_PTR) Dde_OnWildConnect(hsz1, hsz2); - case XTYP_REQUEST: - return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); - case XTYP_EXECUTE: - return (HDDEDATA) (DWORD_PTR) Dde_OnExecute(hconv, hsz1, hdata); - case XTYP_DISCONNECT: - Dde_OnDisconnect(hconv); - return NULL; - case XTYP_REGISTER: - return NULL; - default: - WARN("DdeCallback: unknown uType=%d\n", uType); - return NULL; - } -} -/************************************************************************* - * ShellDDEInit (SHELL32.@) - * - * Registers the Shell DDE services with the system so that applications - * can use them. - * - * PARAMS - * bInit [I] TRUE to initialize the services, FALSE to uninitialize. - * - * RETURNS - * Nothing. - */ -EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) -{ - TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); - - if (bInit && !bInitialized) - { - DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); - - hszProgmanTopic = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); - hszProgmanService = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); - hszShell = DdeCreateStringHandleW(dwDDEInst, L"Shell", CP_WINUNICODE); - hszAppProperties = DdeCreateStringHandleW(dwDDEInst, L"AppProperties", CP_WINUNICODE); - hszFolders = DdeCreateStringHandleW(dwDDEInst, L"Folders", CP_WINUNICODE); - - if (hszProgmanTopic && hszProgmanService && - hszShell && hszAppProperties && hszFolders && - DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER) && - DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER) && - DdeNameService(dwDDEInst, hszShell, 0, DNS_REGISTER)) - { - bInitialized = TRUE; - } - } - else if (!bInit && bInitialized) - { - /* unregister all services */ - DdeNameService(dwDDEInst, 0, 0, DNS_UNREGISTER); - - if (hszFolders) - DdeFreeStringHandle(dwDDEInst, hszFolders); - if (hszAppProperties) - DdeFreeStringHandle(dwDDEInst, hszAppProperties); - if (hszShell) - DdeFreeStringHandle(dwDDEInst, hszShell); - if (hszProgmanService) - DdeFreeStringHandle(dwDDEInst, hszProgmanService); - if (hszProgmanTopic) - DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); - - DdeUninitialize(dwDDEInst); - - bInitialized = FALSE; - } -} - -static DWORD CALLBACK DDE_OnViewFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - if (!pidl) - pidl = ILCreateFromPathW(strPath); - - if (!pidl) - return DDE_FNOTPROCESSED; - - if (FAILED(SHOpenNewFrame(pidl, NULL, 0, 0))) - return DDE_FNOTPROCESSED; - - return DDE_FACK; -} - -static DWORD CALLBACK DDW_OnExploreFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - if (!pidl) - pidl = ILCreateFromPathW(strPath); - - if (!pidl) - return DDE_FNOTPROCESSED; - - if (FAILED(SHOpenNewFrame(pidl, NULL, 0, SH_EXPLORER_CMDLINE_FLAG_E))) - return DDE_FNOTPROCESSED; - - return DDE_FACK; -} - -static DWORD CALLBACK DDE_OnFindFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FNOTPROCESSED; -} - -static DWORD CALLBACK DDE_OnShellFile(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FNOTPROCESSED; -} - -DDECommandHandler HandlerList [] = { - - { L"ViewFolder", DDE_OnViewFolder }, - { L"ExploreFolder", DDW_OnExploreFolder }, - { L"FindFolder", DDE_OnFindFolder }, - { L"ShellFile", DDE_OnShellFile } -}; - -const int HandlerListLength = _countof(HandlerList); Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 19 13:51:20 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/shelldesktop/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp (from r68767, trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "shelldesktop.h" WINE_DEFAULT_DEBUG_CHANNEL(desktop); @@ -210,6 +210,12 @@ SetShellWindowEx(hWnd, FindDesktopListView()); +#if 1 + /* A Windows8+ specific hack */ + ::ShowWindow(hWndShellView, SW_SHOW); + ::ShowWindow(FindDesktopListView(), SW_SHOW); +#endif + return TRUE; } Copied: trunk/reactos/dll/win32/shell32/shelldesktop/dde.cpp (from r68767, trunk/reactos/dll/win32/shell32/dde.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/dde.cpp [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "shelldesktop.h" #include <ddeml.h> #include <strsafe.h> Removed: trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp (removed) @@ -1,566 +0,0 @@ -/* - * Shell Desktop - * - * Copyright 2008 Thomas Bluemel - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "shellmenu.h" - -WINE_DEFAULT_DEBUG_CHANNEL(desktop); - -#define SHDESK_TAG 'KSED' - -static const WCHAR szProgmanClassName [] = L"Progman"; -static const WCHAR szProgmanWindowName [] = L"Program Manager"; - -class CDesktopBrowser : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellBrowser, - public ICommDlgBrowser, - public IServiceProvider -{ -public: - DWORD Tag; -private: - HWND hWnd; - HWND hWndShellView; - HWND hWndDesktopListView; - CComPtr<IShellDesktopTray> ShellDesk; - CComPtr<IShellView> DesktopView; - IShellBrowser *DefaultShellBrowser; - LPITEMIDLIST pidlDesktopDirectory; - LPITEMIDLIST pidlDesktop; -public: - CDesktopBrowser(); - ~CDesktopBrowser(); - HRESULT Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx); - HWND FindDesktopListView(); - BOOL CreateDeskWnd(); - HWND DesktopGetWindowControl(IN UINT id); - static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam); - static BOOL MessageLoop(); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IShellBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths); - virtual HRESULT STDMETHODCALLTYPE SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject); - virtual HRESULT STDMETHODCALLTYPE RemoveMenusSB(HMENU hmenuShared); - virtual HRESULT STDMETHODCALLTYPE SetStatusTextSB(LPCOLESTR pszStatusText); - virtual HRESULT STDMETHODCALLTYPE EnableModelessSB(BOOL fEnable); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorSB(MSG *pmsg, WORD wID); - virtual HRESULT STDMETHODCALLTYPE BrowseObject(LPCITEMIDLIST pidl, UINT wFlags); - virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(DWORD grfMode, IStream **ppStrm); - virtual HRESULT STDMETHODCALLTYPE GetControlWindow(UINT id, HWND *lphwnd); - virtual HRESULT STDMETHODCALLTYPE SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret); - virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(struct IShellView **ppshv); - virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags); - - // *** ICommDlgBrowser methods *** - virtual HRESULT STDMETHODCALLTYPE OnDefaultCommand(struct IShellView *ppshv); - virtual HRESULT STDMETHODCALLTYPE OnStateChange(struct IShellView *ppshv, ULONG uChange); - virtual HRESULT STDMETHODCALLTYPE IncludeObject(struct IShellView *ppshv, LPCITEMIDLIST pidl); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - BEGIN_COM_MAP(CDesktopBrowser) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_ICommDlgBrowser, ICommDlgBrowser) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - END_COM_MAP() -}; - -CDesktopBrowser::CDesktopBrowser() -{ - Tag = SHDESK_TAG; - hWnd = NULL; - hWndShellView = NULL; - hWndDesktopListView = NULL; - DefaultShellBrowser = NULL; - pidlDesktopDirectory = NULL; - pidlDesktop = NULL; -} - -CDesktopBrowser::~CDesktopBrowser() -{ - if (DesktopView.p != NULL) - { - if (hWndShellView != NULL) - DesktopView->DestroyViewWindow(); - - hWndShellView = NULL; - hWndDesktopListView = NULL; - } - - if (pidlDesktopDirectory != NULL) - { - ILFree(pidlDesktopDirectory); - pidlDesktopDirectory = NULL; - } - - if (pidlDesktop != NULL) - { - ILFree(pidlDesktop); - pidlDesktop = NULL; - } -} - -HRESULT CDesktopBrowser::Initialize(HWND hWndx, IShellDesktopTray *ShellDeskx) -{ - CComPtr<IShellFolder> psfDesktopFolder; - CSFV csfv; - HRESULT hRet; - - hWnd = hWndx; - ShellDesk = ShellDeskx; - ShellDesk->AddRef(); - - pidlDesktopDirectory = SHCloneSpecialIDList(hWnd, CSIDL_DESKTOPDIRECTORY, FALSE); - hRet = SHGetSpecialFolderLocation(hWnd, CSIDL_DESKTOP, &pidlDesktop); - if (FAILED(hRet)) - return hRet; - - hRet = SHGetDesktopFolder(&psfDesktopFolder); - if (FAILED(hRet)) - return hRet; - - ZeroMemory(&csfv, sizeof(csfv)); - csfv.cbSize = sizeof(csfv); - csfv.pshf = psfDesktopFolder; - csfv.psvOuter = NULL; - - hRet = SHCreateShellFolderViewEx(&csfv, &DesktopView); - - return hRet; -} - -static CDesktopBrowser *SHDESK_Create(HWND hWnd, LPCREATESTRUCT lpCreateStruct) -{ - IShellDesktopTray *ShellDesk; - CComObject<CDesktopBrowser> *pThis; - HRESULT hRet; - - ShellDesk = static_cast<IShellDesktopTray *>(lpCreateStruct->lpCreateParams); - if (ShellDesk == NULL) - { - WARN("No IShellDesk interface provided!"); - return NULL; - } - - pThis = new CComObject<CDesktopBrowser>; - if (pThis == NULL) - return NULL; - pThis->AddRef(); - - hRet = pThis->Initialize(hWnd, ShellDesk); - if (FAILED(hRet)) - { - pThis->Release(); - return NULL; - } - - return pThis; -} - -HWND CDesktopBrowser::FindDesktopListView() -{ - return FindWindowExW(hWndShellView, NULL, WC_LISTVIEW, NULL); -} - -BOOL CDesktopBrowser::CreateDeskWnd() -{ - FOLDERSETTINGS fs; - RECT rcClient; - HRESULT hRet; - - if (!GetClientRect(hWnd, &rcClient)) - { - return FALSE; - } - - fs.ViewMode = FVM_ICON; - fs.fFlags = FWF_DESKTOP | FWF_NOCLIENTEDGE | FWF_NOSCROLL | FWF_TRANSPARENT; - hRet = DesktopView->CreateViewWindow(NULL, &fs, static_cast<IShellBrowser *>(this), &rcClient, &hWndShellView); - if (!SUCCEEDED(hRet)) - return FALSE; - - SetShellWindowEx(hWnd, FindDesktopListView()); - -#if 1 - /* A windows 8 specific hack */ - ::ShowWindow(hWndShellView, SW_SHOW); - ::ShowWindow(FindDesktopListView(), SW_SHOW); -#endif - - return TRUE; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetWindow(HWND *phwnd) -{ - if (hWnd != NULL) - { - *phwnd = hWnd; - return S_OK; - } - - *phwnd = NULL; - return E_UNEXPECTED; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::ContextSensitiveHelp(BOOL fEnterMode) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetMenuSB(HMENU hmenuShared, HOLEMENU holemenuRes, HWND hwndActiveObject) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::RemoveMenusSB(HMENU hmenuShared) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetStatusTextSB(LPCOLESTR lpszStatusText) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::EnableModelessSB(BOOL fEnable) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, WORD wID) -{ - return S_FALSE; -} - -typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) -{ - /* FIXME: Implement executing filebrowser.exe and somehow pass the pidl to it */ - - /* Returning failure here will make windows 7 and 8 to use the default file browser */ - return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) -{ - return E_NOTIMPL; -} - -HWND CDesktopBrowser::DesktopGetWindowControl(IN UINT id) -{ - switch (id) - { - case FCW_TOOLBAR: - case FCW_STATUS: - case FCW_TREE: - case FCW_PROGRESS: - return NULL; - - default: - return NULL; - } - -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetControlWindow(UINT id, HWND *lphwnd) -{ - HWND hWnd; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *lphwnd = hWnd; - return S_OK; - } - - *lphwnd = NULL; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) -{ - HWND hWnd; - - if (pret == NULL) - return E_POINTER; - - hWnd = DesktopGetWindowControl(id); - if (hWnd != NULL) - { - *pret = SendMessageW(hWnd, uMsg, wParam, lParam); - return S_OK; - } - - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryActiveShellView(IShellView **ppshv) -{ - *ppshv = DesktopView; - if (DesktopView != NULL) - DesktopView->AddRef(); - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnViewWindowActive(IShellView *ppshv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnDefaultCommand(IShellView *ppshv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::OnStateChange(IShellView *ppshv, ULONG uChange) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::IncludeObject(IShellView *ppshv, LPCITEMIDLIST pidl) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CDesktopBrowser::QueryService(REFGUID guidService, REFIID riid, PVOID *ppv) -{ - /* FIXME - handle guidService */ - return QueryInterface(riid, ppv); -} - -BOOL CDesktopBrowser::MessageLoop() -{ - MSG Msg; - BOOL bRet; - - while ((bRet = GetMessageW(&Msg, NULL, 0, 0)) != 0) - { - if (bRet != -1) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } - } - - return TRUE; -} - -LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) -{ - CDesktopBrowser *pThis = NULL; - LRESULT Ret = FALSE; - - if (uMsg != WM_NCCREATE) - { - pThis = reinterpret_cast<CDesktopBrowser*>(GetWindowLongPtrW(hwnd, 0)); - if (pThis == NULL) - goto DefMsgHandler; - } - - if (pThis != NULL || uMsg == WM_NCCREATE) - { - switch (uMsg) - { - case WM_ERASEBKGND: - return (LRESULT) PaintDesktop(reinterpret_cast<HDC>(wParam)); - - case WM_GETISHELLBROWSER: - Ret = reinterpret_cast<LRESULT>(static_cast<IShellBrowser *>(pThis)); - break; - - case WM_SIZE: - if (wParam == SIZE_MINIMIZED) - { - /* Hey, we're the desktop!!! */ - ShowWindow(hwnd, - SW_RESTORE); - } - else - { - - /* FIXME: Update work area */ -#if 0 - RECT rcDesktop; - - rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); -#endif - } - break; - - case WM_SYSCOLORCHANGE: - case WM_SETTINGCHANGE: - { - if (uMsg == WM_SYSCOLORCHANGE || wParam == SPI_SETDESKWALLPAPER || wParam == 0) - { - if (pThis->hWndShellView != NULL) - { - /* Forward the message */ - SendMessageW(pThis->hWndShellView, - uMsg, - wParam, - lParam); - } - } - break; - } - - case WM_CREATE: - { - pThis->ShellDesk->RegisterDesktopWindow(pThis->hWnd); - - if (!pThis->CreateDeskWnd()) - WARN("Could not create the desktop view control!\n"); - break; - } - - case WM_NCCREATE: - { - LPCREATESTRUCT CreateStruct = reinterpret_cast<LPCREATESTRUCT>(lParam); - pThis = SHDESK_Create(hwnd, CreateStruct); - if (pThis == NULL) - { - WARN("Failed to create desktop structure\n"); - break; - } - - SetWindowLongPtrW(hwnd, - 0, - reinterpret_cast<LONG_PTR>(pThis)); - Ret = TRUE; - break; - } - - case WM_NCDESTROY: - { - pThis->Release(); - break; - } - - default: - DefMsgHandler : - Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); - break; - } - } - - return Ret; -} - -static BOOL -RegisterProgmanWindowClass(VOID) -{ - WNDCLASSW wcProgman; - - wcProgman.style = CS_DBLCLKS; - wcProgman.lpfnWndProc = CDesktopBrowser::ProgmanWindowProc; - wcProgman.cbClsExtra = 0; - wcProgman.cbWndExtra = sizeof(CDesktopBrowser *); - wcProgman.hInstance = shell32_hInstance; - wcProgman.hIcon = NULL; - wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW); - wcProgman.hbrBackground = NULL; - wcProgman.lpszMenuName = NULL; - wcProgman.lpszClassName = szProgmanClassName; - - return RegisterClassW(&wcProgman) != 0; -} - - -/************************************************************************* - * SHCreateDesktop [SHELL32.200] - * - */ -HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) -{ - HWND hWndDesk; - RECT rcDesk; - - if (ShellDesk == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - if (RegisterProgmanWindowClass() == 0) - { - WARN("Failed to register the Progman window class!\n"); - return NULL; - } - - rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN); - rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - rcDesk.right = rcDesk.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); - rcDesk.bottom = rcDesk.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); - - if (IsRectEmpty(&rcDesk)) - { - rcDesk.left = rcDesk.top = 0; - rcDesk.right = GetSystemMetrics(SM_CXSCREEN); - rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN); - } - - hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom, - NULL, NULL, shell32_hInstance, reinterpret_cast<LPVOID>(ShellDesk)); - if (hWndDesk != NULL) - return (HANDLE) GetWindowLongPtrW(hWndDesk, 0); - - return NULL; -} - -/************************************************************************* - * SHCreateDesktop [SHELL32.201] - * - */ -BOOL WINAPI SHDesktopMessageLoop(HANDLE hDesktop) -{ - CDesktopBrowser *Desk = reinterpret_cast<CDesktopBrowser *>(hDesktop); - - if (Desk == NULL || Desk->Tag != SHDESK_TAG) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - return Desk->MessageLoop(); -} Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -8,14 +8,12 @@ list(APPEND SOURCE CBandSite.cpp - CDesktopBrowser.cpp CMenuBand.cpp CMenuDeskBar.cpp CMenuFocusManager.cpp CMenuSite.cpp CMenuToolbars.cpp CMergedFolder.cpp - CStartMenu.cpp - ShellDDE.cpp) + CStartMenu.cpp) add_library(shellmenu ${SOURCE}) Removed: trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp (removed) @@ -1,411 +0,0 @@ -/* - * Shell DDE Handling - * - * Copyright 2004 Robert Shearman - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "shellmenu.h" -#include <ddeml.h> -#include <strsafe.h> -#include <shlwapi_undoc.h> - -/* WARNING: Although this is a functional implementation of the DDE parsing, the handlers are not implemented here. -The actual working implementation is in shell32 instead. */ - -WINE_DEFAULT_DEBUG_CHANNEL(shelldde); - -typedef DWORD(CALLBACK * pfnCommandHandler)(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS); - -struct DDECommandHandler -{ - WCHAR Command[32]; - pfnCommandHandler Handler; -}; - -extern DDECommandHandler HandlerList []; -extern const int HandlerListLength; - -/* DDE Instance ID */ -static DWORD dwDDEInst; - -/* String handles */ -static HSZ hszProgmanTopic; -static HSZ hszProgmanService; -static HSZ hszShell; -static HSZ hszAppProperties; -static HSZ hszFolders; - -static BOOL bInitialized; - -static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); - - return TRUE; -} - -static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); -} - -static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szService[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - - TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); - - return FALSE; -} - -static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szItem[MAX_PATH]; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); - - TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); - - return NULL; -} - -static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) -{ - LPITEMIDLIST ret = NULL; - - // Ensure it really is an IDLIST-formatted parameter - // Format for IDLIST params: ":pid:shared" - if (*strField != L':') - return NULL; - - HANDLE hData = (HANDLE) StrToIntW(strField + 1); - PWSTR strSecond = StrChrW(strField + 1, L':'); - - if (strSecond) - { - int pid = StrToIntW(strSecond + 1); - void* pvShared = SHLockShared(hData, pid); - if (pvShared) - { - ret = ILClone((LPCITEMIDLIST) pvShared); - SHUnlockShared(pvShared); - SHFreeShared(hData, pid); - } - } - return ret; -} - -static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) -{ - WCHAR szTopic[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WCHAR *pszCommand; - - DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - - pszCommand = (WCHAR*) DdeAccessData(hdata, NULL); - if (!pszCommand) - return DDE_FNOTPROCESSED; - - StringCchCopyW(szCommand, _countof(szCommand), pszCommand); - - DdeUnaccessData(hdata); - - TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); - - /* - [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode - [ExploreFolder("%l", %I, %S)] -- Open a folder in "explore" mode (file tree is shown to the left by default) - [FindFolder("%l", %I)] -- Open a folder in "find" mode (search panel is shown to the left by default) - [ShellFile("%1","%1",%S)] -- Execute the contents of the specified .SCF file - - Approximate grammar (Upper names define rules, <lower> names define terminals, single-quotes are literals): - - Rules - Command = ('[' Function ']') | Function - Function = <identifier> '(' Parameters ')' - Parameters = (<quoted-string> (',' <idlist> (',' <number>)?)?)? - - Terminals - <identifier> = [a-zA-Z]+ - <quoted-string> = \"([^\"]|\\.)\" - <idlist> = \:[0-9]+\:[0-9]+ - <number> = [0-9]+ - */ - - WCHAR Command[MAX_PATH] = L""; - WCHAR Path[MAX_PATH] = L""; - LPITEMIDLIST IdList = NULL; - INT UnknownParameter = 0; - - // Simplified parsing (assumes the command will not be TOO broken): - - PWSTR cmd = szCommand; - // 1. if starts with [, skip first char - if (*cmd == L'[') - cmd++; - - if (*cmd == L']') - { - ERR("Empty command. Nothing to run.\n"); - return DDE_FNOTPROCESSED; - } - - // Read until first (, and take text before ( as command name - { - PWSTR cmdEnd = StrChrW(cmd, L'('); - - if (!cmdEnd) - { - ERR("Could not find '('. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - *cmdEnd = 0; - - StringCchCopy(Command, _countof(Command), cmd); - - cmd = cmdEnd + 1; - } - - // Read first param after (, expecting quoted string - if (*cmd != L')') - { - // Copy unescaped string - PWSTR dst = Path; - BOOL isQuote = FALSE; - - PWSTR arg = cmd; - - while (*arg && (isQuote || *arg != L',')) - { - if (*arg == L'"') - { - isQuote = !isQuote; - if (isQuote && arg != cmd) // do not copy the " at the beginning of the string - { - *(dst++) = L'"'; - } - } - else - { - *(dst++) = *arg; - } - - arg++; - } - - cmd = arg + 1; - - while (*cmd == L' ') - cmd++; - } - - // Read second param, expecting an idlist in shared memory - if (*cmd != L')') - { - if (*cmd != ':') - { - ERR("Expected ':'. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - PWSTR idlistEnd = StrChrW(cmd, L','); - - if (!idlistEnd) - idlistEnd = StrChrW(cmd, L')'); - - if (!idlistEnd) - { - ERR("Expected ',' or ')'. Invalid command.\n"); - return DDE_FNOTPROCESSED; - } - - IdList = _ILReadFromSharedMemory(cmd); - - cmd = idlistEnd + 1; - } - - // Read third param, expecting an integer - if (*cmd != L')') - { - UnknownParameter = StrToIntW(cmd); - } - - TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); - - // Find handler in list - for (int i = 0; i < HandlerListLength; i++) - { - DDECommandHandler & handler = HandlerList[i]; - if (StrCmpW(handler.Command, Command) == 0) - { - return handler.Handler(Command, Path, IdList, UnknownParameter); - } - } - - // No handler found - ERR("Unknown command %S\n", Command); - return DDE_FNOTPROCESSED; -} - -static void Dde_OnDisconnect(HCONV hconv) -{ - TRACE("Dde_OnDisconnect: hconv=%p\n", hconv); -} - -static HDDEDATA CALLBACK DdeCallback( - UINT uType, - UINT uFmt, - HCONV hconv, - HSZ hsz1, - HSZ hsz2, - HDDEDATA hdata, - ULONG_PTR dwData1, - ULONG_PTR dwData2) -{ - switch (uType) - { - case XTYP_CONNECT: - return (HDDEDATA) (DWORD_PTR) Dde_OnConnect(hsz1, hsz2); - case XTYP_CONNECT_CONFIRM: - Dde_OnConnectConfirm(hconv, hsz1, hsz2); - return NULL; - case XTYP_WILDCONNECT: - return (HDDEDATA) (DWORD_PTR) Dde_OnWildConnect(hsz1, hsz2); - case XTYP_REQUEST: - return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); - case XTYP_EXECUTE: - return (HDDEDATA) (DWORD_PTR) Dde_OnExecute(hconv, hsz1, hdata); - case XTYP_DISCONNECT: - Dde_OnDisconnect(hconv); - return NULL; - case XTYP_REGISTER: - return NULL; - default: - TRACE("DdeCallback: unknown uType=%d\n", uType); - return NULL; - } -} -/************************************************************************* - * ShellDDEInit (SHELL32.@) - * - * Registers the Shell DDE services with the system so that applications - * can use them. - * - * PARAMS - * bInit [I] TRUE to initialize the services, FALSE to uninitialize. - * - * RETURNS - * Nothing. - */ -EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) -{ - TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); - - if (bInit && !bInitialized) - { - DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); - - hszProgmanTopic = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); - hszProgmanService = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); - hszShell = DdeCreateStringHandleW(dwDDEInst, L"Shell", CP_WINUNICODE); - hszAppProperties = DdeCreateStringHandleW(dwDDEInst, L"AppProperties", CP_WINUNICODE); - hszFolders = DdeCreateStringHandleW(dwDDEInst, L"Folders", CP_WINUNICODE); - - if (hszProgmanTopic && hszProgmanService && - hszShell && hszAppProperties && hszFolders && - DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER) && - DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER) && - DdeNameService(dwDDEInst, hszShell, 0, DNS_REGISTER)) - { - bInitialized = TRUE; - } - } - else if (!bInit && bInitialized) - { - /* unregister all services */ - DdeNameService(dwDDEInst, 0, 0, DNS_UNREGISTER); - - if (hszFolders) - DdeFreeStringHandle(dwDDEInst, hszFolders); - if (hszAppProperties) - DdeFreeStringHandle(dwDDEInst, hszAppProperties); - if (hszShell) - DdeFreeStringHandle(dwDDEInst, hszShell); - if (hszProgmanService) - DdeFreeStringHandle(dwDDEInst, hszProgmanService); - if (hszProgmanTopic) - DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); - - DdeUninitialize(dwDDEInst); - - bInitialized = FALSE; - } -} - -static DWORD CALLBACK DDE_OnViewFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FACK; -} - -static DWORD CALLBACK DDW_OnExploreFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FACK; -} - -static DWORD CALLBACK DDE_OnFindFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FNOTPROCESSED; -} - -static DWORD CALLBACK DDE_OnShellFile(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) -{ - UNIMPLEMENTED; - return DDE_FNOTPROCESSED; -} - -DDECommandHandler HandlerList [] = { - - { L"ViewFolder", DDE_OnViewFolder }, - { L"ExploreFolder", DDW_OnExploreFolder }, - { L"FindFolder", DDE_OnFindFolder }, - { L"ShellFile", DDE_OnShellFile } -}; - -const int HandlerListLength = _countof(HandlerList); Modified: trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] Wed Aug 19 13:51:20 2015 @@ -69,8 +69,6 @@ #pragma warning(pop) #endif -extern HINSTANCE shell32_hInstance; - extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv);

1 0

[gadamopoulos] 68768: [SHELL32] - Add a CDefView_Constructor that lets us keep the code simple for the shell folders.
by gadamopoulos＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: gadamopoulos Date: Wed Aug 19 12:09:21 2015 New Revision: 68768 URL: http://svn.reactos.org/svn/reactos?rev=68768&view=rev Log: [SHELL32] - Add a CDefView_Constructor that lets us keep the code simple for the shell folders. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h 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] Wed Aug 19 12:09:21 2015 @@ -3110,3 +3110,8 @@ { return ShellObjectCreatorInit<CDefView>(pFolder, IID_IShellView, newView); } + +HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut) +{ + return ShellObjectCreatorInit<CDefView>(pFolder, riid, ppvOut); +} Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -440,10 +440,7 @@ WARN("IContextMenu not implemented\n"); hr = E_NOTIMPL; } else if (IsEqualIID(riid, IID_IShellView)) { - hr = IShellView_Constructor((IShellFolder *)this, &pShellView); - if (pShellView) { - hr = pShellView->QueryInterface(riid, ppvOut); - } + hr = CDefView_Constructor(this, riid, ppvOut); } } TRACE("--(%p)->(interface=%p)\n", this, ppvOut); Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -323,11 +323,7 @@ } else if (IsEqualIID(riid, IID_IShellView)) { - hr = IShellView_Constructor ((IShellFolder *)this, &pShellView); - if (pShellView) - { - hr = pShellView->QueryInterface(riid, ppvOut); - } + hr = CDefView_Constructor(this, riid, ppvOut); } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); return hr; Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -345,11 +345,7 @@ } else if (IsEqualIID (riid, IID_IShellView)) { - hr = IShellView_Constructor ((IShellFolder *)this, &pShellView); - if (pShellView) - { - hr = pShellView->QueryInterface(riid, ppvOut); - } + hr = CDefView_Constructor(this, riid, ppvOut); } } TRACE("-- (%p)->(interface=%p)\n", this, ppvOut); Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -158,11 +158,7 @@ } else if (IsEqualIID(riid, IID_IShellView)) { - hr = IShellView_Constructor((IShellFolder *)this, &pShellView); - if (pShellView) - { - hr = pShellView->QueryInterface(riid, ppvOut); - } + hr = CDefView_Constructor(this, riid, ppvOut); } TRACE("-- (%p)->(interface=%p)\n", this, ppvOut); return hr; Modified: trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -426,11 +426,7 @@ } else if(IsEqualIID(riid, IID_IShellView)) { - hr = IShellView_Constructor((IShellFolder *)this, &pShellView); - if (pShellView) - { - hr = pShellView->QueryInterface(riid, ppvOut); - } + hr = CDefView_Constructor(this, riid, ppvOut); } TRACE ("-- (%p)->(interface=%p)\n", this, ppvOut); return hr; Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -528,11 +528,7 @@ } else if (IsEqualIID (riid, IID_IShellView)) { - hr = IShellView_Constructor ((IShellFolder *)this, &pShellView); - if (pShellView) - { - hr = pShellView->QueryInterface(riid, ppv); - } + hr = CDefView_Constructor(this, riid, ppv); } else return hr; Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Wed Aug 19 12:09:21 2015 @@ -70,6 +70,7 @@ IContextMenu2 * ISvStaticItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *apidl, UINT cidl, HKEY hKey); IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop); HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView); +HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut); HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV);

1 0

[tfaber] 68767: [SHELL32] - Correctly handle NULL callback in CMenuBand::GetMenuInfo - Add missing error handling in CMenuFocusManager::UpdateFocus Fixes crashes in shell32_apitest:menu CORE-9932 #...
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 11:45:21 2015 New Revision: 68767 URL: http://svn.reactos.org/svn/reactos?rev=68767&view=rev Log: [SHELL32] - Correctly handle NULL callback in CMenuBand::GetMenuInfo - Add missing error handling in CMenuFocusManager::UpdateFocus Fixes crashes in shell32_apitest:menu CORE-9932 #resolve Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Wed Aug 19 11:45:21 2015 @@ -108,7 +108,8 @@ if (ppsmc) { - m_psmc->AddRef(); + if (m_psmc) + m_psmc->AddRef(); *ppsmc = m_psmc; } Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] Wed Aug 19 11:45:21 2015 @@ -814,14 +814,22 @@ CComPtr<IServiceProvider> bandSite; CComPtr<IOleWindow> deskBar; hr = topMenu->mb->GetSite(IID_PPV_ARG(IServiceProvider, &bandSite)); + if (FAILED(hr)) + goto NoCapture; hr = bandSite->QueryService(SID_SMenuPopup, IID_PPV_ARG(IOleWindow, &deskBar)); + if (FAILED(hr)) + goto NoCapture; CComPtr<IOleWindow> deskBarSite; hr = IUnknown_GetSite(deskBar, IID_PPV_ARG(IOleWindow, &deskBarSite)); + if (FAILED(hr)) + goto NoCapture; // FIXME: Find the correct place for this HWND hWndOwner; - deskBarSite->GetWindow(&hWndOwner); + hr = deskBarSite->GetWindow(&hWndOwner); + if (FAILED(hr)) + goto NoCapture; m_PreviousForeground = ::GetForegroundWindow(); if (m_PreviousForeground != hWndOwner) @@ -832,9 +840,11 @@ // Get the HWND of the top-level window HWND hWndSite; hr = deskBar->GetWindow(&hWndSite); + if (FAILED(hr)) + goto NoCapture; SetMenuCapture(hWndSite); - - } + } +NoCapture: if (!m_parent || m_parent->type == MenuBarEntry) {

1 0

[tfaber] 68766: [RSHELL] - Remove from CD images. Explorer can use shell32 now. CORE-9892 #resolve
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 11:24:20 2015 New Revision: 68766 URL: http://svn.reactos.org/svn/reactos?rev=68766&view=rev Log: [RSHELL] - Remove from CD images. Explorer can use shell32 now. CORE-9892 #resolve Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMakeLis… ============================================================================== --- trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] Wed Aug 19 11:24:20 2015 @@ -35,8 +35,6 @@ kernel32 ntdll) -add_cd_file(TARGET rshell DESTINATION reactos FOR all) - add_custom_command(TARGET rshell POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:rshell>"

1 0

[tfaber] 68765: [RSHELL] - Addendum to r68764 CORE-9892
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 11:18:13 2015 New Revision: 68765 URL: http://svn.reactos.org/svn/reactos?rev=68765&view=rev Log: [RSHELL] - Addendum to r68764 CORE-9892 Modified: trunk/reactos/base/shell/rshell/misc.cpp Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Wed Aug 19 11:18:13 2015 @@ -19,6 +19,8 @@ */ #include "shellmenu.h" + +HINSTANCE shell32_hInstance = NULL; DWORD WINAPI WinList_Init(void) {

1 0

[tfaber] 68764: [SHELL32] - Use and register the shellmenu (former rshell) classes instead of the outdated copies in shell32 CORE-9892
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 11:17:08 2015 New Revision: 68764 URL: http://svn.reactos.org/svn/reactos?rev=68764&view=rev Log: [SHELL32] - Use and register the shellmenu (former rshell) classes instead of the outdated copies in shell32 CORE-9892 Added: trunk/reactos/dll/win32/shell32/res/rgs/mergedfolder.rgs (with props) trunk/reactos/dll/win32/shell32/res/rgs/rebarbandsite.rgs (with props) Removed: trunk/reactos/dll/win32/shell32/CMenuBand.cpp trunk/reactos/dll/win32/shell32/CMenuBand.h trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/CMenuDeskBar.h trunk/reactos/dll/win32/shell32/CStartMenu.cpp trunk/reactos/dll/win32/shell32/CStartMenu.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/iconcache.cpp trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.h trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.h trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -18,8 +18,6 @@ ${REACTOS_SOURCE_DIR}) list(APPEND SOURCE - CMenuBand.cpp - CMenuDeskBar.cpp CIDLDataObj.cpp CQueryAssociations.cpp dde.cpp @@ -60,7 +58,6 @@ CDefaultContextMenu.cpp COpenWithMenu.cpp CNewMenu.cpp - CStartMenu.cpp precomp.h) add_library(shell32 SHARED @@ -85,8 +82,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) -target_link_libraries(shell32 atlnew wine uuid recyclebin) -add_delay_importlibs(shell32 ole32 userenv version fmifs) +target_link_libraries(shell32 shellmenu atlnew wine uuid recyclebin) +add_delay_importlibs(shell32 uxtheme ole32 userenv version fmifs) add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/shell32/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp (removed) @@ -1,600 +0,0 @@ -/* - * PROJECT: shell32 - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shell32/CMenuBand.c - * PURPOSE: menu band implementation - * PROGRAMMERS: Giannis Adamopoulos (gadamopoulos(a)reactos.org) - */ - -#include "precomp.h" - -#include <windowsx.h> - -WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); - - -BOOL -AllocAndGetMenuString(HMENU hMenu, UINT ItemIDByPosition, WCHAR** String) -{ - int Length; - - Length = GetMenuStringW(hMenu, ItemIDByPosition, NULL, 0, MF_BYPOSITION); - - if(!Length) - return FALSE; - - /* Also allocate space for the terminating NULL character */ - ++Length; - *String = (PWSTR)HeapAlloc(GetProcessHeap(), 0, Length * sizeof(WCHAR)); - - GetMenuStringW(hMenu, ItemIDByPosition, *String, Length, MF_BYPOSITION); - - return TRUE; -} - -CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) -{ - m_menuBand = menuBand; - - - m_menuBand = NULL; - m_hwnd = NULL; - m_hmenu = NULL; - m_hwndOwner = NULL; - m_dwMenuFlags = NULL; -} - -HRESULT CMenuStaticToolbar::GetMenu( - HMENU *phmenu, - HWND *phwnd, - DWORD *pdwFlags) -{ - *phmenu = m_hmenu; - *phwnd = m_hwndOwner; - *pdwFlags = m_dwMenuFlags; - - return S_OK; -} - -HRESULT CMenuStaticToolbar::SetMenu( - HMENU hmenu, - HWND hwnd, - DWORD dwFlags) -{ - if (!hwnd) - return E_FAIL; - - m_hmenu = hmenu; - m_hwndOwner = hwnd; - m_dwMenuFlags = dwFlags; - - return S_OK; -} - -HRESULT CMenuStaticToolbar::ShowWindow(BOOL fShow) -{ - ::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE); - - return S_OK; -} - -HRESULT CMenuStaticToolbar::Close() -{ - DestroyWindow(m_hwnd); - m_hwnd = NULL; - return S_OK; -} - -HRESULT CMenuStaticToolbar::CreateToolbar(HWND hwndParent, DWORD dwFlags) -{ - HWND hwndToolbar; - hwndToolbar = CreateWindowEx(TBSTYLE_EX_DOUBLEBUFFER, TOOLBARCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | - CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP, 0, 0, 500, 20, m_hwndOwner, NULL, - _AtlBaseModule.GetModuleInstance(), 0); - if (hwndToolbar == NULL) - return E_FAIL; - - ::SetParent(hwndToolbar, hwndParent); - - m_hwnd = hwndToolbar; - - /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ - SendMessageW(m_hwnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - - if (dwFlags & SMINIT_TOPLEVEL) - { - /* Hide the placeholders for the button images */ - SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); - } - - return S_OK; -} - -HRESULT CMenuStaticToolbar::FillToolbar() -{ - TBBUTTON tbb = {0}; - int i; - PWSTR MenuString; - - tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = BTNS_DROPDOWN | BTNS_AUTOSIZE; - - for(i = 0; i < GetMenuItemCount(m_hmenu); i++) - { - if(!AllocAndGetMenuString(m_hmenu, i, &MenuString)) - return E_OUTOFMEMORY; - - tbb.idCommand = i; - tbb.iString = (INT_PTR)MenuString; - - SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, (LPARAM)(LPTBBUTTON)&tbb); - HeapFree(GetProcessHeap(), 0, MenuString); - } - - return S_OK; -} - -HRESULT CMenuStaticToolbar::GetWindow(HWND *phwnd) -{ - if (!phwnd) - return E_FAIL; - - *phwnd = m_hwnd; - - return S_OK; -} - -CMenuBand::CMenuBand() -{ - m_site = NULL; - m_psmc = NULL; - m_staticToolbar = NULL; -} - -CMenuBand::~CMenuBand() -{ - if (m_site) - m_site->Release(); - - if (m_psmc) - m_psmc->Release(); - - if (m_staticToolbar) - delete m_staticToolbar; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::Initialize( - IShellMenuCallback *psmc, - UINT uId, - UINT uIdAncestor, - DWORD dwFlags) -{ - if(m_psmc) - m_psmc->Release(); - - m_psmc = psmc; - m_uId = uId; - m_uIdAncestor = uIdAncestor; - m_dwFlags = dwFlags; - - if (m_psmc) - m_psmc->AddRef(); - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetMenuInfo( - IShellMenuCallback **ppsmc, - UINT *puId, - UINT *puIdAncestor, - DWORD *pdwFlags) -{ - *ppsmc = m_psmc; - *puId = m_uId; - *puIdAncestor = m_uIdAncestor; - *pdwFlags = m_dwFlags; - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu( - HMENU hmenu, - HWND hwnd, - DWORD dwFlags) -{ - if (m_staticToolbar == NULL) - m_staticToolbar = new CMenuStaticToolbar(this); - - HRESULT hResult = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); - if (FAILED(hResult)) - return hResult; - - if (m_site) - { - HWND hwndParent; - - hResult = m_site->GetWindow(&hwndParent); - if (FAILED(hResult)) - return hResult; - - hResult = m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); - if (FAILED(hResult)) - return hResult; - - hResult = m_staticToolbar->FillToolbar(); - } - - return hResult; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetMenu( - HMENU *phmenu, - HWND *phwnd, - DWORD *pdwFlags) -{ - if (m_staticToolbar == NULL) - return E_FAIL; - - return m_staticToolbar->GetMenu(phmenu, phwnd, pdwFlags); -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite) -{ - HWND hwndParent; - HRESULT hResult; - - if (m_site != NULL) - m_site->Release(); - - if (pUnkSite == NULL) - return S_OK; - - hwndParent = NULL; - hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); - if (SUCCEEDED(hResult)) - { - m_site->GetWindow(&hwndParent); - m_site->Release(); - } - if (!::IsWindow(hwndParent)) - return E_FAIL; - - if (m_staticToolbar != NULL) - { - m_staticToolbar->CreateToolbar(hwndParent, m_dwFlags); - m_staticToolbar->FillToolbar(); - } - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite) -{ - if (m_site == NULL) - return E_FAIL; - - return m_site->QueryInterface(riid, ppvSite); -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow( - HWND *phwnd) -{ - if (m_staticToolbar != NULL) - return m_staticToolbar->GetWindow(phwnd); - - return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo( - DWORD dwBandID, - DWORD dwViewMode, - DESKBANDINFO *pdbi) -{ - SIZE size; - HWND hwnd; - HRESULT hResult; - - /* FIXME */ - if (m_staticToolbar == NULL) - return E_FAIL; - hResult = m_staticToolbar->GetWindow(&hwnd); - if (FAILED(hResult)) - return hResult; - if (hwnd == NULL) - return E_FAIL; - - if (pdbi->dwMask & DBIM_MINSIZE) - { - SendMessageW( hwnd, TB_GETIDEALSIZE, TRUE, (LPARAM)&size); - - pdbi->ptMinSize.x = 0; - pdbi->ptMinSize.y = size.cy; - } - if (pdbi->dwMask & DBIM_MAXSIZE) - { - SendMessageW( hwnd, TB_GETMAXSIZE, 0, (LPARAM)&size); - - pdbi->ptMaxSize.x = size.cx; - pdbi->ptMaxSize.y = size.cy; - } - if (pdbi->dwMask & DBIM_INTEGRAL) - { - pdbi->ptIntegral.x = 0; - pdbi->ptIntegral.y = 0; - } - if (pdbi->dwMask & DBIM_ACTUAL) - { - SendMessageW( hwnd, TB_GETIDEALSIZE, TRUE, (LPARAM)&size); - SendMessageW( hwnd, TB_GETIDEALSIZE, FALSE, (LPARAM)&size); - - pdbi->ptActual.x = size.cx; - pdbi->ptActual.y = size.cy; - } - if (pdbi->dwMask & DBIM_TITLE) - wcscpy(pdbi->wszTitle, L""); - if (pdbi->dwMask & DBIM_MODEFLAGS) - pdbi->dwModeFlags = DBIMF_UNDELETEABLE; - if (pdbi->dwMask & DBIM_BKCOLOR) - pdbi->crBkgnd = 0; - return S_OK; -} - -/* IDockingWindow */ -HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow) -{ - if (m_staticToolbar != NULL) - return m_staticToolbar->ShowWindow(fShow); - - return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) -{ - ShowDW(FALSE); - - if (m_staticToolbar != NULL) - return m_staticToolbar->Close(); - - return S_OK; -} -HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) -{ - UNIMPLEMENTED; - return S_FALSE; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS) -{ - UNIMPLEMENTED; - return S_OK; -} - Removed: trunk/reactos/dll/win32/shell32/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuBand.h (removed) @@ -1,164 +0,0 @@ -#pragma once - -class CMenuBand; - -class CMenuStaticToolbar -{ -public: - CMenuStaticToolbar(CMenuBand *menuBand); - - HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags); - HRESULT FillToolbar(); - HRESULT GetWindow(HWND *phwnd); - HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); - HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); - HRESULT ShowWindow(BOOL fShow); - HRESULT Close(); - -private: - - static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1; - - CMenuBand *m_menuBand; - HWND m_hwnd; - HMENU m_hmenu; - HWND m_hwndOwner; - DWORD m_dwMenuFlags; -}; - -class CMenuBand : - public CComCoClass<CMenuBand, &CLSID_MenuBand>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDeskBand, - public IObjectWithSite, - public IInputObject, - public IPersistStream, - public IOleCommandTarget, - public IServiceProvider, - public IMenuPopup, - public IMenuBand, - public IShellMenu2, - public IWinEventHandler, - public IShellMenuAcc -{ -public: - CMenuBand(); - ~CMenuBand(); - -private: - - IOleWindow *m_site; - CMenuStaticToolbar *m_staticToolbar; - - IShellMenuCallback *m_psmc; - UINT m_uId; - UINT m_uIdAncestor; - DWORD m_dwFlags; -public : - - // *** IDeskBand methods *** - virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); - - // *** IDockingWindow methods *** - virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); - virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); - virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); - - // *** IInputObject methods *** - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); - - // *** IPersistStream methods *** - virtual HRESULT STDMETHODCALLTYPE IsDirty(); - virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); - virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); - virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); - - // *** IPersist methods *** - virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - // *** IMenuPopup methods *** - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); - - // *** IDeskBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); - - // *** IMenuBand methods *** - virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); - virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); - - // *** IShellMenu methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor,DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); - virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); - virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); - virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); - virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); - - // *** IWinEventHandler methods *** - virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); - - // *** IShellMenu2 methods *** - virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); - virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); - virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); - virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); - virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); - - // *** IShellMenuAcc methods *** - virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); - virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); - virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); - virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); - virtual HRESULT STDMETHODCALLTYPE GetState(THIS); - virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); - virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); - -DECLARE_REGISTRY_RESOURCEID(IDR_MENUBAND) -DECLARE_NOT_AGGREGATABLE(CMenuBand) -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CMenuBand) - COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) - COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) - COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) -END_COM_MAP() - -}; Removed: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp (removed) @@ -1,137 +0,0 @@ -#include "precomp.h" - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup( - POINTL *ppt, - RECTL *prcExclude, - MP_POPUPFLAGS dwFlags) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( - DWORD dwSelectType) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu( - IMenuPopup *pmp, - BOOL fSet) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient( - IUnknown *punkClient) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient( - IUnknown **ppunkClient) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB( - RECT *prc) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow( - HWND *phwnd) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp( - BOOL fEnterMode) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite( - IUnknown *pUnkSite) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite( - REFIID riid, - PVOID *ppvSite) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(THIS_ DWORD* piIcon) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(THIS_ HBITMAP* phBitmap) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus( - const GUID *pguidCmdGroup, - ULONG cCmds, - OLECMD prgCmds[], - OLECMDTEXT *pCmdText) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec( - const GUID *pguidCmdGroup, - DWORD nCmdID, - DWORD nCmdexecopt, - VARIANT *pvaIn, - VARIANT *pvaOut) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService( - REFGUID guidService, - REFIID riid, - void **ppvObject) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(THIS_ IUnknown * lpUnknown, BOOL bFocus) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(THIS_ BOOL bActivating, LPMSG lpMsg) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO(THIS) -{ - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(THIS_ LPMSG lpMsg) -{ - return S_OK; -} Removed: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.h (removed) @@ -1,76 +0,0 @@ -#pragma once - -class CMenuDeskBar: - public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IOleCommandTarget, - public IServiceProvider, - public IInputObjectSite, - public IInputObject, - public IMenuPopup, - public IObjectWithSite, - public IBanneredBar, - public IInitializeObject -{ -public: - - // *** IMenuPopup methods *** - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp,BOOL fSet); - - // *** IDeskBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid,PVOID *ppvSite); - - // *** IBanneredBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetIconSize(THIS_ DWORD iIcon); - virtual HRESULT STDMETHODCALLTYPE GetIconSize(THIS_ DWORD* piIcon); - virtual HRESULT STDMETHODCALLTYPE SetBitmap(THIS_ HBITMAP hBitmap); - virtual HRESULT STDMETHODCALLTYPE GetBitmap(THIS_ HBITMAP* phBitmap); - - // *** IInitializeObject methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(THIS); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - // *** IInputObjectSite methods *** - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL bFocus); - - // *** IInputObject methods *** - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(THIS_ BOOL bActivating, LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(THIS_ LPMSG lpMsg); - -DECLARE_REGISTRY_RESOURCEID(IDR_MENUDESKBAR) -DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CMenuDeskBar) - COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar) - COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) -END_COM_MAP() - -}; Removed: trunk/reactos/dll/win32/shell32/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CStartMe… ============================================================================== --- trunk/reactos/dll/win32/shell32/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CStartMenu.cpp (removed) @@ -1,345 +0,0 @@ -/* - * Start menu object - * - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell32start); - -CStartMenu::CStartMenu() : - m_pBandSite(NULL), - m_pUnkSite(NULL) -{ -} - -CStartMenu::~CStartMenu() -{ -} - -HRESULT STDMETHODCALLTYPE CStartMenu::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::GetWindow(HWND *phwnd) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::GetClient(IUnknown **ppunkClient) -{ - TRACE("(%p, %p)\n", this, ppunkClient); - - *ppunkClient = (IUnknown*)m_pBandSite; - (*ppunkClient)->AddRef(); - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::OnPosRectChangeDB(LPRECT prc) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::SetClient(IUnknown *punkClient) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::OnSelect(DWORD dwSelectType) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::SetSubMenu(IMenuPopup *pmp, BOOL fSet) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::SetSite(IUnknown *pUnkSite) -{ - TRACE("(%p, %p)\n", this, pUnkSite); - - if (m_pUnkSite) - m_pUnkSite->Release(); - m_pUnkSite = pUnkSite; - if (m_pUnkSite) - m_pUnkSite->AddRef(); - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::GetSite(REFIID riid, void **ppvSite) -{ - TRACE("(%p, %s, %p)\n", this, debugstr_guid(&riid), ppvSite); - - if (!m_pUnkSite) - return E_FAIL; - - return m_pUnkSite->QueryInterface(riid, ppvSite); -} - -HRESULT STDMETHODCALLTYPE CStartMenu::Initialize() -{ - HRESULT hr; - CComObject<CMenuBandSite> *pBandSiteObj; - - TRACE("(%p)\n", this); - - //pBandSiteObj = new CComObject<CMenuBandSite>(); - ATLTRY (pBandSiteObj = new CComObject<CMenuBandSite>); - if (pBandSiteObj == NULL) - return E_OUTOFMEMORY; - - hr = pBandSiteObj->QueryInterface(IID_PPV_ARG(IBandSite, &m_pBandSite)); - if (FAILED(hr)) - return NULL; - - return m_pBandSite->AddBand((IMenuBand*)this); -} - -HRESULT STDMETHODCALLTYPE CStartMenu::IsMenuMessage(MSG *pmsg) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CStartMenu::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -CMenuBandSite::CMenuBandSite() : - m_pObjects(NULL), - m_cObjects(0) -{ -} - -CMenuBandSite::~CMenuBandSite() -{ -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::AddBand(IUnknown *punk) -{ - IUnknown **pObjects; - - TRACE("punk %p\n", punk); - - if (!punk) - return E_FAIL; - - pObjects = (IUnknown**)CoTaskMemAlloc(sizeof(IUnknown*) * (m_cObjects + 1)); - if (!pObjects) - return E_FAIL; - - RtlMoveMemory(pObjects, m_pObjects, sizeof(IUnknown*) * m_cObjects); - - CoTaskMemFree(m_pObjects); - - m_pObjects = pObjects; - - m_pObjects[m_cObjects] = punk; - punk->AddRef(); - - m_cObjects++; - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::EnumBands(UINT uBand, DWORD *pdwBandID) -{ - ULONG Index, ObjectCount; - - TRACE("uBand %uu pdwBandID %p\n", uBand, pdwBandID); - - if (uBand == (UINT)-1) - return m_cObjects; - - ObjectCount = 0; - - for (Index = 0; Index < m_cObjects; Index++) - { - if (m_pObjects[Index] != NULL) - { - if (uBand == ObjectCount) - { - *pdwBandID = Index; - return S_OK; - } - ObjectCount++; - } - } - return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::RemoveBand(DWORD dwBandID) -{ - TRACE("dwBandID %u\n", dwBandID); - - if (m_cObjects <= dwBandID) - return E_FAIL; - - if (m_pObjects[dwBandID]) - { - m_pObjects[dwBandID]->Release(); - m_pObjects[dwBandID] = NULL; - } - - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) -{ - TRACE("dwBandID %u riid %p ppv %p\n", dwBandID, riid, ppv); - - if (m_cObjects <= dwBandID) - return E_FAIL; - - if (m_pObjects[dwBandID]) - { - return m_pObjects[dwBandID]->QueryInterface(riid, ppv); - } - - return E_FAIL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::GetBandSiteInfo(BANDSITEINFO *pbsinfo) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::GetWindow(HWND *phwnd) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::ContextSensitiveHelp(BOOL fEnterMode) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::SetDeskBarSite(IUnknown *punkSite) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::SetModeDBC(DWORD dwMode) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::UIActivateDBC(DWORD dwState) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::GetSize(DWORD dwWhich, LPRECT prc) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::HasFocusIO() -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::TranslateAcceleratorIO(LPMSG lpMsg) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::OnWinEvent(HWND paramC, UINT param10, WPARAM param14, LPARAM param18, LRESULT *param1C) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::IsWindowOwner(HWND paramC) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CMenuBandSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} Removed: trunk/reactos/dll/win32/shell32/CStartMenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CStartMe… ============================================================================== --- trunk/reactos/dll/win32/shell32/CStartMenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CStartMenu.h (removed) @@ -1,155 +0,0 @@ -/* - * Start menu object - * - * Copyright 2009 Andrew Hill - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef _STARTMENU_H_ -#define _STARTMENU_H_ - -class CStartMenu : - public CComCoClass<CStartMenu, &CLSID_StartMenu>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IMenuPopup, - public IObjectWithSite, - public IInitializeObject, - public IMenuBand // FIXME -{ -private: - IBandSite *m_pBandSite; - IUnknown *m_pUnkSite; - -public: - CStartMenu(); - ~CStartMenu(); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - - // *** IDeskBar methods *** - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); - - // *** IMenuPopup methods *** - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); - - // *** IInitializeObject methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(); - - // *** IMenuBand methods *** FIXME - virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); - virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); - -DECLARE_REGISTRY_RESOURCEID(IDR_STARTMENU) -DECLARE_NOT_AGGREGATABLE(CStartMenu) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CStartMenu) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IDeskBar) - COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) - COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) // FIXME: Win does not export it -END_COM_MAP() -}; - -class CMenuBandSite : - public CComCoClass<CMenuBandSite, &CLSID_MenuBandSite>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IBandSite, - public IDeskBarClient, - public IOleCommandTarget, - public IInputObject, - public IInputObjectSite, - public IWinEventHandler, - public IServiceProvider -{ -private: - IUnknown **m_pObjects; - ULONG m_cObjects; - -public: - CMenuBandSite(); - ~CMenuBandSite(); - - // *** IBandSite methods *** - virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown *punk); - virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD *pdwBandID); - virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName); - virtual HRESULT STDMETHODCALLTYPE SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState); - virtual HRESULT STDMETHODCALLTYPE RemoveBand(DWORD dwBandID); - virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv); - virtual HRESULT STDMETHODCALLTYPE SetBandSiteInfo(const BANDSITEINFO *pbsinfo); - virtual HRESULT STDMETHODCALLTYPE GetBandSiteInfo(BANDSITEINFO *pbsinfo); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IDeskBarClient methods *** - virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite); - virtual HRESULT STDMETHODCALLTYPE SetModeDBC(DWORD dwMode); - virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState); - virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IInputObject methods *** - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); - - // *** IInputObjectSite methods *** - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); - - // *** IWinEventHandler methods *** - virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND paramC, UINT param10, WPARAM param14, LPARAM param18, LRESULT *param1C); - virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND paramC); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - -DECLARE_REGISTRY_RESOURCEID(IDR_MENUBANDSITE) -DECLARE_NOT_AGGREGATABLE(CMenuBandSite) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CMenuBandSite) - COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) -END_COM_MAP() -}; - -#endif /* _STARTMENU_H_ */ Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -845,6 +845,11 @@ return Shell_GetCachedImageIndexA((LPCSTR)szPath, nIndex, bSimulateDoc); } +EXTERN_C INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc) +{ + return Shell_GetCachedImageIndexAW(szPath, nIndex, bSimulateDoc); +} + /************************************************************************* * ExtractIconExW [SHELL32.@] * RETURNS Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -26,6 +26,7 @@ #include <strsafe.h> #include <atlbase.h> #include <atlcom.h> +#include <atlwin.h> #include <powrprof.h> #include <comctl32_undoc.h> @@ -61,12 +62,15 @@ #include "droptargets/CexeDropHandler.h" #include "COpenWithMenu.h" #include "CNewMenu.h" -#include "CStartMenu.h" #include "filedefext.h" #include "drvdefext.h" -#include "CMenuBand.h" -#include "CMenuDeskBar.h" #include "CQueryAssociations.h" +#include "shellmenu/CBandSite.h" +#include "shellmenu/CMenuBand.h" +#include "shellmenu/CMenuDeskBar.h" +#include "shellmenu/CMenuSite.h" +#include "shellmenu/CMergedFolder.h" +#include "shellmenu/shellmenu.h" #include <wine/debug.h> #include <wine/unicode.h> Added: trunk/reactos/dll/win32/shell32/res/rgs/mergedfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/mergedfolder.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/mergedfolder.rgs [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {26FDC864-BE88-46E7-9235-032D8EA5162E} = s 'Merged Shell Folder' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/mergedfolder.rgs ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: trunk/reactos/dll/win32/shell32/res/rgs/rebarbandsite.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/rebarbandsite.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/rebarbandsite.rgs [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {ECD4FC4D-521C-11D0-B792-00A0C90312E1} = s 'Shell Rebar Band Site' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/rebarbandsite.rgs ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -23,4 +23,6 @@ IDR_OPENWITHMENU REGISTRY "res/rgs/openwithmenu.rgs" IDR_FILEDEFEXT REGISTRY "res/rgs/shellfiledefext.rgs" IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs" -IDR_EXEDROPHANDLER REGISTRY "res/rgs/exedrophandler.rgs" +IDR_EXEDROPHANDLER REGISTRY "res/rgs/exedrophandler.rgs" +IDR_MERGEDFOLDER REGISTRY "res/rgs/mergedfolder.rgs" +IDR_REBARBANDSITE REGISTRY "res/rgs/rebarbandsite.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -146,6 +146,38 @@ return S_OK; } +/************************************************************************** + * CStartMenuDummy + */ +class CStartMenuDummy : + public CComCoClass<CStartMenuDummy, &CLSID_StartMenu>, + public CComObjectRootEx<CComMultiThreadModelNoCS> +{ +private: + CStartMenuDummy(); + virtual ~CStartMenuDummy(); + +public: + DECLARE_REGISTRY_RESOURCEID(IDR_STARTMENU) + + class _CreatorClass + { + public: + static STDMETHODIMP CreateInstance(void *pv, REFIID riid, LPVOID *ppv) + { + if (ppv == NULL) + return E_POINTER; + *ppv = NULL; + if (pv != NULL) + return CLASS_E_NOAGGREGATION; + return CStartMenu_Constructor(riid, ppv); + } + }; +}; + +/************************************************************************** + * CShell32Module + */ class CShell32Module : public CComModule { public: @@ -174,10 +206,12 @@ OBJECT_ENTRY(CLSID_RecycleBin, CRecycleBin) OBJECT_ENTRY(CLSID_OpenWithMenu, COpenWithMenu) OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) - OBJECT_ENTRY(CLSID_StartMenu, CStartMenu) - OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) + OBJECT_ENTRY(CLSID_StartMenu, CStartMenuDummy) + OBJECT_ENTRY(CLSID_MenuBandSite, CMenuSite) OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar) + OBJECT_ENTRY(CLSID_MergedFolder, CMergedFolder) + OBJECT_ENTRY(CLSID_RebarBandSite, CBandSite) OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler) OBJECT_ENTRY(CLSID_QueryAssociations, CQueryAssociations) END_OBJECT_MAP() Modified: trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -142,6 +142,7 @@ public CBandSiteBase { public: + DECLARE_REGISTRY_RESOURCEID(IDR_REBARBANDSITE) DECLARE_AGGREGATABLE(CBandSite) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -25,6 +25,7 @@ class CMenuFocusManager; class CMenuBand : + public CComCoClass<CMenuBand, &CLSID_MenuBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IDeskBand, public IObjectWithSite, @@ -75,6 +76,7 @@ CMenuBand(); virtual ~CMenuBand(); + DECLARE_REGISTRY_RESOURCEID(IDR_MENUBAND) DECLARE_NOT_AGGREGATABLE(CMenuBand) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -25,6 +25,7 @@ > CMenuWinTraits; class CMenuDeskBar : + public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl<CMenuDeskBar, CWindow, CMenuWinTraits>, public IOleCommandTarget, @@ -57,6 +58,7 @@ CMenuDeskBar(); virtual ~CMenuDeskBar(); + DECLARE_REGISTRY_RESOURCEID(IDR_MENUDESKBAR) DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -20,6 +20,7 @@ #pragma once class CMenuSite : + public CComCoClass<CMenuSite, &CLSID_MenuBandSite>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl<CMenuSite, CWindow, CControlWinTraits>, public IBandSite, @@ -43,6 +44,7 @@ DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU) + DECLARE_REGISTRY_RESOURCEID(IDR_MENUBANDSITE) DECLARE_NOT_AGGREGATABLE(CMenuSite) DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CMenuSite) Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -46,6 +46,7 @@ class CEnumMergedFolder; class CMergedFolder : + public CComCoClass<CMergedFolder, &CLSID_MergedFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, public IPersistFolder2, @@ -73,6 +74,7 @@ HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers); + DECLARE_REGISTRY_RESOURCEID(IDR_MERGEDFOLDER) DECLARE_NOT_AGGREGATABLE(CMergedFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -60,6 +60,7 @@ #include <shellutils.h> #include <rosctrls.h> +#include "../shresdef.h" #include <wine/debug.h> @@ -68,7 +69,7 @@ #pragma warning(pop) #endif -#define shell32_hInstance 0 +extern HINSTANCE shell32_hInstance; extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Aug 19 11:17:08 2015 @@ -580,3 +580,5 @@ #define IDR_MENUDESKBAR 150 #define IDR_EXEDROPHANDLER 151 #define IDR_QUERYASSOCIATIONS 152 +#define IDR_MERGEDFOLDER 153 +#define IDR_REBARBANDSITE 154

1 0

[tfaber] 68763: [RSHELL][SHELL32] - Move rshell source files to a "shellmenu" static library under shell32 CORE-9892
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 09:05:54 2015 New Revision: 68763 URL: http://svn.reactos.org/svn/reactos?rev=68763&view=rev Log: [RSHELL][SHELL32] - Move rshell source files to a "shellmenu" static library under shell32 CORE-9892 Added: trunk/reactos/dll/win32/shell32/shellmenu/ (with props) trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CBandSite.cpp trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CBandSite.h trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMakeLists.txt trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMenuBand.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMenuDeskBar.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMenuFocusManager.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMenuSite.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMenuSite.h trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMenuToolbars.h trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CMergedFolder.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/CMergedFolder.h trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/CStartMenu.cpp trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp - copied, changed from r68754, trunk/reactos/base/shell/rshell/ShellDDE.cpp trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h - copied unchanged from r68754, trunk/reactos/base/shell/rshell/precomp.h Removed: trunk/reactos/base/shell/rshell/CBandSite.cpp trunk/reactos/base/shell/rshell/CBandSite.h trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp trunk/reactos/base/shell/rshell/CMenuBand.cpp trunk/reactos/base/shell/rshell/CMenuBand.h trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.h trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp trunk/reactos/base/shell/rshell/CMenuFocusManager.h trunk/reactos/base/shell/rshell/CMenuSite.cpp trunk/reactos/base/shell/rshell/CMenuSite.h trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.h trunk/reactos/base/shell/rshell/CMergedFolder.cpp trunk/reactos/base/shell/rshell/CMergedFolder.h trunk/reactos/base/shell/rshell/CStartMenu.cpp trunk/reactos/base/shell/rshell/ShellDDE.cpp trunk/reactos/base/shell/rshell/precomp.h Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/dll/win32/shell32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/shell/rshell/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CBandSit… Removed: trunk/reactos/base/shell/rshell/CBandSite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CBandSit… Removed: trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CDesktop… Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMakeLis… Removed: trunk/reactos/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… Removed: trunk/reactos/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… Removed: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… Removed: trunk/reactos/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… Removed: trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… Removed: trunk/reactos/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… Removed: trunk/reactos/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuSit… Removed: trunk/reactos/base/shell/rshell/CMenuSite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuSit… Removed: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… Removed: trunk/reactos/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… Removed: trunk/reactos/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… Removed: trunk/reactos/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF… Removed: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… Removed: trunk/reactos/base/shell/rshell/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/ShellDDE… Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… Removed: trunk/reactos/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/precomp.… Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CBandSite.cpp (from r68754, trunk/reactos/base/shell/rshell/CBandSite.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CDesktopBrowser.cpp (from r68754, trunk/reactos/base/shell/rshell/CDesktopBrowser.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt (from r68754, trunk/reactos/base/shell/rshell/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp (from r68754, trunk/reactos/base/shell/rshell/CMenuBand.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp (from r68754, trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp (from r68754, trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp (from r68754, trunk/reactos/base/shell/rshell/CMenuSite.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp (from r68754, trunk/reactos/base/shell/rshell/CMenuToolbars.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp (from r68754, trunk/reactos/base/shell/rshell/CMergedFolder.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp (from r68754, trunk/reactos/base/shell/rshell/CStartMenu.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… Copied: trunk/reactos/dll/win32/shell32/shellmenu/ShellDDE.cpp (from r68754, trunk/reactos/base/shell/rshell/ShellDDE.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen…

1 0

[tfaber] 68762: [SHELL32] - Fail CDefView::CreateViewWindow if a window already exists - Don't return IOleWindow from CDefView::QueryInterface Fixes reference leaks during shell32_winetest:shlview ...
by tfaber＠svn.reactos.org 19 Aug '15

19 Aug '15

Author: tfaber Date: Wed Aug 19 08:28:24 2015 New Revision: 68762 URL: http://svn.reactos.org/svn/reactos?rev=68762&view=rev Log: [SHELL32] - Fail CDefView::CreateViewWindow if a window already exists - Don't return IOleWindow from CDefView::QueryInterface Fixes reference leaks during shell32_winetest:shlview CORE-9867 Modified: trunk/reactos/dll/win32/shell32/CDefView.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] Wed Aug 19 08:28:24 2015 @@ -320,7 +320,8 @@ END_MSG_MAP() BEGIN_COM_MAP(CDefView) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + // Windows returns E_NOINTERFACE for IOleWindow + // COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IShellView, IShellView) COM_INTERFACE_ENTRY_IID(IID_IFolderView, IFolderView) COM_INTERFACE_ENTRY_IID(IID_IShellFolderView, IShellFolderView) @@ -2193,7 +2194,7 @@ TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom); /* Validate the Shell Browser */ - if (psb == NULL) + if (psb == NULL || m_hWnd) return E_UNEXPECTED; /*set up the member variables*/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs