Try to fix build

svn path=/trunk/; revision=65699

diff --git a/reactos/base/shell/rshell/CMergedFolder.h b/reactos/base/shell/rshell/CMergedFolder.h
index b3a79cf..d83ed4e 100644 (file)
--- a/reactos/base/shell/rshell/CMergedFolder.h
+++ b/reactos/base/shell/rshell/CMergedFolder.h
@@ -19,11 +19,6 @@
  */
 #pragma once
 
-extern IID IID_IAugmentedShellFolder;
-extern IID IID_IAugmentedShellFolder2;
-extern IID IID_IAugmentedShellFolder3;
-extern CLSID CLSID_MergedFolder;
-
 interface IAugmentedShellFolder : public IShellFolder
 {
     virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID, IShellFolder *, LPCITEMIDLIST, ULONG) = 0;

diff --git a/reactos/base/shell/rshell/CStartMenu.cpp b/reactos/base/shell/rshell/CStartMenu.cpp
index 700ac65..2772549 100644 (file)
--- a/reactos/base/shell/rshell/CStartMenu.cpp
+++ b/reactos/base/shell/rshell/CStartMenu.cpp
@@ -23,12 +23,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(CStartMenu);
 
-// TODO: declare these GUIDs and interfaces in the right place (whatever that may be)
-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 } };
-IID IID_IAugmentedShellFolder3 = { 0x4F755EA8, 0x247D, 0x479B, { 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01 } };
-CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } };
-
 //#define TEST_TRACKPOPUPMENU_SUBMENUS
 
 

diff --git a/reactos/include/reactos/shlguid_undoc.h b/reactos/include/reactos/shlguid_undoc.h
index f38a840..959416b 100644 (file)
--- a/reactos/include/reactos/shlguid_undoc.h
+++ b/reactos/include/reactos/shlguid_undoc.h
@@ -107,9 +107,10 @@ DEFINE_GUID(CLSID_ShellNetDefExt,          0x86422020, 0x42A0, 0x1069, 0xA2, 0xE
 
 DEFINE_GUID(CLSID_ExeDropHandler,                 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 
-DEFINE_GUID(IID_IAugmentedShellFolder,     0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72);
 DEFINE_GUID(CLSID_MergedFolder,            0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E);
-
+DEFINE_GUID(IID_IAugmentedShellFolder,     0x91EA3F8C, 0xC99B, 0x11D0, 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72);
+DEFINE_GUID(IID_IAugmentedShellFolder2,    0x8DB3B3F4, 0x6CFE, 0x11D1, 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0);
+DEFINE_GUID(IID_IAugmentedShellFolder3,    0x4F755EA8, 0x247D, 0x479B, 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01);
 
 #define CGID_IExplorerToolbar IID_IExplorerToolbar
 #define SID_IExplorerToolbar IID_IExplorerToolbar