From 2292629085f79d1c2a2a8a9b2d0312858ccc7230 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Fri, 27 Apr 2007 22:27:46 +0000 Subject: [PATCH] - fix hhctrl.ocx and add to the build - remove autogenerated itss.h, it was committed accidentally svn path=/trunk/; revision=26548 --- .../dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild | 3 +- reactos/dll/win32/hhctrl.ocx/itss.h | 307 ------------------ reactos/dll/win32/win32.rbuild | 3 + 3 files changed, 5 insertions(+), 308 deletions(-) delete mode 100644 reactos/dll/win32/hhctrl.ocx/itss.h diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild index ed5027b7a72..1ff42e904a7 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild @@ -1,4 +1,4 @@ - + . include/reactos/wine @@ -9,6 +9,7 @@ 0x501 0x501 wine + uuid kernel32 user32 gdi32 diff --git a/reactos/dll/win32/hhctrl.ocx/itss.h b/reactos/dll/win32/hhctrl.ocx/itss.h deleted file mode 100644 index d0803c7baa0..00000000000 --- a/reactos/dll/win32/hhctrl.ocx/itss.h +++ /dev/null @@ -1,307 +0,0 @@ -/*** Autogenerated by WIDL 0.3.0 from dll\win32\hhctrl.ocx\itss.idl - Do not edit ***/ -#include -#include - -#ifndef __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H -#define __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H -#ifdef __cplusplus -extern "C" { -#endif -#include -typedef struct _ITS_Control_Data { - UINT cdwControlData; - UINT adwControlData[1]; -} ITS_Control_Data, *PITS_Control_Data; -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH = 1 -} ECompactionLev; -#ifndef __IITStorage_FWD_DEFINED__ -#define __IITStorage_FWD_DEFINED__ -typedef interface IITStorage IITStorage; -#endif - -/***************************************************************************** - * IITStorage interface - */ -#ifndef __IITStorage_INTERFACE_DEFINED__ -#define __IITStorage_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IITStorage, 0x88cc31de, 0x27ab, 0x11d0, 0x9d,0xf9, 0x00,0xa0,0xc9,0x22,0xe6,0xec); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IITStorage : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE StgCreateDocfile( - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgCreateDocfileOnILockBytes( - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgIsStorageFile( - const WCHAR* pwcsName) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgIsStorageILockBytes( - ILockBytes* plkbyt) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgOpenStorage( - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgOpenStorageOnILockBytes( - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen) = 0; - - virtual HRESULT STDMETHODCALLTYPE StgSetTimes( - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetControlData( - PITS_Control_Data pControlData) = 0; - - virtual HRESULT STDMETHODCALLTYPE DefaultControlData( - PITS_Control_Data* ppControlData) = 0; - - virtual HRESULT STDMETHODCALLTYPE Compact( - const WCHAR* pwcsName, - ECompactionLev iLev) = 0; - -}; -#else -typedef struct IITStorageVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IITStorage* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IITStorage* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IITStorage* This); - - /*** IITStorage methods ***/ - HRESULT (STDMETHODCALLTYPE *StgCreateDocfile)( - IITStorage* This, - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgCreateDocfileOnILockBytes)( - IITStorage* This, - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgIsStorageFile)( - IITStorage* This, - const WCHAR* pwcsName); - - HRESULT (STDMETHODCALLTYPE *StgIsStorageILockBytes)( - IITStorage* This, - ILockBytes* plkbyt); - - HRESULT (STDMETHODCALLTYPE *StgOpenStorage)( - IITStorage* This, - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgOpenStorageOnILockBytes)( - IITStorage* This, - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); - - HRESULT (STDMETHODCALLTYPE *StgSetTimes)( - IITStorage* This, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime); - - HRESULT (STDMETHODCALLTYPE *SetControlData)( - IITStorage* This, - PITS_Control_Data pControlData); - - HRESULT (STDMETHODCALLTYPE *DefaultControlData)( - IITStorage* This, - PITS_Control_Data* ppControlData); - - HRESULT (STDMETHODCALLTYPE *Compact)( - IITStorage* This, - const WCHAR* pwcsName, - ECompactionLev iLev); - - END_INTERFACE -} IITStorageVtbl; -interface IITStorage { - const IITStorageVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IITStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IITStorage_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IITStorage_Release(p) (p)->lpVtbl->Release(p) -/*** IITStorage methods ***/ -#define IITStorage_StgCreateDocfile(p,a,b,c,d) (p)->lpVtbl->StgCreateDocfile(p,a,b,c,d) -#define IITStorage_StgCreateDocfileOnILockBytes(p,a,b,c,d) (p)->lpVtbl->StgCreateDocfileOnILockBytes(p,a,b,c,d) -#define IITStorage_StgIsStorageFile(p,a) (p)->lpVtbl->StgIsStorageFile(p,a) -#define IITStorage_StgIsStorageILockBytes(p,a) (p)->lpVtbl->StgIsStorageILockBytes(p,a) -#define IITStorage_StgOpenStorage(p,a,b,c,d,e,f) (p)->lpVtbl->StgOpenStorage(p,a,b,c,d,e,f) -#define IITStorage_StgOpenStorageOnILockBytes(p,a,b,c,d,e,f) (p)->lpVtbl->StgOpenStorageOnILockBytes(p,a,b,c,d,e,f) -#define IITStorage_StgSetTimes(p,a,b,c,d) (p)->lpVtbl->StgSetTimes(p,a,b,c,d) -#define IITStorage_SetControlData(p,a) (p)->lpVtbl->SetControlData(p,a) -#define IITStorage_DefaultControlData(p,a) (p)->lpVtbl->DefaultControlData(p,a) -#define IITStorage_Compact(p,a,b) (p)->lpVtbl->Compact(p,a,b) -#endif - -#endif - -HRESULT CALLBACK IITStorage_StgCreateDocfile_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgCreateDocfile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgCreateDocfileOnILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt, - DWORD grfMode, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgCreateDocfileOnILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgIsStorageFile_Proxy( - IITStorage* This, - const WCHAR* pwcsName); -void __RPC_STUB IITStorage_StgIsStorageFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgIsStorageILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt); -void __RPC_STUB IITStorage_StgIsStorageILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgOpenStorage_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - IStorage* pstgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgOpenStorage_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgOpenStorageOnILockBytes_Proxy( - IITStorage* This, - ILockBytes* plkbyt, - IStorage* pStgPriority, - DWORD grfMode, - SNB snbExclude, - DWORD reserved, - IStorage** ppstgOpen); -void __RPC_STUB IITStorage_StgOpenStorageOnILockBytes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_StgSetTimes_Proxy( - IITStorage* This, - WCHAR* lpszName, - FILETIME* pctime, - FILETIME* patime, - FILETIME* pmtime); -void __RPC_STUB IITStorage_StgSetTimes_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_SetControlData_Proxy( - IITStorage* This, - PITS_Control_Data pControlData); -void __RPC_STUB IITStorage_SetControlData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_DefaultControlData_Proxy( - IITStorage* This, - PITS_Control_Data* ppControlData); -void __RPC_STUB IITStorage_DefaultControlData_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IITStorage_Compact_Proxy( - IITStorage* This, - const WCHAR* pwcsName, - ECompactionLev iLev); -void __RPC_STUB IITStorage_Compact_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IITStorage_INTERFACE_DEFINED__ */ - -DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec); -DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec); -DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); -DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); -/* Begin additional prototypes for all interfaces */ - -unsigned long __RPC_USER SNB_UserSize (unsigned long *, unsigned long, SNB *); -unsigned char * __RPC_USER SNB_UserMarshal (unsigned long *, unsigned char *, SNB *); -unsigned char * __RPC_USER SNB_UserUnmarshal(unsigned long *, unsigned char *, SNB *); -void __RPC_USER SNB_UserFree (unsigned long *, SNB *); - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_DLL_WIN32_HHCTRL_OCX_ITSS_H */ diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild index 33aaa46eac1..6507d5e463e 100644 --- a/reactos/dll/win32/win32.rbuild +++ b/reactos/dll/win32/win32.rbuild @@ -82,6 +82,9 @@ + + +