From e50296456bd090f9992df39a8d12c22f013350ce Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Thu, 7 Sep 2006 06:36:33 +0000 Subject: [PATCH] Fixed so explorer can be compiling again. Have not tested with rest of reactos if this break any anything. svn path=/trunk/; revision=23942 --- reactos/include/psdk/shlguid.h | 4 ++++ reactos/include/reactos/wine/shlguid.h | 23 ++--------------------- reactos/include/reactos/wine/shobjidl.h | 4 ++-- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/reactos/include/psdk/shlguid.h b/reactos/include/psdk/shlguid.h index 4335ebe544d..447c2af4067 100644 --- a/reactos/include/psdk/shlguid.h +++ b/reactos/include/psdk/shlguid.h @@ -112,6 +112,10 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); +DEFINE_GUID(IID_IDragSourceHelper, 0xde5bf786, 0x477a, 0x11d2, 0x83, 0x9d, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); +DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); + #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); #define PID_FINDDATA 0 diff --git a/reactos/include/reactos/wine/shlguid.h b/reactos/include/reactos/wine/shlguid.h index 1956e490811..6f032953d7d 100644 --- a/reactos/include/reactos/wine/shlguid.h +++ b/reactos/include/reactos/wine/shlguid.h @@ -12,28 +12,9 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0); /* command group ids */ -DEFINE_SHLGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_SHLGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); -DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); -DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0); -DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); -DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); -DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); -DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0); -DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0); -DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); -DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); -DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); -DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); -DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); -DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); -DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); @@ -51,7 +32,7 @@ DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); -DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); + DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); @@ -60,6 +41,6 @@ DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x0 DEFINE_GUID(IID_IShellLinkDataList, 0x45e2b4ae, 0xb1c3, 0x11d0, 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); -DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); + #endif /* __WINE_SHLGUID_H */ diff --git a/reactos/include/reactos/wine/shobjidl.h b/reactos/include/reactos/wine/shobjidl.h index 9c85291af41..9b9fe227e90 100644 --- a/reactos/include/reactos/wine/shobjidl.h +++ b/reactos/include/reactos/wine/shobjidl.h @@ -14,9 +14,9 @@ #define CMIC_MASK_ASYNCOK SEE_MASK_ASYNCOK /***************************************************************************** - * IDropTargetHelper interface + * IDropTargetHelper interface define in shlguid.h */ -DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83,0x9a, 0x00,0xc0,0x4f,0xd9,0x18,0xd0); +// DEFINE_GUID(IID_IDropTargetHelper, 0x4657278b, 0x411b, 0x11d2, 0x83,0x9a, 0x00,0xc0,0x4f,0xd9,0x18,0xd0); /***************************************************************************** * IPersistFolder2 interface