Module: wine Branch: master Commit: a603e9871e21888216672003e2455dfac4a31716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a603e9871e21888216672003e2...
Author: Francois Gouget fgouget@free.fr Date: Tue Dec 20 09:17:27 2011 +0100
include: Add a few missing include directives to shlguid.h.
---
dlls/ole32/tests/moniker.c | 1 + dlls/shell32/shellpath.c | 2 +- dlls/shell32/tests/shellpath.c | 3 +- include/shlguid.h | 44 +++++++++++++++++++++++++++------------ 4 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index aa57b9b..a407a37 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "ocidl.h" #include "initguid.h" #include "comcat.h" #include "olectl.h" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9612687..f3490c1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -51,8 +51,8 @@ #include "shlwapi.h" #include "xdg.h" #include "sddl.h" -#define INITGUID #include "knownfolders.h" +#include "initguid.h" #include "shobjidl.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0db72df..91e9f35 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -30,10 +30,11 @@ #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" -#include "initguid.h" #include "knownfolders.h" #include "wine/test.h"
+#include "initguid.h" + /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want * here is its original value. */ diff --git a/include/shlguid.h b/include/shlguid.h index ebae98d..2279def 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -48,12 +48,6 @@ DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FC, 0, 0); DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FE, 0, 0); DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500, 0, 0);
-DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); -DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); -DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); - -DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); -
/* avoid duplicate definitions with shobjidl.h (FIXME) */ /* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9, 0, 0); */ @@ -75,22 +69,46 @@ DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x /* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1, 0, 0); */ /* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7, 0, 0); */
+#ifndef NO_INTSHCUT_GUIDS +#include <isguids.h> +#endif + +#ifndef NO_SHDOCVW_GUIDS +# ifndef GUID_DEFS_ONLY +# include <exdisp.h> +# include <shldisp.h> +# endif + +DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); +DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + +DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); +#define SID_SProgressUI CLSID_ProgressDialog + DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory
DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97);
DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); + +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); + +#define SID_SInternetExplorer IID_IWebBrowserApp +#define SID_SWebBrowserApp IID_IWebBrowserApp +#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService + +#endif /* NO_SHDOCVW_GUIDS */ + DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4);
#define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser #define SID_SShellDesktop CLSID_ShellDesktop -#define SID_SInternetExplorer IID_IWebBrowserApp -#define SID_SWebBrowserApp IID_IWebBrowserApp -#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService - #define IID_IFileViewer WINELIB_NAME_AW(IID_IFileViewer) #define IID_IShellLink WINELIB_NAME_AW(IID_IShellLink) #define IID_IExtractIcon WINELIB_NAME_AW(IID_IExtractIcon) @@ -124,10 +142,6 @@ DEFINE_GUID(CLSID_QueryAssociations, 0xa07034fd, 0x6caa, 0x4954, 0xac, 0x3f, 0x9
DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);
-DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); - DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4);
DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); @@ -162,6 +176,8 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a);
+#include <knownfolders.h> + /* FOLDERTYPEID */ DEFINE_GUID(FOLDERTYPEID_Communications, 0x91475fe5, 0x586b, 0x4eba, 0x8d, 0x75, 0xd1, 0x74, 0x34, 0xb8, 0xcd, 0xf6); DEFINE_GUID(FOLDERTYPEID_CompressedFolder, 0x80213e82, 0xbcfd, 0x4c4f, 0x88, 0x17, 0xbb, 0x27, 0x60, 0x12, 0x67, 0xa9);