PATCH: ftmarshal static

Marcus Meissner marcus at jet.franken.de
Sun May 15 05:12:04 CDT 2005


Hi,

Ciao, Marcus

Changelog:
	staticify FTMarshalImpl definition.

Index: dlls/ole32/ftmarshal.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ftmarshal.c,v
retrieving revision 1.14
diff -u -r1.14 ftmarshal.c
--- dlls/ole32/ftmarshal.c	21 Mar 2005 11:26:04 -0000	1.14
+++ dlls/ole32/ftmarshal.c	15 May 2005 10:11:27 -0000
@@ -51,7 +51,8 @@
 #define _ICOM_THIS_From_IFTMarshal(class, name) class* This = (class*)(((char*)name)-_IFTMarshall_Offset);
 
 /* inner IUnknown to handle aggregation */
-HRESULT WINAPI IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv)
+static HRESULT WINAPI
+IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv)
 {
 
     FTMarshalImpl *This = (FTMarshalImpl *)iface;
@@ -71,7 +72,7 @@
     return S_OK;
 }
 
-ULONG WINAPI IiFTMUnknown_fnAddRef (IUnknown * iface)
+static ULONG WINAPI IiFTMUnknown_fnAddRef (IUnknown * iface)
 {
 
     FTMarshalImpl *This = (FTMarshalImpl *)iface;
@@ -80,7 +81,7 @@
     return InterlockedIncrement (&This->ref);
 }
 
-ULONG WINAPI IiFTMUnknown_fnRelease (IUnknown * iface)
+static ULONG WINAPI IiFTMUnknown_fnRelease (IUnknown * iface)
 {
 
     FTMarshalImpl *This = (FTMarshalImpl *)iface;
@@ -99,7 +100,8 @@
 	IiFTMUnknown_fnRelease
 };
 
-HRESULT WINAPI FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv)
+static HRESULT WINAPI
+FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv)
 {
 
     _ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
@@ -108,7 +110,8 @@
     return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv);
 }
 
-ULONG WINAPI FTMarshalImpl_AddRef (LPMARSHAL iface)
+static ULONG WINAPI
+FTMarshalImpl_AddRef (LPMARSHAL iface)
 {
 
     _ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
@@ -117,7 +120,8 @@
     return IUnknown_AddRef (This->pUnkOuter);
 }
 
-ULONG WINAPI FTMarshalImpl_Release (LPMARSHAL iface)
+static ULONG WINAPI
+FTMarshalImpl_Release (LPMARSHAL iface)
 {
 
     _ICOM_THIS_From_IFTMarshal (FTMarshalImpl, iface);
@@ -126,14 +130,16 @@
     return IUnknown_Release (This->pUnkOuter);
 }
 
-HRESULT WINAPI FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
+static HRESULT WINAPI
+FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
 						void *pvDestContext, DWORD mshlflags, CLSID * pCid)
 {
     FIXME ("(), stub!\n");
     return S_OK;
 }
 
-HRESULT WINAPI FTMarshalImpl_GetMarshalSizeMax (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
+static HRESULT WINAPI
+FTMarshalImpl_GetMarshalSizeMax (LPMARSHAL iface, REFIID riid, void *pv, DWORD dwDestContext,
 						void *pvDestContext, DWORD mshlflags, DWORD * pSize)
 {
 
@@ -158,8 +164,9 @@
     return hres;
 }
 
-HRESULT WINAPI FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void *pv,
-					       DWORD dwDestContext, void *pvDestContext, DWORD mshlflags)
+static HRESULT WINAPI
+FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void *pv,
+			       DWORD dwDestContext, void *pvDestContext, DWORD mshlflags)
 {
 
     IMarshal *pMarshal = NULL;
@@ -182,25 +189,26 @@
     return hres;
 }
 
-HRESULT WINAPI FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void **ppv)
+static HRESULT WINAPI
+FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, void **ppv)
 {
     FIXME ("(), stub!\n");
     return S_OK;
 }
 
-HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm)
+static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm)
 {
     FIXME ("(), stub!\n");
     return S_OK;
 }
 
-HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved)
+static HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved)
 {
     FIXME ("(), stub!\n");
     return S_OK;
 }
 
-IMarshalVtbl ftmvtbl =
+static IMarshalVtbl ftmvtbl =
 {
 	FTMarshalImpl_QueryInterface,
 	FTMarshalImpl_AddRef,
-- 



More information about the wine-patches mailing list