Author: tkreuzer
Date: Sun Nov 28 09:28:28 2010
New Revision: 49835
URL:
http://svn.reactos.org/svn/reactos?rev=49835&view=rev
Log:
[PSDK]
Add some GUIDs for MSVC.
Modified:
branches/cmake-bringup/include/psdk/hlguids.h
branches/cmake-bringup/include/psdk/richole.idl
branches/cmake-bringup/include/psdk/shlguid.h
Modified: branches/cmake-bringup/include/psdk/hlguids.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/hlgu…
==============================================================================
--- branches/cmake-bringup/include/psdk/hlguids.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/hlguids.h [iso-8859-1] Sun Nov 28 09:28:28 2010
@@ -27,5 +27,9 @@
0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b);
DEFINE_GUID(CLSID_IID_IExtensionServices,
0x79eac9cb, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b);
+#ifndef __GNUC__
+DEFINE_GUID(IID_IBindStatusCallback,
+ 0x79eac9c1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b);
+#endif
#endif
Modified: branches/cmake-bringup/include/psdk/richole.idl
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rich…
==============================================================================
--- branches/cmake-bringup/include/psdk/richole.idl [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/richole.idl [iso-8859-1] Sun Nov 28 09:28:28 2010
@@ -131,3 +131,8 @@
HRESULT GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect);
HRESULT GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU
*lphmenu);
}
+
+#ifndef __WIDL__
+cpp_quote("DEFINE_GUID(IID_IRichEditOle, 0x00020D00, 0, 0,
0xC0,0,0,0,0,0,0,0x46);")
+cpp_quote("DEFINE_GUID(IID_IRichEditOleCallback, 0x00020D03, 0, 0,
0xC0,0,0,0,0,0,0,0x46);")
+#endif
Modified: branches/cmake-bringup/include/psdk/shlguid.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/shlg…
==============================================================================
--- branches/cmake-bringup/include/psdk/shlguid.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/shlguid.h [iso-8859-1] Sun Nov 28 09:28:28 2010
@@ -57,26 +57,27 @@
DEFINE_GUID(IID_IProgressDialog,
0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4);
-/* avoid duplicate definitions with shobjidl.h (FIXME) */
-/* DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00,
0xA0, 0xC9, 0x2D, 0xBF, 0xE8); */
-/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */
-/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */
-/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */
-/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */
-/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */
-/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */
-/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */
-/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */
+#ifndef __GNUC__ /* avoid duplicate definitions with shobjidl.h (FIXME) */
+DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0,
0xC9, 0x2D, 0xBF, 0xE8);
+DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0);
+DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0);
+DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0);
+DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0);
+DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0);
+DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0);
+DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0);
+DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0);
+DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0);
+DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0);
+DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0);
+DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0);
+DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0);
+DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0);
+DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0);
+DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0);
+DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0);
+DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0);
+#endif
DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00,
0x69, 0x46, 0xee);
#define SID_SUrlHistory CLSID_CUrlHistory