[ros-diffs] [gadamopoulos] 65699: Try to fix build

Author: gadamopoulos
Date: Wed Dec 17 11:46:19 2014
New Revision: 65699

URL: http://svn.reactos.org/svn/reactos?rev=65699&view=rev
Log:
Try to fix build

Modified:
    trunk/reactos/base/shell/rshell/CMergedFolder.h
    trunk/reactos/base/shell/rshell/CStartMenu.cpp
    trunk/reactos/include/reactos/shlguid_undoc.h

Modified: trunk/reactos/base/shell/rshell/CMergedFolder.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF…
==============================================================================
--- trunk/reactos/base/shell/rshell/CMergedFolder.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CMergedFolder.h	[iso-8859-1] Wed Dec 17 11:46:19 2014
@@ -18,11 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 #pragma once
-
-extern IID IID_IAugmentedShellFolder;
-extern IID IID_IAugmentedShellFolder2;
-extern IID IID_IAugmentedShellFolder3;
-extern CLSID CLSID_MergedFolder;
 
 interface IAugmentedShellFolder : public IShellFolder
 {

Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe…
==============================================================================
--- trunk/reactos/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] Wed Dec 17 11:46:19 2014
@@ -22,12 +22,6 @@
 #include "CMergedFolder.h"
 
 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
 

Modified: trunk/reactos/include/reactos/shlguid_undoc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un…
==============================================================================
--- trunk/reactos/include/reactos/shlguid_undoc.h	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/shlguid_undoc.h	[iso-8859-1] Wed Dec 17 11:46:19 2014
@@ -107,9 +107,10 @@
 
 DEFINE_GUID(CLSID_ExeDropHandler, 		   0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08,
0x00, 0x2B, 0x30, 0x30, 0x9D);
 
+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(CLSID_MergedFolder,            0x26FDC864, 0xBE88, 0x46E7, 0x92, 0x35, 0x03,
0x2D, 0x8E, 0xA5, 0x16, 0x2E);
-
+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