A lot of compiler L4 warnings fixed (some warnings disabled)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1982 10f7b99b-c216-0410-bff0-8a66a9350fd8

10 files changed, 146 insertions, 149 deletions

diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp b/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp
index f094311dd..fdff20133 100644
--- a/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp
+++ b/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp
@@ -50,7 +50,7 @@ HRESULT CreateAP7(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppA
 

     *ppAP = NULL;

 

-    HRESULT hr;

+    HRESULT hr = S_OK;

     if(clsid == CLSID_VMR7AllocatorPresenter && !(*ppAP = DNew CVMR7AllocatorPresenter(hWnd, hr))

        || clsid == CLSID_RM7AllocatorPresenter && !(*ppAP = DNew CRM7AllocatorPresenter(hWnd, hr))

        || clsid == CLSID_QT7AllocatorPresenter && !(*ppAP = DNew CQT7AllocatorPresenter(hWnd, hr)))

diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
index 9d6122cd2..f126c8f6d 100644
--- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp
@@ -122,49 +122,43 @@ static HRESULT TextureBlt(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<texcoords> v[4]
 

     HRESULT hr;

 

-    do

-    {

-        hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

-        hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

-

-        for(int i = 0; i < texcoords; i++)

-        {

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MAGFILTER, filter);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MINFILTER, filter);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MIPFILTER, filter);

-

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);

-        }

+	hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

+	hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

+

+	for(int i = 0; i < texcoords; i++)

+	{

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MAGFILTER, filter);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MINFILTER, filter);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MIPFILTER, filter);

 

-        //

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);

+	}

 

-        hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | FVF);

-        // hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(v[0]));

+	//

 

-        MYD3DVERTEX<texcoords> tmp = v[2];

-        v[2] = v[3];

-        v[3] = tmp;

-        hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

+	hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | FVF);

+	// hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(v[0]));

 

-        //

+	MYD3DVERTEX<texcoords> tmp = v[2];

+	v[2] = v[3];

+	v[3] = tmp;

+	hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

 

-        for(int i = 0; i < texcoords; i++)

-        {

-            pD3DDev->SetTexture(i, NULL);

-        }

+	//

 

-        return S_OK;

-    }

-    while(0);

+	for(int i = 0; i < texcoords; i++)

+	{

+		pD3DDev->SetTexture(i, NULL);

+	}

 

-    return E_FAIL;

+	return S_OK;

 }

 

 static HRESULT DrawRect(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4])

@@ -172,35 +166,29 @@ static HRESULT DrawRect(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4])
     if(!pD3DDev)

         return E_POINTER;

 

-    do

-    {

-        HRESULT hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

-        hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);

-        hr = pD3DDev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);

-        hr = pD3DDev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);

-        //D3DRS_COLORVERTEX

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

+	HRESULT hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

+	hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);

+	hr = pD3DDev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);

+	hr = pD3DDev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);

+	//D3DRS_COLORVERTEX

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

 

 

-        hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

+	hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

 

-        hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | D3DFVF_TEX0 | D3DFVF_DIFFUSE);

-        // hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(v[0]));

+	hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | D3DFVF_TEX0 | D3DFVF_DIFFUSE);

+	// hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(v[0]));

 

-        MYD3DVERTEX<0> tmp = v[2];

-        v[2] = v[3];

-        v[3] = tmp;

-        hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

+	MYD3DVERTEX<0> tmp = v[2];

+	v[2] = v[3];

+	v[3] = tmp;

+	hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

 

-        return S_OK;

-    }

-    while(0);

-

-    return E_FAIL;

+	return S_OK;

 }

 

 using namespace DSObjects;

@@ -928,7 +916,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString &_Error)
 		return E_UNEXPECTED;

 	}

 

-	HRESULT hr;

+	HRESULT hr = S_OK;

 	m_CurrentAdapter = GetAdapter(m_pD3D);

 

     /*		// TODO : add nVidia PerfHUD !!!

@@ -1738,7 +1726,7 @@ HRESULT CDX9AllocatorPresenter::TextureResizeBicubic2pass(IDirect3DTexture9* pTe
     // The 2 pass sampler is incorrect in that it only does bilinear resampling in the y direction.

     return TextureResizeBicubic1pass(pTexture, dst, SrcRect);

 

-    HRESULT hr;

+    /*HRESULT hr;

 

     // rotated?

     if(dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z

@@ -1853,7 +1841,7 @@ HRESULT CDX9AllocatorPresenter::TextureResizeBicubic2pass(IDirect3DTexture9* pTe
 

     m_pD3DDev->SetPixelShader(NULL);

 

-    return hr;

+    return hr;*/

 }

 

 HRESULT CDX9AllocatorPresenter::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture)

@@ -1997,7 +1985,7 @@ void CDX9AllocatorPresenter::CalculateJitter(LONGLONG PerfCounter)
 

 bool CDX9AllocatorPresenter::GetVBlank(int &_ScanLine, int &_bInVBlank, bool _bMeasureTime)

 {

-    LONGLONG llPerf;

+    LONGLONG llPerf = 0;

     if (_bMeasureTime)

         llPerf = GetRenderersData()->GetPerfCounter();

 

@@ -2060,7 +2048,7 @@ bool CDX9AllocatorPresenter::WaitForVBlankRange(int &_RasterStart, int _RasterSi
     bool bWaited = false;

     int ScanLine = 0;

     int InVBlank = 0;

-    LONGLONG llPerf;

+    LONGLONG llPerf = 0;

     if (_bMeasure)

         llPerf = GetRenderersData()->GetPerfCounter();

     GetVBlank(ScanLine, InVBlank, _bMeasure);

@@ -2162,7 +2150,7 @@ bool CDX9AllocatorPresenter::WaitForVBlankRange(int &_RasterStart, int _RasterSi
         ScanLineDiffLock += m_ScreenSize.cy;

     int LastLineDiffLock = ScanLineDiffLock;

 

-    LONGLONG llPerfLock;

+    LONGLONG llPerfLock = 0;

 

     while (1)

     {

diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
index eb92698e9..adfaba25c 100644
--- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp
@@ -1549,6 +1549,7 @@ STDMETHODIMP CEVRAllocatorPresenter::GetVideoService(HANDLE hDevice, REFIID riid
     else if (riid == __uuidof(IDirectXVideoProcessorService))

     {

         IDirectXVideoProcessorService*		pDXVAProcessor = (IDirectXVideoProcessorService*) *ppService;

+		UNUSED_ALWAYS(pDXVAProcessor);

     }

 

     return hr;

@@ -1609,7 +1610,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(AM_MEDIA_TYPE*	pMediaType)
 

 DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)

 {

-	SetThreadName(-1, "CEVRPresenter::MixerThread");

+	SetThreadName((DWORD)-1, "CEVRPresenter::MixerThread");

     CEVRAllocatorPresenter*		pThis = (CEVRAllocatorPresenter*) lpParam;

     pThis->GetMixerThread();

     return 0;

@@ -1618,7 +1619,7 @@ DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
 

 DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam)

 {

-	SetThreadName(-1, "CEVRPresenter::PresentThread");

+	SetThreadName((DWORD)-1, "CEVRPresenter::PresentThread");

     CEVRAllocatorPresenter*		pThis = (CEVRAllocatorPresenter*) lpParam;

     pThis->RenderThread();

     return 0;

@@ -1652,13 +1653,13 @@ bool ExtractInterlaced(const AM_MEDIA_TYPE* pmt)
 

 void CEVRAllocatorPresenter::GetMixerThread()

 {

-    HANDLE				hAvrt;

+    //HANDLE				hAvrt;

     HANDLE				hEvts[]		= { m_hEvtQuit};

     bool				bQuit		= false;

     TIMECAPS			tc;

     DWORD				dwResolution;

     DWORD				dwUser = 0;

-    DWORD				dwTaskIndex	= 0;

+    //DWORD				dwTaskIndex	= 0;

 

     // Tell Vista Multimedia Class Scheduler we are a playback thretad (increase priority)

 //	if (pfAvSetMmThreadCharacteristicsW)

@@ -1765,6 +1766,7 @@ LONGLONG CEVRAllocatorPresenter::GetClockTime(LONGLONG PerformanceCounter)
 

     double TimeChange = llPerf - m_ModeratedTimeLast;

     double ClockChange = llClockTime - m_ModeratedClockLast;

+	UNUSED_ALWAYS(ClockChange);

 

     m_ModeratedTimeLast = llPerf;

     m_ModeratedClockLast = llClockTime;

@@ -1999,8 +2001,6 @@ STDMETHODIMP_(bool) CEVRAllocatorPresenter::ResetDevice()
 

 void CEVRAllocatorPresenter::RenderThread()

 {

-    HANDLE				hAvrt;

-    DWORD				dwTaskIndex	= 0;

     HANDLE				hEvts[]		= { m_hEvtQuit, m_hEvtFlush};

     bool				bQuit		= false;

     TIMECAPS			tc;

@@ -2012,8 +2012,14 @@ void CEVRAllocatorPresenter::RenderThread()
 

 

     // Tell Vista Multimedia Class Scheduler we are a playback thretad (increase priority)

-    if (pfAvSetMmThreadCharacteristicsW)	hAvrt = pfAvSetMmThreadCharacteristicsW (L"Playback", &dwTaskIndex);

-    if (pfAvSetMmThreadPriority)			pfAvSetMmThreadPriority (hAvrt, AVRT_PRIORITY_HIGH /*AVRT_PRIORITY_CRITICAL*/);

+	HANDLE hAvrt = 0;

+    if (pfAvSetMmThreadCharacteristicsW)

+	{

+		DWORD dwTaskIndex	= 0;

+		hAvrt = pfAvSetMmThreadCharacteristicsW (L"Playback", &dwTaskIndex);

+		if (pfAvSetMmThreadPriority)

+			pfAvSetMmThreadPriority (hAvrt, AVRT_PRIORITY_HIGH /*AVRT_PRIORITY_CRITICAL*/);

+	}

 

     timeGetDevCaps(&tc, sizeof(TIMECAPS));

     dwResolution = min(max(tc.wPeriodMin, 0), tc.wPeriodMax);

@@ -2024,6 +2030,7 @@ void CEVRAllocatorPresenter::RenderThread()
     while (!bQuit)

     {

         LONGLONG	llPerf = GetRenderersData()->GetPerfCounter();

+		UNUSED_ALWAYS(llPerf);

         if (!s.m_RenderSettings.iVMR9VSyncAccurate && NextSleepTime == 0)

             NextSleepTime = 1;

         dwObject = WaitForMultipleObjects (countof(hEvts), hEvts, FALSE, max(NextSleepTime < 0 ? 1 : NextSleepTime, 0));

@@ -2070,7 +2077,8 @@ void CEVRAllocatorPresenter::RenderThread()
 //			if (WaitForMultipleObjects (countof(hEvtsBuff), hEvtsBuff, FALSE, INFINITE) == WAIT_OBJECT_0+2)

             {

                 CComPtr<IMFSample>		pMFSample;

-                LONGLONG	llPerf = GetRenderersData()->GetPerfCounter();

+				LONGLONG	llPerf = GetRenderersData()->GetPerfCounter();

+				UNUSED_ALWAYS(llPerf);

                 int nSamplesLeft = 0;

                 if (SUCCEEDED (GetScheduledSample(&pMFSample, nSamplesLeft)))

                 {

@@ -2481,7 +2489,8 @@ void CEVRAllocatorPresenter::MoveToScheduledList(IMFSample* pSample, bool _bSort
 //		double ForceFPS = 23.976;

         if (ForceFPS != 0.0)

             m_rtTimePerFrame = 10000000.0 / ForceFPS;

-        LONGLONG Duration = m_rtTimePerFrame;

+		LONGLONG Duration = m_rtTimePerFrame;

+		UNUSED_ALWAYS(Duration);

         LONGLONG PrevTime = m_LastScheduledUncorrectedSampleTime;

         LONGLONG Time;

         LONGLONG SetDuration;

diff --git a/src/filters/renderer/VideoRenderers/QT7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/QT7AllocatorPresenter.cpp
index 451c5b2e0..324dad529 100644
--- a/src/filters/renderer/VideoRenderers/QT7AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/QT7AllocatorPresenter.cpp
@@ -113,8 +113,8 @@ STDMETHODIMP CQT7AllocatorPresenter::DoBlt(const BITMAP& bm)
     if(FAILED(m_pVideoSurfaceOff->GetSurfaceDesc(&ddsd)))

         return E_FAIL;

 

-    int w = bm.bmWidth;

-    int h = abs(bm.bmHeight);

+    UINT w = (UINT)bm.bmWidth;

+    UINT h = abs(bm.bmHeight);

     int bpp = bm.bmBitsPixel;

 

     if((bpp == 16 || bpp == 24 || bpp == 32) && w == ddsd.dwWidth && h == ddsd.dwHeight)

diff --git a/src/filters/renderer/VideoRenderers/QT9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/QT9AllocatorPresenter.cpp
index 115f5b4a3..ac2957308 100644
--- a/src/filters/renderer/VideoRenderers/QT9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/QT9AllocatorPresenter.cpp
@@ -88,8 +88,8 @@ STDMETHODIMP CQT9AllocatorPresenter::DoBlt(const BITMAP& bm)
     if(FAILED(m_pVideoSurfaceOff->GetDesc(&d3dsd)))

         return E_FAIL;

 

-    int w = bm.bmWidth;

-    int h = abs(bm.bmHeight);

+    UINT w = (UINT)bm.bmWidth;

+    UINT h = abs(bm.bmHeight);

     int bpp = bm.bmBitsPixel;

     int dbpp =

         d3dsd.Format == D3DFMT_R8G8B8 || d3dsd.Format == D3DFMT_X8R8G8B8 || d3dsd.Format == D3DFMT_A8R8G8B8 ? 32 :

diff --git a/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.cpp
index 272ea2f1f..ec6e36650 100644
--- a/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/RM7AllocatorPresenter.cpp
@@ -160,6 +160,8 @@ STDMETHODIMP CRM7AllocatorPresenter::Blt(UCHAR* pImageData, RMABitmapInfoHeader*
 		DWORD w = pBitmapInfo->biWidth;

 		DWORD h = abs(pBitmapInfo->biHeight);

 		DWORD pitch = pBitmapInfo->biWidth*2;

+		UNUSED_ALWAYS(w);

+		UNUSED_ALWAYS(h);

 

 		BYTE* yvyu = pImageData + src.top*pitch + src.left*2;

 

@@ -190,6 +192,8 @@ STDMETHODIMP CRM7AllocatorPresenter::Blt(UCHAR* pImageData, RMABitmapInfoHeader*
 		DWORD w = pBitmapInfo->biWidth;

 		DWORD h = abs(pBitmapInfo->biHeight);

 		DWORD pitch = pBitmapInfo->biWidth*pBitmapInfo->biBitCount>>3;

+		UNUSED_ALWAYS(w);

+		UNUSED_ALWAYS(h);

 

 		BYTE* rgb = pImageData + src.top*pitch + src.left*(pBitmapInfo->biBitCount>>3);

 

diff --git a/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.cpp
index 7d5c25795..8681d5c9d 100644
--- a/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/RM9AllocatorPresenter.cpp
@@ -139,7 +139,9 @@ STDMETHODIMP CRM9AllocatorPresenter::Blt(UCHAR* pImageData, RMABitmapInfoHeader*
     {

         DWORD w = pBitmapInfo->biWidth;

         DWORD h = abs(pBitmapInfo->biHeight);

-        DWORD pitch = pBitmapInfo->biWidth*2;

+		DWORD pitch = pBitmapInfo->biWidth*2;

+		UNUSED_ALWAYS(w);

+		UNUSED_ALWAYS(h);

 

         BYTE* yvyu = pImageData + src.top*pitch + src.left*2;

 

@@ -169,7 +171,9 @@ STDMETHODIMP CRM9AllocatorPresenter::Blt(UCHAR* pImageData, RMABitmapInfoHeader*
     {

         DWORD w = pBitmapInfo->biWidth;

         DWORD h = abs(pBitmapInfo->biHeight);

-        DWORD pitch = pBitmapInfo->biWidth*pBitmapInfo->biBitCount>>3;

+		DWORD pitch = pBitmapInfo->biWidth*pBitmapInfo->biBitCount>>3;

+		UNUSED_ALWAYS(w);

+		UNUSED_ALWAYS(h);

 

         BYTE* rgb = pImageData + src.top*pitch + src.left*(pBitmapInfo->biBitCount>>3);

 

diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
index 9ff989588..3806759c0 100644
--- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
+++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp
@@ -347,75 +347,65 @@ HRESULT CBaseAP::TextureBlt(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<texcoords> v[
         return E_FAIL;

     }

 

-    HRESULT hr;

-    do

-    {

-        hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

-        hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

-

-        for(int i = 0; i < texcoords; i++)

-        {

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MAGFILTER, filter);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MINFILTER, filter);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_MIPFILTER, filter);

+	HRESULT hr;

+	hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

+	hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

+

+	for(int i = 0; i < texcoords; i++)

+	{

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MAGFILTER, filter);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MINFILTER, filter);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_MIPFILTER, filter);

 

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);

-            hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);

-        }

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP);

+		hr = pD3DDev->SetSamplerState(i, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP);

+	}

 

-        hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | FVF);

+	hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | FVF);

 

-        MYD3DVERTEX<texcoords> tmp = v[2];

-        v[2] = v[3];

-        v[3] = tmp;

-        hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

+	MYD3DVERTEX<texcoords> tmp = v[2];

+	v[2] = v[3];

+	v[3] = tmp;

+	hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

 

-        for(int i = 0; i < texcoords; i++)

-        {

-            pD3DDev->SetTexture(i, NULL);

-        }

+	for(int i = 0; i < texcoords; i++)

+	{

+		pD3DDev->SetTexture(i, NULL);

+	}

 

-        return S_OK;

-    }

-    while(0);

-    return E_FAIL;

+	return S_OK;

 }

 

 HRESULT CBaseAP::DrawRectBase(IDirect3DDevice9* pD3DDev, MYD3DVERTEX<0> v[4])

 {

     if(!pD3DDev) return E_POINTER;

 

-    do

-    {

-        HRESULT hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

-        hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);

-        hr = pD3DDev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);

-        hr = pD3DDev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);

-        hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

-        hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

+	HRESULT hr = pD3DDev->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);

+	hr = pD3DDev->SetRenderState(D3DRS_LIGHTING, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ZENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_STENCILENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);

+	hr = pD3DDev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);

+	hr = pD3DDev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);

+	hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, FALSE);

+	hr = pD3DDev->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);

 

-        hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

+	hr = pD3DDev->SetRenderState(D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA|D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);

 

-        hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | D3DFVF_TEX0 | D3DFVF_DIFFUSE);

+	hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | D3DFVF_TEX0 | D3DFVF_DIFFUSE);

 

-        MYD3DVERTEX<0> tmp = v[2];

-        v[2] = v[3];

-        v[3] = tmp;

-        hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

+	MYD3DVERTEX<0> tmp = v[2];

+	v[2] = v[3];

+	v[3] = tmp;

+	hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, v, sizeof(v[0]));

 

-        return S_OK;

-    }

-    while(0);

-    return E_FAIL;

+	return S_OK;

 }

 

 MFOffset CBaseAP::GetOffset(float v)

@@ -1440,7 +1430,7 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector d
     // The 2 pass sampler is incorrect in that it only does bilinear resampling in the y direction.

     return TextureResizeBicubic1pass(pTexture, dst, SrcRect);

 

-    HRESULT hr;

+    /*HRESULT hr;

 

     // rotated?

     if(dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z

@@ -1517,7 +1507,7 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector d
     hr = m_pD3DDev->SetRenderTarget(0, pRTOld);

     hr = TextureBlt(m_pD3DDev, vy, D3DTEXF_POINT);

     m_pD3DDev->SetPixelShader(NULL);

-    return hr;

+    return hr;*/

 }

 

 HRESULT CBaseAP::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* pTexture)

@@ -3699,8 +3689,6 @@ DWORD WINAPI CSyncAP::RenderThreadStatic(LPVOID lpParam)
 // Get samples that have been received and queued up by MixerThread() and present them at the correct time by calling Paint().

 void CSyncAP::RenderThread()

 {

-    HANDLE hAvrt;

-    DWORD dwTaskIndex = 0;

     HANDLE hEvts[] = {m_hEvtQuit, m_hEvtFlush, m_hEvtSkip};

     bool bQuit = false;

     TIMECAPS tc;

@@ -3714,8 +3702,13 @@ void CSyncAP::RenderThread()
     CComPtr<IMFSample>pNewSample = NULL; // The sample next in line to be presented

 

     // Tell Vista Multimedia Class Scheduler we are doing threaded playback (increase priority)

-    if (pfAvSetMmThreadCharacteristicsW) hAvrt = pfAvSetMmThreadCharacteristicsW (L"Playback", &dwTaskIndex);

-    if (pfAvSetMmThreadPriority) pfAvSetMmThreadPriority (hAvrt, AVRT_PRIORITY_HIGH);

+	HANDLE hAvrt = 0;

+    if (pfAvSetMmThreadCharacteristicsW)

+	{

+		DWORD dwTaskIndex = 0;

+		hAvrt = pfAvSetMmThreadCharacteristicsW (L"Playback", &dwTaskIndex);

+		if (pfAvSetMmThreadPriority) pfAvSetMmThreadPriority (hAvrt, AVRT_PRIORITY_HIGH);

+	}

 

     // Set timer resolution

     timeGetDevCaps(&tc, sizeof(TIMECAPS));

@@ -4460,7 +4453,6 @@ HRESULT CGenlock::ResetClock()
     adjDelta = 0;

     if (syncClock == NULL) return E_FAIL;

     else return syncClock->AdjustClock(1.0);

-    return S_OK;

 }

 

 HRESULT CGenlock::SetTargetSyncOffset(DOUBLE targetD)

diff --git a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
index a450fdc32..d43b4f3ce 100644
--- a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp
@@ -195,7 +195,7 @@ STDMETHODIMP CVMR7AllocatorPresenter::FreeSurface(DWORD_PTR dwUserID)
 

 STDMETHODIMP CVMR7AllocatorPresenter::PrepareSurface(DWORD_PTR dwUserID, IDirectDrawSurface7* lpSurface, DWORD dwSurfaceFlags)

 {

-	SetThreadName(-1, "CVMR7AllocatorPresenter");

+	SetThreadName((DWORD)-1, "CVMR7AllocatorPresenter");

 

     if(!lpSurface)

         return E_POINTER;

diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
index a1a9975be..da879d0ff 100644
--- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
+++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp
@@ -459,8 +459,8 @@ public:
         *pHeight = s.Height();

         return hr;

         }

-        */

-        return E_NOTIMPL;

+		return E_NOTIMPL;

+		*/

     }

     STDMETHODIMP SetDefaultSourcePosition()

     {

@@ -773,7 +773,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::InitializeDevice(DWORD_PTR dwUserID, VMR9A
 

     hr = m_pD3DDev->ColorFill(m_pVideoSurface[m_nCurSurface], NULL, 0);

 

-    if (m_nVMR9Surfaces && m_nVMR9Surfaces != *lpNumBuffers)

+    if (m_nVMR9Surfaces && m_nVMR9Surfaces != (int)*lpNumBuffers)

         m_nVMR9Surfaces = *lpNumBuffers;

     *lpNumBuffers = min(nOriginal, *lpNumBuffers);

     m_iVMR9Surface = 0;

@@ -850,7 +850,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::StopPresenting(DWORD_PTR dwUserID)
 

 STDMETHODIMP CVMR9AllocatorPresenter::PresentImage(DWORD_PTR dwUserID, VMR9PresentationInfo* lpPresInfo)

 {

-	SetThreadName(-1, "CVMR9AllocatorPresenter");

+	SetThreadName((DWORD)-1, "CVMR9AllocatorPresenter");

     CheckPointer(m_pIVMRSurfAllocNotify, E_UNEXPECTED);

 

     if (m_rtTimePerFrame == 0 || m_bNeedCheckSample)