Skip to content

W
wine-winehq
Commit 47461203 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Build the .h files from their idl source at compile time, and remove

them from CVS.
parent 36482273
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 403 deletions
Make.rules.in
View file @ 47461203
......@@ -205,7 +205,7 @@ winapi_check:: dummy
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(SUBDIRS:%=%/__depend__)
depend: $(MAKEDEP) $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(INCLUDES) -C$(SRCDIR) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS)
.PHONY: depend $(SUBDIRS:%=%/__depend__)
......@@ -224,7 +224,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
testclean:: $(SUBDIRS:%=%/__testclean__)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS) $(RC_BINARIES)
$(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES)
.PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__)
......
Makefile.in
View file @ 47461203
......@@ -121,6 +121,21 @@ fonts/__install__ loader/__install__ server/__install__: libs tools
programs/__install__: libs tools include/__install__ dlls/__install-lib__
tools/__install__: tools
# Dependencies rules
$(SUBDIRS:%=%/__depend__): idl
idl: $(WIDL) dummy
cd include && $(MAKE) all
$(WIDL): $(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a
cd $(TOOLSDIR)/tools/widl && $(MAKE) `basename $@`
$(TOOLSDIR)/libs/libwpp.a $(TOOLSDIR)/libs/libwine_port.a:
cd $(TOOLSDIR)/libs && $(MAKE) `basename $@`
.PHONY: idl
# Test rules
checklink:: $(TESTSUBDIRS:%=%/__checklink__)
......
dlls/itss/Makefile.in
View file @ 47461203
......@@ -20,3 +20,6 @@ IDL_SRCS = \
@MAKE_DLL_RULES@
### Dependencies:
# note: this will get overwritten by make depend
$(ALL_OBJS): $(IDL_SRCS:.idl=.h)
dlls/ole32/Makefile.in
View file @ 47461203
......@@ -69,3 +69,6 @@ SUBDIRS = tests
@MAKE_DLL_RULES@
### Dependencies:
# note: this will get overwritten by make depend
$(ALL_OBJS): $(IDL_SRCS:.idl=.h)
include/Makefile.in
View file @ 47461203
......@@ -32,12 +32,14 @@ IDL_SRCS = \
wtypes.idl
IDL_INCLUDES = \
$(IDL_SRCS) \
axcore.idl \
axextend.idl \
devenum.idl \
dyngraph.idl
WINDOWS_INCLUDES = \
$(IDL_INCLUDES) \
accctrl.h \
aclapi.h \
audevcod.h \
......@@ -243,10 +245,7 @@ WINDOWS_INCLUDES = \
wsipx.h \
wsnwlink.h \
xcmc.h \
zmouse.h \
$(IDL_INCLUDES) \
$(IDL_SRCS) \
$(IDL_SRCS:.idl=.h)
zmouse.h
MSVCRT_INCLUDES = \
msvcrt/conio.h \
......@@ -295,18 +294,21 @@ EXTRASUBDIRS = msvcrt msvcrt/sys wine
@MAKE_RULES@
all: $(IDL_SRCS:.idl=.h)
IDL_HEADERS = $(IDL_SRCS:.idl=.h)
all: $(IDL_HEADERS)
install:: $(IDL_SRCS:.idl=.h)
install:: $(IDL_HEADERS)
$(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys
for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done
for f in $(IDL_HEADERS); do $(INSTALL_DATA) $$f $(includedir)/windows/$$f; done
for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done
for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/$$f; done
# Don't just do a rm -rf on $(includedir) -- don't want to wipe out
# anything extra the user may have put there.
uninstall::
[ -d $(includedir)/windows ] && cd $(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) || true
[ -d $(includedir)/windows ] && cd $(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(IDL_HEADERS) || true
[ -d $(includedir) ] && cd $(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) || true
-rmdir $(includedir)/msvcrt/sys $(includedir)/msvcrt $(includedir)/windows $(includedir)
......
include/oaidl.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/objidl.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/ocidl.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/oleidl.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/servprov.h deleted 100644 → 0
View file @ 36482273
/*** Autogenerated by WIDL 0.1 from servprov.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
#ifndef __WIDL_SERVPROV_H
#define __WIDL_SERVPROV_H
#ifdef __cplusplus
extern "C" {
#endif
#include <objidl.h>
#ifndef __IServiceProvider_FWD_DEFINED__
#define __IServiceProvider_FWD_DEFINED__
typedef struct IServiceProvider IServiceProvider;
#endif
typedef IServiceProvider *LPSERVICEPROVIDER;
/*****************************************************************************
* IServiceProvider interface
*/
#ifndef __IServiceProvider_INTERFACE_DEFINED__
#define __IServiceProvider_INTERFACE_DEFINED__
DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa);
#if defined(__cplusplus) && !defined(CINTERFACE)
struct IServiceProvider : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE QueryService(
REFGUID guidService,
REFIID riid,
void** ppvObject) = 0;
};
#else
typedef struct IServiceProviderVtbl IServiceProviderVtbl;
struct IServiceProvider {
const IServiceProviderVtbl* lpVtbl;
};
struct IServiceProviderVtbl {
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IServiceProvider* This,
REFIID riid,
void** ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
IServiceProvider* This);
ULONG (STDMETHODCALLTYPE *Release)(
IServiceProvider* This);
/*** IServiceProvider methods ***/
HRESULT (STDMETHODCALLTYPE *QueryService)(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
void** ppvObject);
END_INTERFACE
};
#ifdef COBJMACROS
/*** IUnknown methods ***/
#define IServiceProvider_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IServiceProvider_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IServiceProvider_Release(p) (p)->lpVtbl->Release(p)
/*** IServiceProvider methods ***/
#define IServiceProvider_QueryService(p,a,b,c) (p)->lpVtbl->QueryService(p,a,b,c)
#endif
#endif
#define IServiceProvider_METHODS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD_(ULONG,Release)(THIS) PURE; \
/*** IServiceProvider methods ***/ \
STDMETHOD_(HRESULT,QueryService)(THIS_ REFGUID guidService, REFIID riid, void** ppvObject) PURE;
HRESULT CALLBACK IServiceProvider_RemoteQueryService_Proxy(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
IUnknown** ppvObject);
void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IServiceProvider_QueryService_Proxy(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
void** ppvObject);
HRESULT __RPC_STUB IServiceProvider_QueryService_Stub(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
IUnknown** ppvObject);
#endif /* __IServiceProvider_INTERFACE_DEFINED__ */
#ifdef __cplusplus
}
#endif
#endif /* __WIDL_SERVPROV_H */
include/shobjidl.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/shtypes.h deleted 100644 → 0
View file @ 36482273
/*** Autogenerated by WIDL 0.1 from shtypes.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
#ifndef __WIDL_SHTYPES_H
#define __WIDL_SHTYPES_H
#ifdef __cplusplus
extern "C" {
#endif
#include <wtypes.h>
#include <pshpack1.h>
typedef struct {
WORD cb;
BYTE abID[1];
} SHITEMID, *LPSHITEMID;
typedef const SHITEMID *LPCSHITEMID;
typedef struct _ITEMIDLIST {
SHITEMID mkid;
} ITEMIDLIST, *LPITEMIDLIST;
typedef const ITEMIDLIST *LPCITEMIDLIST;
#include <poppack.h>
#if 0
typedef struct {
int dummy;
} WIN32_FIND_DATAA, WIN32_FIND_DATAW;
#endif
typedef enum tagSTRRET_TYPE {
STRRET_WSTR = 0,
STRRET_OFFSET = 1,
STRRET_CSTR = 2
} STRRET_TYPE;
#include <pshpack4.h>
typedef struct _STRRET {
UINT uType;
union {
LPWSTR pOleStr;
UINT uOffset;
char cStr[260];
} DUMMYUNIONNAME;
} STRRET, *LPSTRRET;
#include <poppack.h>
#include <pshpack1.h>
typedef struct {
int fmt;
int cxChar;
STRRET str;
} SHELLDETAILS, *LPSHELLDETAILS;
#include <poppack.h>
#ifdef __cplusplus
}
#endif
#endif /* __WIDL_SHTYPES_H */
include/strmif.h deleted 100644 → 0
View file @ 36482273
This source diff could not be displayed because it is too large. You can view the blob instead.
include/unknwn.h deleted 100644 → 0
View file @ 36482273
/*** Autogenerated by WIDL 0.1 from unknwn.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
#ifndef __WIDL_UNKNWN_H
#define __WIDL_UNKNWN_H
#ifdef __cplusplus
extern "C" {
#endif
#include <wtypes.h>
#ifndef __IUnknown_FWD_DEFINED__
#define __IUnknown_FWD_DEFINED__
typedef struct IUnknown IUnknown;
#endif
typedef IUnknown *LPUNKNOWN;
/*****************************************************************************
* IUnknown interface
*/
#ifndef __IUnknown_INTERFACE_DEFINED__
#define __IUnknown_INTERFACE_DEFINED__
DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
struct IUnknown
{
BEGIN_INTERFACE
virtual HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
void** ppvObject) = 0;
virtual ULONG STDMETHODCALLTYPE AddRef(
) = 0;
virtual ULONG STDMETHODCALLTYPE Release(
) = 0;
END_INTERFACE
};
#else
typedef struct IUnknownVtbl IUnknownVtbl;
struct IUnknown {
const IUnknownVtbl* lpVtbl;
};
struct IUnknownVtbl {
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IUnknown* This,
REFIID riid,
void** ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
IUnknown* This);
ULONG (STDMETHODCALLTYPE *Release)(
IUnknown* This);
END_INTERFACE
};
#ifdef COBJMACROS
/*** IUnknown methods ***/
#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IUnknown_Release(p) (p)->lpVtbl->Release(p)
#endif
#endif
#define IUnknown_METHODS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD_(ULONG,Release)(THIS) PURE;
HRESULT CALLBACK IUnknown_QueryInterface_Proxy(
IUnknown* This,
REFIID riid,
void** ppvObject);
void __RPC_STUB IUnknown_QueryInterface_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
ULONG CALLBACK IUnknown_AddRef_Proxy(
IUnknown* This);
void __RPC_STUB IUnknown_AddRef_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
ULONG CALLBACK IUnknown_Release_Proxy(
IUnknown* This);
void __RPC_STUB IUnknown_Release_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
#endif /* __IUnknown_INTERFACE_DEFINED__ */
#ifndef __IClassFactory_FWD_DEFINED__
#define __IClassFactory_FWD_DEFINED__
typedef struct IClassFactory IClassFactory;
#endif
typedef IClassFactory *LPCLASSFACTORY;
/*****************************************************************************
* IClassFactory interface
*/
#ifndef __IClassFactory_INTERFACE_DEFINED__
#define __IClassFactory_INTERFACE_DEFINED__
DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
struct IClassFactory : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE CreateInstance(
IUnknown* pUnkOuter,
REFIID riid,
void** ppvObject) = 0;
virtual HRESULT STDMETHODCALLTYPE LockServer(
BOOL fLock) = 0;
};
#else
typedef struct IClassFactoryVtbl IClassFactoryVtbl;
struct IClassFactory {
const IClassFactoryVtbl* lpVtbl;
};
struct IClassFactoryVtbl {
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IClassFactory* This,
REFIID riid,
void** ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
IClassFactory* This);
ULONG (STDMETHODCALLTYPE *Release)(
IClassFactory* This);
/*** IClassFactory methods ***/
HRESULT (STDMETHODCALLTYPE *CreateInstance)(
IClassFactory* This,
IUnknown* pUnkOuter,
REFIID riid,
void** ppvObject);
HRESULT (STDMETHODCALLTYPE *LockServer)(
IClassFactory* This,
BOOL fLock);
END_INTERFACE
};
#ifdef COBJMACROS
/*** IUnknown methods ***/
#define IClassFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IClassFactory_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IClassFactory_Release(p) (p)->lpVtbl->Release(p)
/*** IClassFactory methods ***/
#define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c)
#define IClassFactory_LockServer(p,a) (p)->lpVtbl->LockServer(p,a)
#endif
#endif
#define IClassFactory_METHODS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD_(ULONG,Release)(THIS) PURE; \
/*** IClassFactory methods ***/ \
STDMETHOD_(HRESULT,CreateInstance)(THIS_ IUnknown* pUnkOuter, REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(HRESULT,LockServer)(THIS_ BOOL fLock) PURE;
HRESULT CALLBACK IClassFactory_RemoteCreateInstance_Proxy(
IClassFactory* This,
REFIID riid,
IUnknown** ppvObject);
void __RPC_STUB IClassFactory_RemoteCreateInstance_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IClassFactory_CreateInstance_Proxy(
IClassFactory* This,
IUnknown* pUnkOuter,
REFIID riid,
void** ppvObject);
HRESULT __RPC_STUB IClassFactory_CreateInstance_Stub(
IClassFactory* This,
REFIID riid,
IUnknown** ppvObject);
HRESULT CALLBACK IClassFactory_RemoteLockServer_Proxy(
IClassFactory* This,
BOOL fLock);
void __RPC_STUB IClassFactory_RemoteLockServer_Stub(
struct IRpcStubBuffer* This,
struct IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IClassFactory_LockServer_Proxy(
IClassFactory* This,
BOOL fLock);
HRESULT __RPC_STUB IClassFactory_LockServer_Stub(
IClassFactory* This,
BOOL fLock);
#endif /* __IClassFactory_INTERFACE_DEFINED__ */
#ifdef __cplusplus
}
#endif
#endif /* __WIDL_UNKNWN_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment