diff --git a/dlls/itss/.cvsignore b/dlls/itss/.cvsignore index a6beecfbe83..f8b761be425 100644 --- a/dlls/itss/.cvsignore +++ b/dlls/itss/.cvsignore @@ -1,3 +1,2 @@ Makefile itss.dll.dbg.c -itss.h diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 49a30d9c7a2..37d8fa2d544 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -15,12 +15,6 @@ C_SRCS = \ regsvr.c \ storage.c -IDL_SRCS = \ - itss.idl - @MAKE_DLL_RULES@ ### Dependencies: - -# note: this will get overwritten by make depend -$(ALL_OBJS): $(IDL_SRCS:.idl=.h) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 84c5b410839..b89de227f07 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -42,13 +42,11 @@ #include "itsstor.h" -#define ITSS_INITGUID -#include "itss.h" +#include "initguid.h" +#include "wine/itss.h" WINE_DEFAULT_DEBUG_CHANNEL(itss); -#include "initguid.h" - static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); LONG dll_count = 0; diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 481f65357af..4668baf6b4d 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -34,9 +34,9 @@ #include "winreg.h" #include "ole2.h" -#include "itss.h" #include "uuids.h" +#include "wine/itss.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/itss/regsvr.c b/dlls/itss/regsvr.c index c2dbd99a684..a7bc32163d0 100644 --- a/dlls/itss/regsvr.c +++ b/dlls/itss/regsvr.c @@ -28,8 +28,7 @@ #include "winerror.h" #include "ole2.h" -#include "itss.h" - +#include "wine/itss.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(itss); diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 85e8398a1b5..b0621aba591 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -36,10 +36,10 @@ #include "uuids.h" -#include "itss.h" #include "chm_lib.h" #include "itsstor.h" +#include "wine/itss.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index 8ef0728cf6b..5c205215e0b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -42,7 +42,8 @@ IDL_SRCS = \ urlmon.idl \ wtypes.idl \ xmldom.idl \ - xmldso.idl + xmldso.idl \ + wine/itss.idl IDL_INCLUDES = \ $(IDL_SRCS) \ diff --git a/include/wine/.cvsignore b/include/wine/.cvsignore index 67020331ba6..31d9fc29cd1 100644 --- a/include/wine/.cvsignore +++ b/include/wine/.cvsignore @@ -1 +1 @@ -version.h +itss.h diff --git a/dlls/itss/itss.idl b/include/wine/itss.idl similarity index 92% rename from dlls/itss/itss.idl rename to include/wine/itss.idl index 718aff051dd..d8eed662267 100644 --- a/dlls/itss/itss.idl +++ b/include/wine/itss.idl @@ -18,10 +18,6 @@ import "oaidl.idl"; -cpp_quote("#ifdef ITSS_INITGUID") -cpp_quote("#include \"initguid.h\"") -cpp_quote("#endif") - typedef struct _ITS_Control_Data { UINT cdwControlData; @@ -36,6 +32,7 @@ typedef enum ECompactionLev { [ object, + uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), pointer_default(unique) ] interface IITStorage : IUnknown @@ -93,5 +90,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);");