include: The PSDK does not define the DEFINE_SHLGUID() macro anymore.

dlls/mshtml/tests/htmldoc.c

@@ -35,7 +35,7 @@
 #include "shlguid.h"
 
 #include "initguid.h"
-DEFINE_SHLGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
+DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
 
 #define DEFINE_EXPECT(func) \
     static BOOL expect_ ## func = FALSE, called_ ## func = FALSE

include/shlguid.h

@@ -19,62 +19,60 @@
 #ifndef __WINE_SHLGUID_H
 #define __WINE_SHLGUID_H
 
-#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
+DEFINE_OLEGUID(CLSID_ShellDesktop,      0x00021400L, 0, 0);
+DEFINE_OLEGUID(CLSID_ShellLink,         0x00021401L, 0, 0);
 
-DEFINE_SHLGUID(CLSID_ShellDesktop,      0x00021400L, 0, 0);
-DEFINE_SHLGUID(CLSID_ShellLink,         0x00021401L, 0, 0);
-
-DEFINE_SHLGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0);
-DEFINE_SHLGUID(CATID_BrowseInPlace,     0x00021491L, 0, 0);
-DEFINE_SHLGUID(CATID_DeskBand,          0x00021492L, 0, 0);
-DEFINE_SHLGUID(CATID_InfoBand,          0x00021493L, 0, 0);
-DEFINE_SHLGUID(CATID_CommBand,          0x00021494L, 0, 0);
+DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0);
+DEFINE_OLEGUID(CATID_BrowseInPlace,     0x00021491L, 0, 0);
+DEFINE_OLEGUID(CATID_DeskBand,          0x00021492L, 0, 0);
+DEFINE_OLEGUID(CATID_InfoBand,          0x00021493L, 0, 0);
+DEFINE_OLEGUID(CATID_CommBand,          0x00021494L, 0, 0);
 
 /* shell32 formatids */
-DEFINE_SHLGUID(FMTID_Intshcut,          0x000214A0L, 0, 0);
-DEFINE_SHLGUID(FMTID_InternetSite,      0x000214A1L, 0, 0);
+DEFINE_OLEGUID(FMTID_Intshcut,          0x000214A0L, 0, 0);
+DEFINE_OLEGUID(FMTID_InternetSite,      0x000214A1L, 0, 0);
 
 /* command group ids */
-DEFINE_SHLGUID(CGID_Explorer,           0x000214D0L, 0, 0);
-DEFINE_SHLGUID(CGID_ShellDocView,       0x000214D1L, 0, 0);
-DEFINE_SHLGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0);
-DEFINE_SHLGUID(CGID_ExplorerBarDoc,     0x000214D3L, 0, 0);
-
-DEFINE_SHLGUID(IID_IShellIcon,          0x000214E5L, 0, 0);
-DEFINE_SHLGUID(IID_IShellDetails,       0x000214ECL, 0, 0);
-DEFINE_SHLGUID(IID_IDelayedRelease,     0x000214EDL, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHookA,     0x000214EFL, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerA,        0x000214F0L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerSite,     0x000214F3L, 0, 0);
-DEFINE_SHLGUID(IID_IPropSheetPage,      0x000214F6L, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewerW,        0x000214F8L, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHookW,     0x000214FCL, 0, 0);
-DEFINE_SHLGUID(IID_IRemoteComputer,     0x000214FEL, 0, 0);
-DEFINE_SHLGUID(IID_IQueryInfo,          0x00021500L, 0, 0);
+DEFINE_OLEGUID(CGID_Explorer,           0x000214D0L, 0, 0);
+DEFINE_OLEGUID(CGID_ShellDocView,       0x000214D1L, 0, 0);
+DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0);
+DEFINE_OLEGUID(CGID_ExplorerBarDoc,     0x000214D3L, 0, 0);
+
+DEFINE_OLEGUID(IID_IShellIcon,          0x000214E5L, 0, 0);
+DEFINE_OLEGUID(IID_IShellDetails,       0x000214ECL, 0, 0);
+DEFINE_OLEGUID(IID_IDelayedRelease,     0x000214EDL, 0, 0);
+DEFINE_OLEGUID(IID_IShellCopyHookA,     0x000214EFL, 0, 0);
+DEFINE_OLEGUID(IID_IFileViewerA,        0x000214F0L, 0, 0);
+DEFINE_OLEGUID(IID_IFileViewerSite,     0x000214F3L, 0, 0);
+DEFINE_OLEGUID(IID_IPropSheetPage,      0x000214F6L, 0, 0);
+DEFINE_OLEGUID(IID_IFileViewerW,        0x000214F8L, 0, 0);
+DEFINE_OLEGUID(IID_IShellCopyHookW,     0x000214FCL, 0, 0);
+DEFINE_OLEGUID(IID_IRemoteComputer,     0x000214FEL, 0, 0);
+DEFINE_OLEGUID(IID_IQueryInfo,          0x00021500L, 0, 0);
 
 DEFINE_GUID(IID_IACList,   0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62);
 DEFINE_GUID(IID_IACList2,  0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C);
 DEFINE_GUID(IID_IObjMgr,   0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62);
 
 /* avoid duplicate definitions with shobjidl.h (FIXME) */
-/* DEFINE_SHLGUID(IID_IShellPropSheetExt,  0x000214E9L, 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_INewShortcutHookA,   0x000214E1L, 0, 0); */
-/* DEFINE_SHLGUID(IID_INewShortcutHookW,   0x000214F7L, 0, 0); */
+/* 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); */
 
 DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee);
 #define SID_SUrlHistory       CLSID_CUrlHistory