Added guiddef.h and moved a few GUID definitions to the correct file.

dlls/commdlg/filedlg95.c

@@ -35,6 +35,7 @@
 #include "tweak.h"
 #include "winnls.h"
 #include "shellapi.h"
+#include "shlguid.h"
 #include "filedlgbrowser.h"
 #include "shlwapi.h"
 #include "wine/obj_contextmenu.h"

dlls/commdlg/filedlgbrowser.c

@@ -11,6 +11,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "heap.h"
+#include "shlguid.h"
 #include "wine/obj_dataobject.h"
 #include "debugtools.h"
 #include "cdlg.h"

dlls/shell32/brsfolder.c

@@ -20,6 +20,7 @@
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shellapi.h"
+#include "shlguid.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 

dlls/shell32/folders.c

@@ -11,6 +11,7 @@
 #include "wine/obj_base.h"
 #include "wine/obj_extracticon.h"
 #include "wine/undocshell.h"
+#include "shlguid.h"
 
 #include "debugtools.h"
 #include "winerror.h"

dlls/shell32/iconcache.c

@@ -19,6 +19,7 @@
 #include "winversion.h"
 
 #include "shellapi.h"
+#include "shlguid.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "wine/undocshell.h"

dlls/shell32/shellord.c

@@ -15,6 +15,7 @@
 #include "heap.h"
 
 #include "shellapi.h"
+#include "shlguid.h"
 #include "shlobj.h"
 #include "shell32_main.h"
 #include "wine/undocshell.h"

dlls/shell32/shlmenu.c

@@ -12,6 +12,7 @@
 #include "debugtools.h"
 #include "winversion.h"
 #include "shell32_main.h"
+#include "shlguid.h"
 
 #include "pidl.h"
 

dlls/shell32/shlview.c

@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "servprov.h"
+#include "shlguid.h"
 #include "wine/obj_base.h"
 #include "wine/obj_shellfolder.h"
 #include "wine/obj_shellview.h"

dlls/shell32/shv_bg_cmenu.c

@@ -9,6 +9,7 @@
 #include "debugtools.h"
 
 #include "pidl.h"
+#include "shlguid.h"
 #include "wine/obj_base.h"
 #include "wine/obj_contextmenu.h"
 #include "wine/obj_shellbrowser.h"

dlls/shell32/shv_item_cmenu.c

@@ -9,6 +9,7 @@
 #include "debugtools.h"
 
 #include "pidl.h"
+#include "shlguid.h"
 #include "wine/obj_base.h"
 #include "wine/obj_contextmenu.h"
 #include "wine/obj_shellbrowser.h"

include/guiddef.h

@@ -0,0 +1,70 @@
+#ifndef GUID_DEFINED
+#define GUID_DEFINED
+typedef struct _GUID
+{
+    unsigned long  Data1;
+    unsigned short Data2;
+    unsigned short Data3;
+    unsigned char  Data4[ 8 ];
+} GUID;
+#endif
+
+#undef DEFINE_GUID
+
+#ifdef INITGUID
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        const GUID name = \
+	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#else
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+    extern const GUID name
+#endif
+
+#define DEFINE_OLEGUID(name, l, w1, w2) \
+	DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
+
+#ifndef _GUIDDEF_H_
+#define _GUIDDEF_H_
+
+typedef GUID *LPGUID;
+typedef GUID CLSID,*LPCLSID;
+typedef GUID IID,*LPIID;
+typedef GUID FMTID,*LPFMTID;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+#define REFGUID             const GUID &
+#define REFCLSID            const CLSID &
+#define REFIID              const IID &
+#define REFFMTID            const FMTID &
+#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
+#define REFGUID             const GUID* const
+#define REFCLSID            const CLSID* const
+#define REFIID              const IID* const
+#define REFFMTID            const FMTID* const
+#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
+#else /* defined(__cplusplus) && !defined(CINTERFACE) */
+#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
+#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
+#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
+#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
+{
+    return !memcmp(&guidOne,&guidOther,sizeof(GUID));
+}
+inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
+{
+    return !(guidOne == guidOther);
+}
+#endif 
+
+extern const IID GUID_NULL;
+#define IID_NULL            GUID_NULL
+#define CLSID_NULL GUID_NULL
+#define FMTID_NULL          GUID_NULL
+   
+#endif /* _GUIDDEF_H_ */

include/initguid.h

@@ -6,18 +6,5 @@
  * shlguid.h
  */
 
-#ifndef __WINE_INITGUID_H
-#define __WINE_INITGUID_H
-
-#include "wtypes.h"
-
-/*****************************************************************************
- * Macros to declare the GUIDs
- */
-#undef DEFINE_GUID
-
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        const GUID name = \
-	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-
-#endif /* __WINE_INITGUID_H */
+#define INITGUID
+#include "guiddef.h"

include/rpc.h

@@ -28,11 +28,6 @@ typedef struct _GUID
 } GUID;
 #endif
 
-typedef GUID  *LPGUID;
-typedef GUID  CLSID,*LPCLSID;
-typedef GUID	IID,*LPIID;
-typedef GUID	FMTID,*LPFMTID;
-
 #ifndef UUID_DEFINED
 #define UUID_DEFINED
 typedef GUID UUID;

include/shlguid.h

@@ -3,29 +3,63 @@
 
 #include "wine/obj_base.h"
 
+#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
+
 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);
+
 /* shell32 formatids */
 DEFINE_SHLGUID(FMTID_Intshcut,          0x000214A0L, 0, 0);
 DEFINE_SHLGUID(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);
 
- /* shell32interface ids */
 DEFINE_SHLGUID(IID_INewShortcutHookA,   0x000214E1L, 0, 0);
+DEFINE_SHLGUID(IID_IShellBrowser,       0x000214E2L, 0, 0);
+DEFINE_SHLGUID(IID_IShellView,          0x000214E3L, 0, 0);
+DEFINE_SHLGUID(IID_IContextMenu,        0x000214E4L, 0, 0);
 DEFINE_SHLGUID(IID_IShellIcon,          0x000214E5L, 0, 0);
+DEFINE_SHLGUID(IID_IShellFolder,        0x000214E6L, 0, 0);
+DEFINE_SHLGUID(IID_IShellExtInit,       0x000214E8L, 0, 0);
 DEFINE_SHLGUID(IID_IShellPropSheetExt,  0x000214E9L, 0, 0);
-DEFINE_SHLGUID(IID_IShellCopyHook,      0x000214EFL, 0, 0);
-DEFINE_SHLGUID(IID_IFileViewer,         0x000214F0L, 0, 0);
+DEFINE_SHLGUID(IID_IPersistFolder,      0x000214EAL, 0, 0);
+DEFINE_SHLGUID(IID_IExtractIconA,       0x000214EBL, 0, 0);
+DEFINE_SHLGUID(IID_IShellDetails,       0x000214ECL, 0, 0);
+DEFINE_SHLGUID(IID_IDelayedRelease,     0x000214EDL, 0, 0);
+DEFINE_SHLGUID(IID_IShellLinkA,         0x000214EEL, 0, 0);
+DEFINE_SHLGUID(IID_IShellCopyHookA,     0x000214EFL, 0, 0);
+DEFINE_SHLGUID(IID_IFileViewerA,        0x000214F0L, 0, 0);
+DEFINE_SHLGUID(IID_ICommDlgBrowser,     0x000214F1L, 0, 0);
+DEFINE_SHLGUID(IID_IEnumIDList,         0x000214F2L, 0, 0);
 DEFINE_SHLGUID(IID_IFileViewerSite,     0x000214F3L, 0, 0);
+DEFINE_SHLGUID(IID_IContextMenu2,       0x000214F4L, 0, 0);
 DEFINE_SHLGUID(IID_IShellExecuteHookA,  0x000214F5L, 0, 0);
 DEFINE_SHLGUID(IID_IPropSheetPage,      0x000214F6L, 0, 0);
 DEFINE_SHLGUID(IID_INewShortcutHookW,   0x000214F7L, 0, 0);
 DEFINE_SHLGUID(IID_IFileViewerW,        0x000214F8L, 0, 0);
+DEFINE_SHLGUID(IID_IShellLinkW,         0x000214F9L, 0, 0);
+DEFINE_SHLGUID(IID_IExtractIconW,       0x000214FAL, 0, 0);
 DEFINE_SHLGUID(IID_IShellExecuteHookW,  0x000214FBL, 0, 0);
 DEFINE_SHLGUID(IID_IShellCopyHookW,     0x000214FCL, 0, 0);
+DEFINE_SHLGUID(IID_IRemoteComputer,     0x000214FEL, 0, 0);
+DEFINE_SHLGUID(IID_IQueryInfo,          0x00021500L, 0, 0);
+
+#define IID_IFileViewer       WINELIB_NAME_AW(IID_IFileViewer)
+#define IID_IShellLink        WINELIB_NAME_AW(IID_IShellLink)
+#define IID_IExtractIcon      WINELIB_NAME_AW(IID_IExtractIcon)
+#define IID_IShellCopyHook    WINELIB_NAME_AW(IID_IShellCopyHook)
+#define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook)
+#define IID_INewShortcutHook  WINELIB_NAME_AW(IID_INewShortcutHook)
 
 DEFINE_GUID (IID_IDockingWindow,	0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
 DEFINE_GUID (IID_IDockingWindowSite,	0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);

include/vfw.h

@@ -4,7 +4,6 @@
 #include "windef.h"
 #include "mmsystem.h"
 #include "wingdi.h"
-#include "wine/obj_base.h"
 #include "unknwn.h"
 
 #define VFWAPI	WINAPI

include/wine/obj_base.h

@@ -32,29 +32,11 @@
  * Defines the basic types
  */
 #include "wtypes.h"
-
+#include "guiddef.h"
 
 #define LISet32(li, v)   ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
 #define ULISet32(li, v)  ((li).HighPart = 0, (li).LowPart = (v))
 
-/*****************************************************************************
- * Macros to declare the GUIDs
- */
-#ifdef INITGUID
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        const GUID name = \
-	{ l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-#else
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    extern const GUID name
-#endif
-
-#define DEFINE_OLEGUID(name, l, w1, w2) \
-	DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
-
-#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
-
-
 /*****************************************************************************
  * GUID API
  */
@@ -72,28 +54,6 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
 
 INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
 
-BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
-BOOL WINAPI IsEqualGUID(REFGUID rguid1,REFGUID rguid2);
-/*#define IsEqualGUID WINELIB_NAME(IsEqualGUID)*/
-#if defined(__cplusplus) && !defined(CINTERFACE)
-#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
-#else /* defined(__cplusplus) && !defined(CINTERFACE) */
-#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
-#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
-#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
-#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
-{
-    return !memcmp(&guidOne,&guidOther,sizeof(GUID));
-}
-inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
-{
-    return !(guidOne == guidOther);
-}
-#endif 
-
 
 /*****************************************************************************
  * Macros to define a COM interface

include/wine/obj_commdlgbrowser.h

@@ -15,7 +15,6 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
-DEFINE_SHLGUID(IID_ICommDlgBrowser,     0x000214F1L, 0, 0);
 typedef struct 	ICommDlgBrowser ICommDlgBrowser, *LPCOMMDLGBROWSER;
 
 /* for OnStateChange*/

include/wine/obj_contextmenu.h

@@ -18,8 +18,6 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
-DEFINE_SHLGUID(IID_IContextMenu,        0x000214E4L, 0, 0);
-DEFINE_SHLGUID(IID_IContextMenu2,       0x000214F4L, 0, 0);
 typedef struct IContextMenu IContextMenu, *LPCONTEXTMENU;
 
 /* QueryContextMenu uFlags */

include/wine/obj_enumidlist.h

@@ -18,7 +18,6 @@ extern "C" {
 /*****************************************************************************
  * Predeclare the interfaces
  */
-DEFINE_SHLGUID(IID_IEnumIDList,         0x000214F2L, 0, 0);
 typedef struct IEnumIDList IEnumIDList, *LPENUMIDLIST;
 
 #define ICOM_INTERFACE IEnumIDList

include/wine/obj_extracticon.h

@@ -15,8 +15,6 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
-DEFINE_SHLGUID(IID_IExtractIconA,	0x000214EBL, 0, 0);
-DEFINE_SHLGUID(IID_IExtractIconW,	0x000214FAL, 0, 0);
 #define IID_IExtractIcon WINELIB_NAME_AW(IID_IExtractIcon)
 
 typedef struct IExtractIconA IExtractIconA,*LPEXTRACTICONA;

include/wine/obj_shellbrowser.h

@@ -22,7 +22,6 @@ extern "C" {
    typedef struct IShellBrowser IShellBrowser, *LPSHELLBROWSER;
 */
 
-DEFINE_SHLGUID(IID_IShellBrowser,       0x000214E2L, 0, 0);
 #define SID_SShellBrowser IID_IShellBrowser
 
 /* targets for GetWindow/SendControlMsg */

include/wine/obj_shellextinit.h

@@ -17,7 +17,6 @@ extern "C" {
 #endif /* defined(__cplusplus) */
 
 typedef struct 	IShellExtInit IShellExtInit, *LPSHELLEXTINIT;
-DEFINE_SHLGUID(IID_IShellExtInit,       0x000214E8L, 0, 0);
 
 #define ICOM_INTERFACE IShellExtInit
 #define IShellExtInit_METHODS \

include/wine/obj_shellfolder.h

@@ -46,10 +46,8 @@ typedef struct _STRRET
 /*****************************************************************************
  * Predeclare the interfaces
  */
-DEFINE_SHLGUID(IID_IShellFolder,        0x000214E6L, 0, 0);
 typedef struct IShellFolder IShellFolder, *LPSHELLFOLDER;
 
-DEFINE_SHLGUID(IID_IPersistFolder,      0x000214EAL, 0, 0);
 typedef struct IPersistFolder IPersistFolder, *LPPERSISTFOLDER;
 
 DEFINE_GUID(IID_IPersistFolder2, 0x1ac3d9f0L, 0x175C, 0x11D1, 0x95, 0xBE, 0x00, 0x60, 0x97, 0x97, 0xEA, 0x4F);

include/wine/obj_shellview.h

@@ -24,7 +24,6 @@ extern "C" {
  */
 typedef struct IShellBrowser IShellBrowser, *LPSHELLBROWSER;
 
-DEFINE_SHLGUID(IID_IShellView,          0x000214E3L, 0, 0);
 typedef struct IShellView IShellView, *LPSHELLVIEW;
 
 /* shellview select item flags*/

include/wtypes.h

@@ -6,6 +6,7 @@
 #define __WINE_WTYPES_H
 
 #include "basetsd.h"
+#include "guiddef.h"
 #include "rpc.h"
 
 typedef WORD CLIPFORMAT, *LPCLIPFORMAT;
@@ -39,23 +40,6 @@ typedef __uint64 ULONGLONG, *PULONGLONG;
 #define OLESTR16(x) x
 #define OLESTR(x) L##x
 
-#if defined(__cplusplus) && !defined(CINTERFACE)
-#define REFGUID             const GUID &
-#define REFCLSID            const CLSID &
-#define REFIID              const IID &
-#define REFFMTID            const FMTID &
-#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
-#define REFGUID             const GUID* const
-#define REFCLSID            const CLSID* const
-#define REFIID              const IID* const
-#define REFFMTID            const FMTID* const
-#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
-
-extern const IID GUID_NULL;
-#define IID_NULL            GUID_NULL
-#define CLSID_NULL GUID_NULL
-#define FMTID_NULL          GUID_NULL
-   
 typedef enum tagDVASPECT
 { 
        DVASPECT_CONTENT   = 1,