reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

initguid.h should only contain the macro that defines the guids.

Browse Source 
Added olectl.h to guid.c so some needed guids get defined.
Made GUID_NULL an actual guid set to 0,0,0...
This commit is contained in:
Adrian Thurston 1999-04-01 11:47:09 +00:00 committed by Alexandre Julliard
parent 466cd44484
commit 5a09711873
5 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/initguid.h
View File

@ -14,19 +14,10 @@
/*****************************************************************************
* Macros to declare the GUIDs
*/
#ifdef INITGUID
#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 } }
#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)
#endif

2
include/shlguid.h
View File

@ -1,7 +1,7 @@
#ifndef __WINE_SHLGUID_H
#define __WINE_SHLGUID_H
#include "initguid.h"
#include "wine/obj_base.h"
DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0);
DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0);

2
include/wine/obj_olefont.h
View File

@ -13,8 +13,6 @@
/*****************************************************************************
* Predeclare the interfaces
*/
DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D, 0xE3, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51);
DEFINE_GUID(IID_IFont, 0xBEF6E002, 0xA874, 0x101A, 0x8B, 0xBA, 0x00, 0xAA, 0x00, 0x30, 0x0C, 0xAB);
typedef struct IFont IFont,*LPFONT;

4
include/wtypes.h
View File

@ -63,8 +63,8 @@ typedef GUID FMTID,*LPFMTID;
#define REFFMTID const FMTID* const
#endif // !__cplusplus
#define GUID_NULL ((GUID*)NULL) /* Is this right? */
#define CLSID_NULL ((REFCLSID)NULL)
extern const IID GUID_NULL;
#define CLSID_NULL GUID_NULL
typedef enum tagDVASPECT
{

4
ole/guid.c
View File

@ -9,6 +9,7 @@
*/
#include "oleidl.h"
#include "oaidl.h"
#include "olectl.h"
#include "ocidl.h"
#include "objbase.h"
#include "servprov.h"
@ -21,4 +22,7 @@
#include "shlguid.h"
#include "shlobj.h"
/* FIXME: don't really know where to put this. */
DEFINE_GUID(GUID_NULL, 0,0,0,0,0,0,0,0,0,0,0);
#endif