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

[RSHELL]

Browse source 
* Really fix GCC build.

svn path=/branches/shell-experiments/; revision=63709
This commit is contained in:
David Quintana 2014-07-10 19:16:21 +00:00
parent eb28ee17c8
commit e1b309d6de
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/shell/rshell/CMergedFolder.cpp
View file

@ -111,7 +111,7 @@ HRESULT CEnumMergedFolder::SetSources(IShellFolder * userLocal, IShellFolder * a
m_UserLocalFolder = userLocal; m_UserLocalFolder = userLocal;
m_AllUSersFolder = allUSers; m_AllUSersFolder = allUSers;
TRACE("SetSources %p %p\n", m_UserLocalFolder, m_AllUSersFolder); TRACE("SetSources %p %p\n", userLocal, allUSers);
return S_OK; return S_OK;
} }
@ -397,7 +397,7 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::AddNameSpace(LPGUID lpGuid, IShellFolde
return E_NOTIMPL; return E_NOTIMPL;
} }
TRACE("AddNameSpace %p %p\n", m_UserLocal, m_AllUSers); TRACE("AddNameSpace %p %p\n", m_UserLocal.p, m_AllUSers.p);
// FIXME: Use a DSA to store the list of merged namespaces, together with their related info (psf, pidl, ...) // FIXME: Use a DSA to store the list of merged namespaces, together with their related info (psf, pidl, ...)
// For now, assume only 2 will ever be used, and ignore all the other data. // For now, assume only 2 will ever be used, and ignore all the other data.

6
base/shell/rshell/CMergedFolder.h
View file

@ -19,9 +19,9 @@
*/ */
#pragma once #pragma once
static IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; extern IID IID_IAugmentedShellFolder;
static IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; extern IID IID_IAugmentedShellFolder2;
static CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; extern CLSID CLSID_MergedFolder;
interface IAugmentedShellFolder : public IShellFolder interface IAugmentedShellFolder : public IShellFolder
{ {

7
base/shell/rshell/CStartMenu.cpp
View file

@ -21,6 +21,10 @@
#include "CMergedFolder.h" #include "CMergedFolder.h"
IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } };
IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } };
CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } };
//#define TEST_TRACKPOPUPMENU_SUBMENUS //#define TEST_TRACKPOPUPMENU_SUBMENUS
@ -406,7 +410,8 @@ CStartMenu_Constructor(REFIID riid, void **ppv)
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
hr = psf->ParseDisplayName(NULL, NULL, L"Programs", NULL, &pidlPrograms, NULL); WCHAR name[] = L"Programs";
hr = psf->ParseDisplayName(NULL, NULL, name, NULL, &pidlPrograms, NULL);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;

2
base/shell/rshell/rshell.spec
View file

@ -2,4 +2,4 @@
@ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuDeskBar_Constructor(ptr ptr);
@ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr);
@ stdcall CMenuBand_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr);
@ stdcall CMergedFolder_Constructor(ptr ptr ptr ptr) @ stdcall CMergedFolder_Constructor(ptr ptr);