From fd2b4986a8bdfb346f7605cbadb0c61bb3b9c9be Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 23 Jun 2005 16:44:28 +0000 Subject: [PATCH] Use GUIDs from itss.idl. --- dlls/itss/itss.c | 8 +++----- dlls/itss/itss.idl | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 38ac36c2fc7..d781d604b33 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -35,7 +35,6 @@ #include "winreg.h" #include "ole2.h" -#include "itss.h" #include "uuids.h" #include "wine/unicode.h" @@ -43,14 +42,13 @@ #include "itsstor.h" +#define ITSS_INITGUID +#include "itss.h" + WINE_DEFAULT_DEBUG_CHANNEL(itss); #include "initguid.h" -DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec ); -DEFINE_GUID(CLSID_ITSProtocol,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); -DEFINE_GUID(IID_IITStorage, 0x88cc31de, 0x27ab, 0x11d0, 0x9d, 0xf9, 0x0, 0xa0, 0xc9, 0x22, 0xe6, 0xec); - static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); ULONG dll_count = 0; diff --git a/dlls/itss/itss.idl b/dlls/itss/itss.idl index b1c1cb578ce..718aff051dd 100644 --- a/dlls/itss/itss.idl +++ b/dlls/itss/itss.idl @@ -18,6 +18,10 @@ import "oaidl.idl"; +cpp_quote("#ifdef ITSS_INITGUID") +cpp_quote("#include \"initguid.h\"") +cpp_quote("#endif") + typedef struct _ITS_Control_Data { UINT cdwControlData; @@ -90,3 +94,4 @@ interface IITStorage : IUnknown cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec );"); cpp_quote("DEFINE_GUID(IID_IITStorage, 0x88cc31de, 0x27ab, 0x11d0, 0x9d, 0xf9, 0x0, 0xa0, 0xc9, 0x22, 0xe6, 0xec);"); +cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);"); -- 2.11.4.GIT