Moved itss.idl to include/wine.

dlls/itss/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 itss.dll.dbg.c
-itss.h

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)

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;

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"
 

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);

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"
 

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) \

include/wine/.cvsignore

@@ -1 +1 @@
-version.h
+itss.h

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);");