From e8c1bf3283f45a23c8a307f58cdd84004a0fe6fc Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Mon, 20 Jun 2005 18:39:40 +0000
Subject: [PATCH] Make functions static, fix declarations.

---
 dlls/quartz/control.c     | 2 +-
 dlls/quartz/enummedia.c   | 2 +-
 dlls/quartz/enummoniker.c | 8 +-------
 dlls/quartz/filesource.c  | 2 +-
 dlls/quartz/transform.c   | 8 ++++----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c
index b9d87903adb..9a930aecaab 100644
--- a/dlls/quartz/control.c
+++ b/dlls/quartz/control.c
@@ -163,7 +163,7 @@ HRESULT WINAPI MediaSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLON
     return E_INVALIDARG;
 }
 
-__inline LONGLONG Adjust(LONGLONG value, LONGLONG * pModifier, DWORD dwFlags)
+static inline LONGLONG Adjust(LONGLONG value, LONGLONG * pModifier, DWORD dwFlags)
 {
     switch (dwFlags & AM_SEEKING_PositioningBitsMask)
     {
diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c
index 060621013cd..43e96b28a62 100644
--- a/dlls/quartz/enummedia.c
+++ b/dlls/quartz/enummedia.c
@@ -50,7 +50,7 @@ void FreeMediaType(AM_MEDIA_TYPE * pMediaType)
     }
 }
 
-AM_MEDIA_TYPE * CreateMediaType(AM_MEDIA_TYPE const * pSrc)
+static AM_MEDIA_TYPE * CreateMediaType(AM_MEDIA_TYPE const * pSrc)
 {
     AM_MEDIA_TYPE * pDest;
     
diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c
index c0451ffa448..cfdf5f81b2c 100644
--- a/dlls/quartz/enummoniker.c
+++ b/dlls/quartz/enummoniker.c
@@ -21,16 +21,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <stdarg.h>
-
 #define COBJMACROS
 #define COM_NO_WINDOWS_H
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "strmif.h"
+#include "quartz_private.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 0020af989ea..5cd9f0f410b 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -677,7 +677,7 @@ typedef struct DATAREQUEST
     struct DATAREQUEST * pNext; /* next data request in list */
 } DATAREQUEST;
 
-void queue(DATAREQUEST * pHead, DATAREQUEST * pItem)
+static void queue(DATAREQUEST * pHead, DATAREQUEST * pItem)
 {
     DATAREQUEST * pCurrent;
     for (pCurrent = pHead; pCurrent->pNext; pCurrent = pCurrent->pNext)
diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c
index d692598f5fa..dc38b20bb9c 100644
--- a/dlls/quartz/transform.c
+++ b/dlls/quartz/transform.c
@@ -146,7 +146,7 @@ static HRESULT TransformFilter_InputPin_Construct(const PIN_INFO * pPinInfo, SAM
     return E_FAIL;
 }
 
-HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
+static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
 {
     OutputPin * pPinImpl;
 
@@ -497,7 +497,7 @@ static const IBaseFilterVtbl TransformFilter_Vtbl =
     TransformFilter_QueryVendorInfo
 };
 
-HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface)
+static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface)
 {
     InputPin* This = (InputPin*) iface;
     TransformFilterImpl* pTransform;
@@ -545,7 +545,7 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl =
     InputPin_NewSegment
 };
 
-HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
+static HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
 {
     IPinImpl *This = (IPinImpl *)iface;
     ENUMMEDIADETAILS emd;
@@ -558,7 +558,7 @@ HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTyp
     return IEnumMediaTypesImpl_Construct(&emd, ppEnum);
 }
 
-HRESULT WINAPI TransformFilter_Output_Disconnect(IPin * iface)
+static HRESULT WINAPI TransformFilter_Output_Disconnect(IPin * iface)
 {
     OutputPin* This = (OutputPin*)iface;
     HRESULT hr;