From 15382c5ed59f65f7039e1f7bad0ef084e62c09db Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 13 Feb 1999 08:57:29 +0000 Subject: [PATCH] Make the REFxxx types const even in C. Also add FMTID. --- include/objbase.h | 2 +- include/wtypes.h | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index d84d4a51983..ea6ab6fba9e 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -63,7 +63,7 @@ HRESULT WINAPI CoRegisterClassObject32(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwCl HRESULT WINAPI CoRevokeClassObject32(DWORD dwRegister); #define CoRevokeClassObject WINELIB_NAME(CoRevokeClassObject) -HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,LPVOID pvReserved, const REFIID iid, LPVOID *ppv); +HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,LPVOID pvReserved, REFIID iid, LPVOID *ppv); HRESULT WINAPI CoCreateInstance(REFCLSID rclsid,LPUNKNOWN pUnkOuter,DWORD dwClsContext,REFIID iid,LPVOID *ppv); diff --git a/include/wtypes.h b/include/wtypes.h index 00b9c935db4..5e66faa026a 100644 --- a/include/wtypes.h +++ b/include/wtypes.h @@ -34,27 +34,29 @@ DECL_WINELIB_TYPE(LPBSTR) #ifndef GUID_DEFINED #define GUID_DEFINED -typedef struct _GUID +struct _GUID { DWORD Data1; WORD Data2; WORD Data3; BYTE Data4[8]; -} GUID; +}; #endif -typedef GUID *LPGUID; -typedef GUID CLSID,*LPCLSID; -typedef GUID IID,*LPIID; - +typedef struct _GUID GUID,*LPGUID; +typedef struct _GUID CLSID,*LPCLSID; +typedef struct _GUID IID,*LPIID; +typedef struct _GUID FMTID,*LPFMTID; #ifdef __cplusplus #define REFGUID const GUID & -#define REFIID const IID & #define REFCLSID const CLSID & +#define REFIID const IID & +#define REFFMTID const FMTID & #else // !__cplusplus -#define REFGUID GUID * -#define REFIID IID * -#define REFCLSID CLSID * +#define REFGUID const GUID* const +#define REFCLSID const CLSID* const +#define REFIID const IID* const +#define REFFMTID const FMTID* const #endif // !__cplusplus