Fix shell32 build. Modified: trunk/reactos/include/wine/shlguid.h Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/w32api/include/shlguid.h Modified: trunk/reactos/w32api/include/shlobj.h _____
Modified: trunk/reactos/include/wine/shlguid.h --- trunk/reactos/include/wine/shlguid.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/include/wine/shlguid.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -56,4 +56,6 @@
DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8);
+DEFINE_GUID(IID_IShellLinkDataList, 0x45e2b4ae, 0xb1c3, 0x11d0, 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); + #endif /* __WINE_SHLGUID_H */ _____
Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-08-05 10:01:51 UTC (rev 17064) @@ -428,7 +428,7 @@
IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; const static DWORD dwDesktopAttributes = - SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGE_ANCESTOR | + SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER;
TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", _____
Modified: trunk/reactos/w32api/include/shlguid.h --- trunk/reactos/w32api/include/shlguid.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/w32api/include/shlguid.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -38,6 +38,7 @@
extern const GUID IID_IPersistFolder; extern const GUID IID_IExtractIconA; extern const GUID IID_IShellLinkA; +extern const GUID IID_IShellLinkDataList; extern const GUID IID_IShellCopyHookA; extern const GUID IID_IFileViewerA; extern const GUID IID_ICommDlgBrowser; _____
Modified: trunk/reactos/w32api/include/shlobj.h --- trunk/reactos/w32api/include/shlobj.h 2005-08-05 09:38:12 UTC (rev 17063) +++ trunk/reactos/w32api/include/shlobj.h 2005-08-05 10:01:51 UTC (rev 17064) @@ -95,6 +95,7 @@
#define SFGAO_CANCOPY DROPEFFECT_COPY #define SFGAO_CANMOVE DROPEFFECT_MOVE #define SFGAO_CANLINK DROPEFFECT_LINK +#define SFGAO_STORAGE 0x00000008L #define SFGAO_CANRENAME 0x00000010L #define SFGAO_CANDELETE 0x00000020L #define SFGAO_HASPROPSHEET 0x00000040L @@ -114,6 +115,7 @@ #define SFGAO_VALIDATE 0x01000000L #define SFGAO_REMOVABLE 0x02000000L #define SFGAO_COMPRESSED 0x04000000L +#define SFGAO_STORAGEANCESTOR 0x00800000L #define STRRET_WSTR 0 #define STRRET_OFFSET 1 #define STRRET_CSTR 2 @@ -1117,6 +1119,31 @@ #define IShellLinkW_SetPath(T,a) (T)->lpVtbl->SetPath(T,a) #endif
+#define INTERFACE IShellLinkDataList +DECLARE_INTERFACE_(IShellLinkDataList, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(AddDataBlock)(THIS_ PVOID) PURE; + STDMETHOD(CopyDataBlock)(THIS_ DWORD,PVOID*) PURE; + STDMETHOD(RemoveDataBlock)(THIS_ DWORD) PURE; + STDMETHOD(GetFlags)(THIS_ PDWORD) PURE; + STDMETHOD(SetFlags)(THIS_ DWORD) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IShellLinkDataList_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IShellLinkDataList_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IShellLinkDataList_Release(T) (T)->lpVtbl->Release(T) +#define IShellLinkDataList_AddDataBlock(T,a) (T)->lpVtbl->AddDataBlock(T,a) +#define IShellLinkDataList_CopyDataBlock(T,a,b) (T)->lpVtbl->CopyDataBlock(T,a,b) +#define IShellLinkDataList_RemoveDataBlock(T,a) (T)->lpVtbl->RemoveDataBlock(T,a) +#define IShellLinkDataList_GetFlags(T,a) (T)->lpVtbl->GetFlags(T,a) +#define IShellLinkDataList_SetFlags(T,a) (T)->lpVtbl->SetFlags(T,a) +#endif + #define INTERFACE IShellFolder DECLARE_INTERFACE_(IShellFolder, IUnknown) {