quartz: Remove WINAPI on static functions where not needed.
Francois Gouget
fgouget at codeweavers.com
Tue Nov 25 09:43:00 CST 2008
---
If you know other places where the functions touched by this patch
are used, please let me know. For more details, see:
http://www.winehq.org/pipermail/wine-patches/2008-November/064995.html
dlls/quartz/control.c | 6 +++---
dlls/quartz/filtergraph.c | 22 +++++++++++-----------
dlls/quartz/tests/filtergraph.c | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c
index a2db24b..36a610e 100644
--- a/dlls/quartz/control.c
+++ b/dlls/quartz/control.c
@@ -103,7 +103,7 @@ static const IUnknownVtbl IInner_VTable =
};
/* Generic functions for aggregation */
-static HRESULT WINAPI SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv)
+static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv)
{
if (This->bAggregatable)
This->bUnkOuterValid = TRUE;
@@ -131,14 +131,14 @@ static HRESULT WINAPI SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid,
return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv);
}
-static ULONG WINAPI SeekOuter_AddRef(PassThruImpl *This)
+static ULONG SeekOuter_AddRef(PassThruImpl *This)
{
if (This->pUnkOuter && This->bUnkOuterValid)
return IUnknown_AddRef(This->pUnkOuter);
return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl));
}
-static ULONG WINAPI SeekOuter_Release(PassThruImpl *This)
+static ULONG SeekOuter_Release(PassThruImpl *This)
{
if (This->pUnkOuter && This->bUnkOuterValid)
return IUnknown_Release(This->pUnkOuter);
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index c53771e..ff185ce 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -207,10 +207,10 @@ typedef struct _IFilterGraphImpl {
LONG recursioncount;
} IFilterGraphImpl;
-static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This,
- REFIID riid, LPVOID * ppv);
-static ULONG WINAPI Filtergraph_AddRef(IFilterGraphImpl *This);
-static ULONG WINAPI Filtergraph_Release(IFilterGraphImpl *This);
+static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This,
+ REFIID riid, LPVOID * ppv);
+static ULONG Filtergraph_AddRef(IFilterGraphImpl *This);
+static ULONG Filtergraph_Release(IFilterGraphImpl *This);
static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface,
REFIID riid,
@@ -585,7 +585,7 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface,
/* Don't allow a circular connection to form, return VFW_E_CIRCULAR_GRAPH if this would be the case.
* A circular connection will be formed if from the filter of the output pin, the input pin can be reached
*/
-static HRESULT WINAPI CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *in)
+static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *in)
{
#if 1
HRESULT hr;
@@ -1105,7 +1105,7 @@ out:
return SUCCEEDED(hr) ? S_OK : hr;
}
-static HRESULT WINAPI FilterGraph2_RenderRecurse(IFilterGraphImpl *This, IPin *ppinOut)
+static HRESULT FilterGraph2_RenderRecurse(IFilterGraphImpl *This, IPin *ppinOut)
{
/* This pin has been connected now, try to call render on all pins that aren't connected */
IPin *to = NULL;
@@ -5356,9 +5356,9 @@ static const IUnknownVtbl IInner_VTable =
FilterGraphInner_Release
};
-static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This,
- REFIID riid,
- LPVOID * ppv) {
+static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This,
+ REFIID riid,
+ LPVOID * ppv) {
if (This->bAggregatable)
This->bUnkOuterValid = TRUE;
@@ -5385,13 +5385,13 @@ static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This,
return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv);
}
-static ULONG WINAPI Filtergraph_AddRef(IFilterGraphImpl *This) {
+static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) {
if (This->pUnkOuter && This->bUnkOuterValid)
return IUnknown_AddRef(This->pUnkOuter);
return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl));
}
-static ULONG WINAPI Filtergraph_Release(IFilterGraphImpl *This) {
+static ULONG Filtergraph_Release(IFilterGraphImpl *This) {
if (This->pUnkOuter && This->bUnkOuterValid)
return IUnknown_Release(This->pUnkOuter);
return IUnknown_Release((IUnknown *)&(This->IInner_vtbl));
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index e273136..f56e722 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -772,7 +772,7 @@ static HRESULT WINAPI TestFilter_OutputPin_ReceiveConnection(IPin * iface, IPin
}
/* Private helper function */
-static HRESULT WINAPI TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
+static HRESULT TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt)
{
ITestPinImpl *This = (ITestPinImpl *)iface;
HRESULT hr;
--
1.5.6.5
More information about the wine-patches
mailing list