45 files changed, 4737 insertions, 2789 deletions

diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp
index 9e4ecff77..1ebae6cdc 100644
--- a/src/apps/mplayerc/FGFilter.cpp
+++ b/src/apps/mplayerc/FGFilter.cpp
@@ -24,6 +24,7 @@
 #include "..\..\DSUtil\DSUtil.h"

 #include "DX7AllocatorPresenter.h"

 #include "DX9AllocatorPresenter.h"

+#include "..\..\..\include\moreuuids.h"

 

 //

 // CFGFilter

@@ -199,41 +200,65 @@ CFGFilterRegistry::CFGFilterRegistry(const CLSID& clsid, UINT64 merit)
 		key.Close();

 	}

 

-	if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("CLSID\\{083863F1-70DE-11d0-BD40-00A0C911CE86}\\Instance\\") + guid, KEY_READ))

+	CRegKey catkey;

+

+	if(ERROR_SUCCESS == catkey.Open(HKEY_CLASSES_ROOT, _T("CLSID\\{083863F1-70DE-11d0-BD40-00A0C911CE86}\\Instance"), KEY_READ))

 	{

-		ULONG nChars = 0;

-		if(ERROR_SUCCESS == key.QueryStringValue(_T("FriendlyName"), NULL, &nChars))

+		if(ERROR_SUCCESS != key.Open(catkey, guid, KEY_READ))

 		{

-			CString name;

-			if(ERROR_SUCCESS == key.QueryStringValue(_T("FriendlyName"), name.GetBuffer(nChars), &nChars))

+			// illiminable pack uses the name of the filter and not the clsid, have to enum all keys to find it...

+

+			FILETIME ft;

+			TCHAR buff[256];

+			DWORD len = countof(buff);

+			for(DWORD i = 0; ERROR_SUCCESS == catkey.EnumKey(i, buff, &len, &ft); i++, len = countof(buff))

 			{

-				name.ReleaseBuffer(nChars);

-				m_name = name;

+				if(ERROR_SUCCESS == key.Open(catkey, buff, KEY_READ))

+				{

+					TCHAR clsid[256];

+					len = countof(clsid);

+					if(ERROR_SUCCESS == key.QueryStringValue(_T("CLSID"), clsid, &len) && GUIDFromCString(clsid) == m_clsid)

+						break;

+

+					key.Close();

+				}

 			}

 		}

 

-		ULONG nBytes = 0;

-		if(ERROR_SUCCESS == key.QueryBinaryValue(_T("FilterData"), NULL, &nBytes))

+		if(key)

 		{

-			CAutoVectorPtr<BYTE> buff;

-			if(buff.Allocate(nBytes) && ERROR_SUCCESS == key.QueryBinaryValue(_T("FilterData"), buff, &nBytes))

+			ULONG nChars = 0;

+			if(ERROR_SUCCESS == key.QueryStringValue(_T("FriendlyName"), NULL, &nChars))

 			{

-				ExtractFilterData(buff, nBytes);

+				CString name;

+				if(ERROR_SUCCESS == key.QueryStringValue(_T("FriendlyName"), name.GetBuffer(nChars), &nChars))

+				{

+					name.ReleaseBuffer(nChars);

+					m_name = name;

+				}

 			}

-		}

 

-		key.Close();

+			ULONG nBytes = 0;

+			if(ERROR_SUCCESS == key.QueryBinaryValue(_T("FilterData"), NULL, &nBytes))

+			{

+				CAutoVectorPtr<BYTE> buff;

+				if(buff.Allocate(nBytes) && ERROR_SUCCESS == key.QueryBinaryValue(_T("FilterData"), buff, &nBytes))

+				{

+					ExtractFilterData(buff, nBytes);

+				}

+			}

+

+			key.Close();

+		}

 	}

 

 	if(merit != MERIT64_DO_USE) m_merit.val = merit;

 }

 

-HRESULT CFGFilterRegistry::Create(IBaseFilter** ppBF, IUnknown** ppUnk)

+HRESULT CFGFilterRegistry::Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks)

 {

 	CheckPointer(ppBF, E_POINTER);

 

-	if(ppUnk) *ppUnk = NULL;

-

 	HRESULT hr = E_FAIL;

 	

 	if(m_pMoniker)

@@ -245,9 +270,13 @@ HRESULT CFGFilterRegistry::Create(IBaseFilter** ppBF, IUnknown** ppUnk)
 	}

 	else if(m_clsid != GUID_NULL)

 	{

-		CComPtr<IBaseFilter> pBF;

-		if(FAILED(pBF.CoCreateInstance(m_clsid))) return E_FAIL;

+		CComQIPtr<IBaseFilter> pBF;

+

+		if(FAILED(pBF.CoCreateInstance(m_clsid))) 

+			return E_FAIL;

+

 		*ppBF = pBF.Detach();

+		

 		hr = S_OK;

 	}

 

@@ -389,12 +418,10 @@ CFGFilterFile::CFGFilterFile(const CLSID& clsid, CString path, CStringW name, UI
 {

 }

 

-HRESULT CFGFilterFile::Create(IBaseFilter** ppBF, IUnknown** ppUnk)

+HRESULT CFGFilterFile::Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks)

 {

 	CheckPointer(ppBF, E_POINTER);

 

-	if(ppUnk) *ppUnk = NULL;

-

 	return LoadExternalFilter(m_path, m_clsid, ppBF);

 }

 

@@ -409,7 +436,7 @@ CFGFilterVideoRenderer::CFGFilterVideoRenderer(HWND hWnd, const CLSID& clsid, CS
 	AddType(MEDIATYPE_Video, MEDIASUBTYPE_NULL);

 }

 

-HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF, IUnknown** ppUnk)

+HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks)

 {

 	CheckPointer(ppBF, E_POINTER);

 

@@ -428,7 +455,7 @@ HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF, IUnknown** ppUnk)
 			if(SUCCEEDED(hr = pCAP->CreateRenderer(&pRenderer)))

 			{

 				*ppBF = CComQIPtr<IBaseFilter>(pRenderer).Detach();

-				if(ppUnk) *ppUnk = (IUnknown*)pCAP.Detach();

+				pUnks.AddTail(pCAP);

 			}

 		}

 	}

@@ -441,7 +468,7 @@ HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF, IUnknown** ppUnk)
 			{

 				if(CComQIPtr<IMixerPinConfig, &IID_IMixerPinConfig> pMPC = pPin)

 				{

-					if(ppUnk) *ppUnk = pMPC.Detach();

+					pUnks.AddTail(pMPC);

 					break;

 				}

 			}

@@ -590,3 +617,5 @@ int CFGFilterList::filter_cmp(const void* a, const void* b)
 

 	return 0;

 }

+

+

diff --git a/src/apps/mplayerc/FGFilter.h b/src/apps/mplayerc/FGFilter.h
index cae81c000..0a8d025ef 100644
--- a/src/apps/mplayerc/FGFilter.h
+++ b/src/apps/mplayerc/FGFilter.h
@@ -52,7 +52,7 @@ public:
 

 	CAtlList<CString> m_protocols, m_extensions, m_chkbytes; // TODO: subtype?

 

-	virtual HRESULT Create(IBaseFilter** ppBF, IUnknown** ppUnk) = 0;

+	virtual HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks) = 0;

 };

 

 class CFGFilterRegistry : public CFGFilter

@@ -71,7 +71,7 @@ public:
 	CStringW GetDisplayName() {return m_DisplayName;}

 	IMoniker* GetMoniker() {return m_pMoniker;}

 

-	HRESULT Create(IBaseFilter** ppBF, IUnknown** ppUnk);

+	HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);

 };

 

 template<class T>

@@ -80,12 +80,10 @@ class CFGFilterInternal : public CFGFilter
 public:

 	CFGFilterInternal(CStringW name = L"", UINT64 merit = MERIT64_DO_USE) : CFGFilter(__uuidof(T), name, merit) {}

 

-	HRESULT Create(IBaseFilter** ppBF, IUnknown** ppUnk)

+	HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks)

 	{

 		CheckPointer(ppBF, E_POINTER);

 

-		if(ppUnk) *ppUnk = NULL;

-

 		HRESULT hr = S_OK;

 		CComPtr<IBaseFilter> pBF = new T(NULL, &hr);

 		if(FAILED(hr)) return hr;

@@ -105,7 +103,7 @@ protected:
 public:

 	CFGFilterFile(const CLSID& clsid, CString path, CStringW name = L"", UINT64 merit = MERIT64_DO_USE);

 

-	HRESULT Create(IBaseFilter** ppBF, IUnknown** ppUnk);

+	HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);

 };

 

 class CFGFilterVideoRenderer : public CFGFilter

@@ -116,7 +114,7 @@ protected:
 public:

 	CFGFilterVideoRenderer(HWND hWnd, const CLSID& clsid, CStringW name = L"", UINT64 merit = MERIT64_DO_USE);

 

-	HRESULT Create(IBaseFilter** ppBF, IUnknown** ppUnk);

+	HRESULT Create(IBaseFilter** ppBF, CInterfaceList<IUnknown, &IID_IUnknown>& pUnks);

 };

 

 class CFGFilterList

@@ -130,6 +128,7 @@ public:
 	CFGFilterList();

 	virtual ~CFGFilterList();

 

+	bool IsEmpty() {return m_filters.IsEmpty();}

 	void RemoveAll();

 	void Insert(CFGFilter* pFGF, int group, bool exactmatch = false, bool autodelete = true);

 

diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp
index aa8697dc4..f62c57a01 100644
--- a/src/apps/mplayerc/FGManager.cpp
+++ b/src/apps/mplayerc/FGManager.cpp
@@ -152,6 +152,211 @@ bool CFGManager::CheckBytes(HANDLE hFile, CString chkbytes)
 	return sl.IsEmpty();

 }

 

+HRESULT CFGManager::EnumSourceFilters(LPCWSTR lpcwstrFileName, CFGFilterList& fl)

+{

+	// TODO: use overrides

+

+	CheckPointer(lpcwstrFileName, E_POINTER);

+

+	fl.RemoveAll();

+

+	CStringW fn = CStringW(lpcwstrFileName).TrimLeft();

+	CStringW protocol = fn.Left(fn.Find(':')+1).TrimRight(':').MakeLower();

+	CStringW ext = CPathW(fn).GetExtension().MakeLower();

+

+	HANDLE hFile = INVALID_HANDLE_VALUE;

+

+	if(protocol.GetLength() <= 1 || protocol == L"file")

+	{

+		hFile = CreateFile(CString(fn), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, (HANDLE)NULL);

+

+		if(hFile == INVALID_HANDLE_VALUE)

+		{

+			return VFW_E_NOT_FOUND;

+		}

+	}

+

+	TCHAR buff[256], buff2[256];

+	ULONG len, len2;

+

+	if(hFile == INVALID_HANDLE_VALUE)

+	{

+		// internal / protocol

+

+		POSITION pos = m_source.GetHeadPosition();

+		while(pos)

+		{

+			CFGFilter* pFGF = m_source.GetNext(pos);

+			if(pFGF->m_protocols.Find(CString(protocol)))

+				fl.Insert(pFGF, 0, false, false);

+		}

+	}

+	else

+	{

+		// internal / check bytes

+

+		POSITION pos = m_source.GetHeadPosition();

+		while(pos)

+		{

+			CFGFilter* pFGF = m_source.GetNext(pos);

+

+			POSITION pos2 = pFGF->m_chkbytes.GetHeadPosition();

+			while(pos2)

+			{

+				if(CheckBytes(hFile, pFGF->m_chkbytes.GetNext(pos2)))

+				{

+					fl.Insert(pFGF, 1, false, false);

+					break;

+				}

+			}

+		}

+	}

+

+	if(!ext.IsEmpty())

+	{

+		// internal / file extension

+

+		POSITION pos = m_source.GetHeadPosition();

+		while(pos)

+		{

+			CFGFilter* pFGF = m_source.GetNext(pos);

+			if(pFGF->m_extensions.Find(CString(ext)))

+				fl.Insert(pFGF, 2, false, false);

+		}

+	}

+

+	{

+		// internal / the rest

+

+		POSITION pos = m_source.GetHeadPosition();

+		while(pos)

+		{

+			CFGFilter* pFGF = m_source.GetNext(pos);

+			if(pFGF->m_protocols.IsEmpty() && pFGF->m_chkbytes.IsEmpty() && pFGF->m_extensions.IsEmpty())

+				fl.Insert(pFGF, 3, false, false);

+		}

+	}

+

+	if(hFile == INVALID_HANDLE_VALUE)

+	{

+		// protocol

+	

+		CRegKey key;

+		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, CString(protocol), KEY_READ))

+		{

+			CRegKey exts;

+			if(ERROR_SUCCESS == exts.Open(key, _T("Extensions"), KEY_READ))

+			{

+				len = countof(buff);

+				if(ERROR_SUCCESS == exts.QueryStringValue(CString(ext), buff, &len))

+					fl.Insert(new CFGFilterRegistry(GUIDFromCString(buff)), 4);

+			}

+

+			len = countof(buff);

+			if(ERROR_SUCCESS == key.QueryStringValue(_T("Source Filter"), buff, &len))

+				fl.Insert(new CFGFilterRegistry(GUIDFromCString(buff)), 5);

+		}

+

+		fl.Insert(new CFGFilterRegistry(CLSID_URLReader), 6);

+	}

+	else

+	{

+		// check bytes

+

+		CRegKey key;

+		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("Media Type"), KEY_READ))

+		{

+			FILETIME ft;

+			len = countof(buff);

+			for(DWORD i = 0; ERROR_SUCCESS == key.EnumKey(i, buff, &len, &ft); i++, len = countof(buff))

+			{

+				GUID majortype;

+				if(FAILED(GUIDFromCString(buff, majortype)))

+					continue;

+

+				CRegKey majorkey;

+				if(ERROR_SUCCESS == majorkey.Open(key, buff, KEY_READ))

+				{

+					len = countof(buff);

+					for(DWORD j = 0; ERROR_SUCCESS == majorkey.EnumKey(j, buff, &len, &ft); j++, len = countof(buff))

+					{

+						GUID subtype;

+						if(FAILED(GUIDFromCString(buff, subtype)))

+							continue;

+

+						CRegKey subkey;

+						if(ERROR_SUCCESS == subkey.Open(majorkey, buff, KEY_READ))

+						{

+							len = countof(buff);

+							if(ERROR_SUCCESS != subkey.QueryStringValue(_T("Source Filter"), buff, &len))

+								continue;

+

+							GUID clsid = GUIDFromCString(buff);

+

+							len = countof(buff);

+							len2 = sizeof(buff2);

+							for(DWORD k = 0, type; 

+								clsid != GUID_NULL && ERROR_SUCCESS == RegEnumValue(subkey, k, buff2, &len2, 0, &type, (BYTE*)buff, &len); 

+								k++, len = countof(buff), len2 = sizeof(buff2))

+							{

+								if(CheckBytes(hFile, CString(buff)))

+								{

+									CFGFilter* pFGF = new CFGFilterRegistry(clsid);

+									pFGF->AddType(majortype, subtype);

+									fl.Insert(pFGF, 7);

+									break;

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+	}

+

+	if(!ext.IsEmpty())

+	{

+		// file extension

+

+		CRegKey key;

+		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("Media Type\\Extensions\\") + CString(ext), KEY_READ))

+		{

+			ULONG len = countof(buff);

+			memset(buff, 0, sizeof(buff));

+			LONG ret = key.QueryStringValue(_T("Source Filter"), buff, &len); // QueryStringValue can return ERROR_INVALID_DATA on bogus strings (radlight mpc v1003, fixed in v1004)

+			if(ERROR_SUCCESS == ret || ERROR_INVALID_DATA == ret && GUIDFromCString(buff) != GUID_NULL)

+			{

+				GUID clsid = GUIDFromCString(buff);

+				GUID majortype = GUID_NULL;

+				GUID subtype = GUID_NULL;

+

+				len = countof(buff);

+				if(ERROR_SUCCESS == key.QueryStringValue(_T("Media Type"), buff, &len))

+					majortype = GUIDFromCString(buff);

+

+				len = countof(buff);

+				if(ERROR_SUCCESS == key.QueryStringValue(_T("Subtype"), buff, &len))

+					subtype = GUIDFromCString(buff);

+

+				CFGFilter* pFGF = new CFGFilterRegistry(clsid);

+				pFGF->AddType(majortype, subtype);

+				fl.Insert(pFGF, 8);

+			}

+		}

+	}

+

+	if(hFile != INVALID_HANDLE_VALUE)

+	{

+		CloseHandle(hFile);

+	}

+

+	CFGFilter* pFGF = new CFGFilterRegistry(CLSID_AsyncReader);

+	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_NULL);

+	fl.Insert(pFGF, 9);

+

+	return S_OK;

+}

+

 HRESULT CFGManager::AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppBF)

 {

 	TRACE(_T("FGM: AddSourceFilter trying '%s'\n"), CStringFromGUID(pFGF->GetCLSID()));

@@ -164,8 +369,8 @@ HRESULT CFGManager::AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LP
 	HRESULT hr;

 

 	CComPtr<IBaseFilter> pBF;

-	CComPtr<IUnknown> pUnk;

-	if(FAILED(hr = pFGF->Create(&pBF, &pUnk)))

+	CInterfaceList<IUnknown, &IID_IUnknown> pUnks;

+	if(FAILED(hr = pFGF->Create(&pBF, pUnks)))

 		return hr;

 

 	CComQIPtr<IFileSourceFilter> pFSF = pBF;

@@ -191,9 +396,25 @@ HRESULT CFGManager::AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LP
 		return hr;

 	}

 

+	// doh :P

+	BeginEnumMediaTypes(GetFirstPin(pBF, PINDIR_OUTPUT), pEMT, pmt)

+	{

+		if(pmt->subtype == GUIDFromCString(_T("{640999A0-A946-11D0-A520-000000000000}"))

+		|| pmt->subtype == GUIDFromCString(_T("{640999A1-A946-11D0-A520-000000000000}"))

+		|| pmt->subtype == GUIDFromCString(_T("{D51BD5AE-7548-11CF-A520-0080C77EF58A}")))

+		{

+			RemoveFilter(pBF);

+			pFGF = new CFGFilterRegistry(CLSID_NetShowSource);

+			hr = AddSourceFilter(pFGF, lpcwstrFileName, lpcwstrFilterName, ppBF);

+			delete pFGF;

+			return hr;

+		}

+	}

+	EndEnumMediaTypes(pmt)

+

 	*ppBF = pBF.Detach();

 

-	if(pUnk) m_pUnks.AddTail(pUnk);

+	m_pUnks.AddTailList(&pUnks);

 

 	return S_OK;

 }

@@ -202,6 +423,8 @@ HRESULT CFGManager::AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LP
 

 STDMETHODIMP CFGManager::AddFilter(IBaseFilter* pFilter, LPCWSTR pName)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	HRESULT hr;

@@ -218,6 +441,8 @@ STDMETHODIMP CFGManager::AddFilter(IBaseFilter* pFilter, LPCWSTR pName)
 

 STDMETHODIMP CFGManager::RemoveFilter(IBaseFilter* pFilter)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->RemoveFilter(pFilter);

@@ -225,6 +450,8 @@ STDMETHODIMP CFGManager::RemoveFilter(IBaseFilter* pFilter)
 

 STDMETHODIMP CFGManager::EnumFilters(IEnumFilters** ppEnum)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->EnumFilters(ppEnum);

@@ -232,6 +459,8 @@ STDMETHODIMP CFGManager::EnumFilters(IEnumFilters** ppEnum)
 

 STDMETHODIMP CFGManager::FindFilterByName(LPCWSTR pName, IBaseFilter** ppFilter)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->FindFilterByName(pName, ppFilter);

@@ -239,6 +468,8 @@ STDMETHODIMP CFGManager::FindFilterByName(LPCWSTR pName, IBaseFilter** ppFilter)
 

 STDMETHODIMP CFGManager::ConnectDirect(IPin* pPinOut, IPin* pPinIn, const AM_MEDIA_TYPE* pmt)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	CComPtr<IBaseFilter> pBF = GetFilterFromPin(pPinIn);

@@ -256,6 +487,8 @@ STDMETHODIMP CFGManager::ConnectDirect(IPin* pPinOut, IPin* pPinIn, const AM_MED
 

 STDMETHODIMP CFGManager::Reconnect(IPin* ppin)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->Reconnect(ppin);

@@ -263,6 +496,8 @@ STDMETHODIMP CFGManager::Reconnect(IPin* ppin)
 

 STDMETHODIMP CFGManager::Disconnect(IPin* ppin)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->Disconnect(ppin);

@@ -270,6 +505,8 @@ STDMETHODIMP CFGManager::Disconnect(IPin* ppin)
 

 STDMETHODIMP CFGManager::SetDefaultSyncSource()

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->SetDefaultSyncSource();

@@ -424,8 +661,8 @@ STDMETHODIMP CFGManager::Connect(IPin* pPinOut, IPin* pPinIn)
 			TRACE(_T("FGM: Connecting '%s'\n"), pFGF->GetName());

 

 			CComPtr<IBaseFilter> pBF;

-			CComPtr<IUnknown> pUnk;

-			if(FAILED(pFGF->Create(&pBF, &pUnk)))

+			CInterfaceList<IUnknown, &IID_IUnknown> pUnks;

+			if(FAILED(pFGF->Create(&pBF, pUnks)))

 				continue;

 

 			if(FAILED(hr = AddFilter(pBF, pFGF->GetName())))

@@ -462,19 +699,22 @@ STDMETHODIMP CFGManager::Connect(IPin* pPinOut, IPin* pPinIn)
 

 				if(SUCCEEDED(hr))

 				{

-					if(pUnk) m_pUnks.AddTail(pUnk);

+					m_pUnks.AddTailList(&pUnks);

 

 					// maybe the application should do this...

-					if(CComQIPtr<IMixerPinConfig, &IID_IMixerPinConfig> pMPC = pUnk)

-						pMPC->SetAspectRatioMode(AM_ARMODE_STRETCHED);

+					

+					POSITION pos = pUnks.GetHeadPosition();

+					while(pos)

+					{

+						if(CComQIPtr<IMixerPinConfig, &IID_IMixerPinConfig> pMPC = pUnks.GetNext(pos))

+							pMPC->SetAspectRatioMode(AM_ARMODE_STRETCHED);

+					}

+

 					if(CComQIPtr<IVMRAspectRatioControl> pARC = pBF)

 						pARC->SetAspectRatioMode(VMR_ARMODE_NONE);

+					

 					if(CComQIPtr<IVMRAspectRatioControl9> pARC = pBF)

 						pARC->SetAspectRatioMode(VMR_ARMODE_NONE);

-					if(CComQIPtr<IVMRMixerControl9> pMC = pBF)

-						m_pUnks.AddTail (pMC);

-					if(CComQIPtr<IVMRMixerBitmap9> pMB = pBF)

-						m_pUnks.AddTail (pMB);

 

 					return hr;

 				}

@@ -490,10 +730,15 @@ STDMETHODIMP CFGManager::Connect(IPin* pPinOut, IPin* pPinIn)
 	{

 		CAutoPtr<CStreamDeadEnd> psde(new CStreamDeadEnd());

 		psde->AddTailList(&m_streampath);

+		int skip = 0;

 		BeginEnumMediaTypes(pPinOut, pEM, pmt)

+		{

+			if(pmt->majortype == MEDIATYPE_Stream && pmt->subtype == MEDIASUBTYPE_NULL) skip++;

 			psde->mts.AddTail(CMediaType(*pmt));

+		}

 		EndEnumMediaTypes(pmt)

-		m_deadends.Add(psde);

+		if(skip < psde->mts.GetCount())

+			m_deadends.Add(psde);

 	}

 

 	return pPinIn ? VFW_E_CANNOT_CONNECT : VFW_E_CANNOT_RENDER;

@@ -506,7 +751,7 @@ STDMETHODIMP CFGManager::Render(IPin* pPinOut)
 	return RenderEx(pPinOut, 0, NULL);

 }

 

-STDMETHODIMP CFGManager::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList)

+STDMETHODIMP CFGManager::RenderFile(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrPlayList)

 {

 	CAutoLock cAutoLock(this);

 

@@ -515,209 +760,56 @@ STDMETHODIMP CFGManager::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList
 

 	HRESULT hr;

 

+/*

 	CComPtr<IBaseFilter> pBF;

 	if(FAILED(hr = AddSourceFilter(lpcwstrFile, lpcwstrFile, &pBF)))

 		return hr;

 

 	return ConnectFilter(pBF, NULL);

-}

-

-STDMETHODIMP CFGManager::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter)

-{

-	CAutoLock cAutoLock(this);

-

-	// TODO: use overrides

-

-	CheckPointer(lpcwstrFileName, E_POINTER);

-	CheckPointer(ppFilter, E_POINTER);

-

-	HRESULT hr;

-

-	CStringW fn = CStringW(lpcwstrFileName).TrimLeft();

-	CStringW protocol = fn.Left(fn.Find(':')+1).TrimRight(':').MakeLower();

-	CStringW ext = CPathW(fn).GetExtension();

-

-	TCHAR buff[256], buff2[256];

-	ULONG len, len2;

+*/

 

 	CFGFilterList fl;

+	if(FAILED(hr = EnumSourceFilters(lpcwstrFileName, fl)))

+		return hr;

 

-	HANDLE hFile = CreateFile(CString(fn), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, (HANDLE)NULL);

-

-	// internal / protocol

-

-	if(protocol.GetLength() > 1 && protocol != L"file")

-	{

-		POSITION pos = m_source.GetHeadPosition();

-		while(pos)

-		{

-			CFGFilter* pFGF = m_source.GetNext(pos);

-			if(pFGF->m_protocols.Find(CString(protocol)))

-				fl.Insert(pFGF, 0, false, false);

-		}

-	}

-

-	// internal / check bytes

-

-	if(hFile != INVALID_HANDLE_VALUE)

-	{

-		POSITION pos = m_source.GetHeadPosition();

-		while(pos)

-		{

-			CFGFilter* pFGF = m_source.GetNext(pos);

-

-			POSITION pos2 = pFGF->m_chkbytes.GetHeadPosition();

-			while(pos2)

-			{

-				if(CheckBytes(hFile, pFGF->m_chkbytes.GetNext(pos2)))

-				{

-					fl.Insert(pFGF, 1, false, false);

-					break;

-				}

-			}

-		}

-	}

-

-	// insernal / file extension

-

-	if(!ext.IsEmpty())

-	{

-		POSITION pos = m_source.GetHeadPosition();

-		while(pos)

-		{

-			CFGFilter* pFGF = m_source.GetNext(pos);

-			if(pFGF->m_extensions.Find(CString(ext)))

-				fl.Insert(pFGF, 2, false, false);

-		}

-	}

-

-	// internal / the rest

-

-	{

-		POSITION pos = m_source.GetHeadPosition();

-		while(pos)

-		{

-			CFGFilter* pFGF = m_source.GetNext(pos);

-			if(pFGF->m_protocols.IsEmpty() && pFGF->m_chkbytes.IsEmpty() && pFGF->m_extensions.IsEmpty())

-				fl.Insert(pFGF, 3, false, false);

-		}

-	}

-

-	// protocol

-

-	if(protocol.GetLength() > 1 && protocol != L"file")

-	{

-		CRegKey key;

-		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, CString(protocol), KEY_READ))

-		{

-			CRegKey exts;

-			if(ERROR_SUCCESS == exts.Open(key, _T("Extensions"), KEY_READ))

-			{

-				len = countof(buff);

-				if(ERROR_SUCCESS == exts.QueryStringValue(CString(ext), buff, &len))

-					fl.Insert(new CFGFilterRegistry(GUIDFromCString(buff)), 4);

-			}

-

-			len = countof(buff);

-			if(ERROR_SUCCESS == key.QueryStringValue(_T("Source Filter"), buff, &len))

-				fl.Insert(new CFGFilterRegistry(GUIDFromCString(buff)), 5);

-		}

-

-		fl.Insert(new CFGFilterRegistry(CLSID_URLReader), 6);

-	}

+	CAutoPtrArray<CStreamDeadEnd> deadends;

 

-	// check bytes

+	hr = VFW_E_CANNOT_RENDER;

 

-	if(hFile != INVALID_HANDLE_VALUE)

+	POSITION pos = fl.GetHeadPosition();

+	while(pos)

 	{

-		CRegKey key;

-		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("Media Type"), KEY_READ))

+		CComPtr<IBaseFilter> pBF;

+		

+		if(SUCCEEDED(hr = AddSourceFilter(fl.GetNext(pos), lpcwstrFileName, lpcwstrFileName, &pBF)))

 		{

-			FILETIME ft;

-			len = countof(buff);

-			for(DWORD i = 0; ERROR_SUCCESS == key.EnumKey(i, buff, &len, &ft); i++, len = countof(buff))

-			{

-				GUID majortype;

-				if(FAILED(GUIDFromCString(buff, majortype)))

-					continue;

-

-				CRegKey majorkey;

-				if(ERROR_SUCCESS == majorkey.Open(key, buff, KEY_READ))

-				{

-					len = countof(buff);

-					for(DWORD j = 0; ERROR_SUCCESS == majorkey.EnumKey(j, buff, &len, &ft); j++, len = countof(buff))

-					{

-						GUID subtype;

-						if(FAILED(GUIDFromCString(buff, subtype)))

-							continue;

+			m_streampath.RemoveAll();

+			m_deadends.RemoveAll();

 

-						CRegKey subkey;

-						if(ERROR_SUCCESS == subkey.Open(majorkey, buff, KEY_READ))

-						{

-							len = countof(buff);

-							if(ERROR_SUCCESS != subkey.QueryStringValue(_T("Source Filter"), buff, &len))

-								continue;

+			if(SUCCEEDED(hr = ConnectFilter(pBF, NULL)))

+				return hr;

 

-							GUID clsid = GUIDFromCString(buff);

+			NukeDownstream(pBF);

+			RemoveFilter(pBF);

 

-							len = countof(buff);

-							len2 = sizeof(buff2);

-							for(DWORD k = 0, type; 

-								clsid != GUID_NULL && ERROR_SUCCESS == RegEnumValue(subkey, k, buff2, &len2, 0, &type, (BYTE*)buff, &len); 

-								k++, len = countof(buff), len2 = sizeof(buff2))

-							{

-								if(CheckBytes(hFile, CString(buff)))

-								{

-									CFGFilter* pFGF = new CFGFilterRegistry(clsid);

-									pFGF->AddType(majortype, subtype);

-									fl.Insert(pFGF, 7);

-									break;

-								}

-							}

-						}

-					}

-				}

-			}

+			deadends.Append(m_deadends);

 		}

 	}

 

-	// file extension

+	m_deadends.Copy(deadends);

 

-	if(!ext.IsEmpty())

-	{

-		CRegKey key;

-		if(ERROR_SUCCESS == key.Open(HKEY_CLASSES_ROOT, _T("Media Type\\Extensions\\") + CString(ext), KEY_READ))

-		{

-			ULONG len = countof(buff);

-			if(ERROR_SUCCESS == key.QueryStringValue(_T("Source Filter"), buff, &len))

-			{

-				GUID clsid = GUIDFromCString(buff);

-				GUID majortype = GUID_NULL;

-				GUID subtype = GUID_NULL;

-

-				len = countof(buff);

-				if(ERROR_SUCCESS == key.QueryStringValue(_T("Media Type"), buff, &len))

-					majortype = GUIDFromCString(buff);

-

-				len = countof(buff);

-				if(ERROR_SUCCESS == key.QueryStringValue(_T("Subtype"), buff, &len))

-					subtype = GUIDFromCString(buff);

+	return hr;

+}

 

-				CFGFilter* pFGF = new CFGFilterRegistry(clsid);

-				pFGF->AddType(majortype, subtype);

-				fl.Insert(pFGF, 8);

-			}

-		}

-	}

+STDMETHODIMP CFGManager::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter)

+{

+	CAutoLock cAutoLock(this);

 

-	if(hFile != INVALID_HANDLE_VALUE)

-	{

-		CloseHandle(hFile);

-	}

+	HRESULT hr;

 

-	CFGFilter* pFGF = new CFGFilterRegistry(CLSID_AsyncReader);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_NULL);

-	fl.Insert(pFGF, 9);

+	CFGFilterList fl;

+	if(FAILED(hr = EnumSourceFilters(lpcwstrFileName, fl)))

+		return hr;

 

 	POSITION pos = fl.GetHeadPosition();

 	while(pos)

@@ -726,11 +818,13 @@ STDMETHODIMP CFGManager::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwst
 			return hr;

 	}

 

-	return hFile == INVALID_HANDLE_VALUE ? VFW_E_NOT_FOUND : VFW_E_CANNOT_LOAD_SOURCE_FILTER;

+	return VFW_E_CANNOT_LOAD_SOURCE_FILTER;

 }

 

 STDMETHODIMP CFGManager::SetLogFile(DWORD_PTR hFile)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->SetLogFile(hFile);

@@ -738,6 +832,8 @@ STDMETHODIMP CFGManager::SetLogFile(DWORD_PTR hFile)
 

 STDMETHODIMP CFGManager::Abort()

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->Abort();

@@ -745,6 +841,8 @@ STDMETHODIMP CFGManager::Abort()
 

 STDMETHODIMP CFGManager::ShouldOperationContinue()

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->ShouldOperationContinue();

@@ -754,6 +852,8 @@ STDMETHODIMP CFGManager::ShouldOperationContinue()
 

 STDMETHODIMP CFGManager::AddSourceFilterForMoniker(IMoniker* pMoniker, IBindCtx* pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->AddSourceFilterForMoniker(pMoniker, pCtx, lpcwstrFilterName, ppFilter);

@@ -761,6 +861,8 @@ STDMETHODIMP CFGManager::AddSourceFilterForMoniker(IMoniker* pMoniker, IBindCtx*
 

 STDMETHODIMP CFGManager::ReconnectEx(IPin* ppin, const AM_MEDIA_TYPE* pmt)

 {

+	if(!m_pUnkInner) return E_UNEXPECTED;

+

 	CAutoLock cAutoLock(this);

 

 	return CComQIPtr<IFilterGraph2>(m_pUnkInner)->ReconnectEx(ppin, pmt);

@@ -1075,8 +1177,6 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 

 	// Source filters

 

-//	UINT src = s.SrcFilters;

-

 	if(src & SRC_SHOUTCAST)

 	{

 		pFGF = new CFGFilterInternal<CShoutcastSource>();

@@ -1107,10 +1207,18 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 		pFGF->m_chkbytes.AddTail(_T("4,4,,6d646174")); // mdat

 		pFGF->m_chkbytes.AddTail(_T("4,4,,736b6970")); // skip

 		pFGF->m_chkbytes.AddTail(_T("4,12,ffffffff00000000ffffffff,77696465027fe3706d646174")); // wide ? mdat

+		pFGF->m_chkbytes.AddTail(_T("3,3,,000001")); // raw mpeg4 video

 		pFGF->m_extensions.AddTail(_T(".mov"));

 		m_source.AddTail(pFGF);

 	}

 

+	if(src & SRC_FLV)

+	{

+		pFGF = new CFGFilterInternal<CFLVSourceFilter>();

+		pFGF->m_chkbytes.AddTail(_T("0,4,,464C5601")); // FLV (v1)

+		m_source.AddTail(pFGF);

+	}

+

 	if(src & SRC_MATROSKA)

 	{

 		pFGF = new CFGFilterInternal<CMatroskaSourceFilter>();

@@ -1201,19 +1309,25 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 		m_source.AddTail(pFGF);

 	}

 

+	__if_exists(CNutSourceFilter)

+	{

 	if(src & SRC_NUT)

 	{

 		pFGF = new CFGFilterInternal<CNutSourceFilter>();

 		pFGF->m_chkbytes.AddTail(_T("0,8,,F9526A624E55544D"));

 		m_source.AddTail(pFGF);

 	}

+	}

 

+	__if_exists(CDiracSourceFilter)

+	{

 	if(src & SRC_DIRAC)

 	{

 		pFGF = new CFGFilterInternal<CDiracSourceFilter>();

 		pFGF->m_chkbytes.AddTail(_T("0,8,,4B572D4449524143"));

 		m_source.AddTail(pFGF);

 	}

+	}

 

 	if(src & SRC_MPEG)

 	{

@@ -1222,6 +1336,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 		pFGF->m_chkbytes.AddTail(_T("0,5,FFFFFFFFC0,000001BA40"));

 		pFGF->m_chkbytes.AddTail(_T("0,1,,47,188,1,,47,376,1,,47"));

 		pFGF->m_chkbytes.AddTail(_T("4,1,,47,196,1,,47,388,1,,47"));

+		pFGF->m_chkbytes.AddTail(_T("0,4,,54467263,1660,1,,47"));

 		pFGF->m_chkbytes.AddTail(_T("0,8,fffffc00ffe00000,4156000055000000"));

 		m_source.AddTail(pFGF);

 	}

@@ -1255,103 +1370,127 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 

 	// Transform filters

 

-//	UINT tra = s.TraFilters;

-

 	pFGF = new CFGFilterInternal<CAVI2AC3Filter>(L"AVI<->AC3/DTS", MERIT64(0x00680000)+1);

 	pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_WAVE_DOLBY_AC3);

 	pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_WAVE_DTS);

 	m_transform.AddTail(pFGF);

 

-	pFGF = new CFGFilterInternal<CMatroskaSplitterFilter>(

-		(src & SRC_MATROSKA) ? L"Matroska Splitter" : L"Matroska Splitter (low merit)",

-		(src & SRC_MATROSKA) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Matroska);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

-

-	pFGF = new CFGFilterInternal<CRealMediaSplitterFilter>(

-		(src & SRC_REALMEDIA) ? L"RealMedia Splitter" : L"RealMedia Splitter (low merit)", 

-		(src & SRC_REALMEDIA) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_RealMedia);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_MATROSKA)

+	{

+		pFGF = new CFGFilterInternal<CMatroskaSplitterFilter>(L"Matroska Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Matroska);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<CAviSplitterFilter>(

-		(src & SRC_AVI) ? L"Avi Splitter" : L"Avi Splitter (low merit)",

-		(src & SRC_AVI) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Avi);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_REALMEDIA)

+	{

+		pFGF = new CFGFilterInternal<CRealMediaSplitterFilter>(L"RealMedia Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_RealMedia);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

+	

+	if(src & SRC_AVI)

+	{

+		pFGF = new CFGFilterInternal<CAviSplitterFilter>(L"Avi Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Avi);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

 	__if_exists(CRadGtSplitterFilter)

 	{

-	pFGF = new CFGFilterInternal<CRadGtSplitterFilter>(

-		(src & SRC_RADGT) ? L"RadGt Splitter" : L"RadGt Splitter (low merit)",

-		(src & SRC_RADGT) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Bink);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Smacker);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_RADGT)

+	{

+		pFGF = new CFGFilterInternal<CRadGtSplitterFilter>(L"RadGt Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Bink);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Smacker);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 	}

 

-	pFGF = new CFGFilterInternal<CRoQSplitterFilter>(

-		(src & SRC_ROQ) ? L"RoQ Splitter" : L"RoQ Splitter (low merit)",

-		(src & SRC_ROQ) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_RoQ);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_ROQ)

+	{

+		pFGF = new CFGFilterInternal<CRoQSplitterFilter>(L"RoQ Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_RoQ);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<COggSplitterFilter>(

-		(src & SRC_OGG) ? L"Ogg Splitter" : L"Ogg Splitter (low merit)",

-		(src & SRC_OGG) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Ogg);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_OGG)

+	{

+		pFGF = new CFGFilterInternal<COggSplitterFilter>(L"Ogg Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Ogg);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<CNutSplitterFilter>(

-		(src & SRC_NUT) ? L"Nut Splitter" : L"Nut Splitter (low merit)",

-		(src & SRC_NUT) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Nut);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	__if_exists(CNutSplitterFilter)

+	{

+	if(src & SRC_NUT)

+	{

+		pFGF = new CFGFilterInternal<CNutSplitterFilter>(L"Nut Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Nut);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

+	}

 

-	pFGF = new CFGFilterInternal<CMpegSplitterFilter>(

-		(src & SRC_MPEG) ? L"Mpeg Splitter" : L"Mpeg Splitter (low merit)",

-		(src & SRC_MPEG) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG1System);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_PROGRAM);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_TRANSPORT);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_PVA);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_MPEG)

+	{

+		pFGF = new CFGFilterInternal<CMpegSplitterFilter>(L"Mpeg Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG1System);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_PROGRAM);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_TRANSPORT);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG2_PVA);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<CDiracSplitterFilter>(

-		(src & SRC_DIRAC) ? L"Dirac Splitter" : L"Dirac Splitter (low merit)",

-		(src & SRC_DIRAC) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Dirac);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	__if_exists(CDiracSplitterFilter)

+	{

+	if(src & SRC_DIRAC)

+	{

+		pFGF = new CFGFilterInternal<CDiracSplitterFilter>(L"Dirac Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_Dirac);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

+	}

 

-	pFGF = new CFGFilterInternal<CMpaSplitterFilter>(

-		(src & SRC_MPA) ? L"Mpa Splitter" : L"Mpa Splitter (low merit)",

-		(src & SRC_MPA) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG1Audio);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_MPA)

+	{

+		pFGF = new CFGFilterInternal<CMpaSplitterFilter>(L"Mpa Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MPEG1Audio);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<CDSMSplitterFilter>(

-		(src & SRC_DSM) ? L"DSM Splitter" : L"DSM Splitter (low merit)",

-		(src & SRC_DSM) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_DirectShowMedia);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_DSM)

+	{

+		pFGF = new CFGFilterInternal<CDSMSplitterFilter>(L"DSM Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_DirectShowMedia);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

-	pFGF = new CFGFilterInternal<CMP4SplitterFilter>(

-		(src & SRC_MP4) ? L"MP4 Splitter" : L"MP4 Splitter (low merit)",

-		(src & SRC_MP4) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

-	pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MP4);

-	pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

-	m_transform.AddTail(pFGF);

+	if(src & SRC_MP4)

+	{

+		pFGF = new CFGFilterInternal<CMP4SplitterFilter>(L"MP4 Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_MP4);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

+

+	if(src & SRC_FLV)

+	{

+		pFGF = new CFGFilterInternal<CFLVSplitterFilter>(L"FLV Splitter", MERIT64_ABOVE_DSHOW);

+		pFGF->AddType(MEDIATYPE_Stream, MEDIASUBTYPE_FLV);

+		pFGF->AddType(MEDIATYPE_Stream, GUID_NULL);

+		m_transform.AddTail(pFGF);

+	}

 

 	pFGF = new CFGFilterInternal<CMpeg2DecFilter>(

 		(tra & TRA_MPEG1) ? L"MPEG-1 Video Decoder" : L"MPEG-1 Video Decoder (low merit)", 

@@ -1463,6 +1602,12 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 	pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_RAAC);

 	m_transform.AddTail(pFGF);

 

+	pFGF = new CFGFilterInternal<CMpaDecFilter>(

+		(tra & TRA_VORBIS) ? L"Vorbis Audio Decoder" : L"Vorbis Audio Decoder (low merit)",

+		(tra & TRA_VORBIS) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

+	pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_Vorbis2);

+	m_transform.AddTail(pFGF);

+

 	pFGF = new CFGFilterInternal<CRoQVideoDecoder>(

 		(tra & TRA_RV) ? L"RoQ Video Decoder" : L"RoQ Video Decoder (low merit)",

 		(tra & TRA_RV) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

@@ -1475,11 +1620,14 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 	pFGF->AddType(MEDIATYPE_Audio, MEDIASUBTYPE_RoQA);

 	m_transform.AddTail(pFGF);

 

+	__if_exists(CDiracVideoDecoder)

+	{

 	pFGF = new CFGFilterInternal<CDiracVideoDecoder>(

 		(tra & TRA_DIRAC) ? L"Dirac Video Decoder" : L"Dirac Video Decoder (low merit)",

 		(tra & TRA_DIRAC) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

 	pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_DiracVideo);

 	m_transform.AddTail(pFGF);

+	}

 

 	pFGF = new CFGFilterInternal<CNullTextRenderer>(L"NullTextRenderer", MERIT64_DO_USE);

 	pFGF->AddType(MEDIATYPE_Text, MEDIASUBTYPE_NULL);

@@ -1491,6 +1639,21 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 	pFGF->AddType(MEDIATYPE_NULL, MEDIASUBTYPE_SVCD_SUBPICTURE);

 	m_transform.AddTail(pFGF);

 

+	__if_exists(CFLVVideoDecoder)

+	{

+	pFGF = new CFGFilterInternal<CFLVVideoDecoder>(

+		(tra & TRA_FLV4) ? L"FLV Video Decoder" : L"FLV Video Decoder (low merit)",

+		(tra & TRA_FLV4) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

+	pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_FLV4);

+	m_transform.AddTail(pFGF);

+	

+	pFGF = new CFGFilterInternal<CFLVVideoDecoder>(

+		(tra & TRA_VP62) ? L"VP62 Video Decoder" : L"VP62 Video Decoder (low merit)",

+		(tra & TRA_VP62) ? MERIT64_ABOVE_DSHOW : MERIT64_DO_USE);

+	pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_VP62);

+	m_transform.AddTail(pFGF);

+	}

+

 	// Blocked filters

 

 	// "Subtitle Mixer" makes an access violation around the 

@@ -1526,7 +1689,10 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT
 			m_transform.AddTail(new CFGFilterRegistry(GUIDFromCString(clsid), MERIT64_DO_NOT_USE));

 		}

 	}

-

+/*

+	// NVIDIA Transport Demux crashed for someone, I could not reproduce it

+	m_transform.AddTail(new CFGFilterRegistry(GUIDFromCString(_T("{735823C1-ACC4-11D3-85AC-006008376FB8}")), MERIT64_DO_NOT_USE));	

+*/

 	// Overrides

 

 	WORD merit_low = 1;

@@ -1740,6 +1906,7 @@ CFGManagerDVD::CFGManagerDVD(LPCTSTR pName, LPUNKNOWN pUnk, UINT src, UINT tra,
 {

 	AppSettings& s = AfxGetAppSettings();

 

+	// have to avoid the old video renderer

 	if(!s.fXpOrBetter && s.iDSVideoRendererType != VIDRNDT_DS_OVERLAYMIXER || s.iDSVideoRendererType == VIDRNDT_DS_OLDRENDERER)

 		m_transform.AddTail(new CFGFilterVideoRenderer(m_hWnd, CLSID_OverlayMixer, L"Overlay Mixer", m_vrmerit-1));

 

@@ -1762,6 +1929,19 @@ public:
 	}

 };

 

+STDMETHODIMP CFGManagerDVD::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList)

+{

+	CAutoLock cAutoLock(this);

+

+	HRESULT hr;

+

+	CComPtr<IBaseFilter> pBF;

+	if(FAILED(hr = AddSourceFilter(lpcwstrFile, lpcwstrFile, &pBF)))

+		return hr;

+

+	return ConnectFilter(pBF, NULL);

+}

+

 STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter)

 {

 	CAutoLock cAutoLock(this);

@@ -1773,7 +1953,7 @@ STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpc
 

 	CStringW fn = CStringW(lpcwstrFileName).TrimLeft();

 	CStringW protocol = fn.Left(fn.Find(':')+1).TrimRight(':').MakeLower();

-	CStringW ext = CPathW(fn).GetExtension();

+	CStringW ext = CPathW(fn).GetExtension().MakeLower();

 

 	GUID clsid = ext == L".ratdvd" ? GUIDFromCString(_T("{482d10b6-376e-4411-8a17-833800A065DB}")) : CLSID_DVDNavigator;

 

@@ -1795,14 +1975,11 @@ STDMETHODIMP CFGManagerDVD::AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpc
 	&& FAILED(hr = pDVDC->SetDVDDirectory(fn + L"VIDEO_TS"))

 	&& FAILED(hr = pDVDC->SetDVDDirectory(fn + L"\\VIDEO_TS")))

 	|| FAILED(hr = pDVDI->GetDVDDirectory(buff, countof(buff), &len)) || len == 0)

-		return VFW_E_CANNOT_LOAD_SOURCE_FILTER;

+		return E_INVALIDARG;

 

 	pDVDC->SetOption(DVD_ResetOnStop, FALSE);

 	pDVDC->SetOption(DVD_HMSF_TimeCodeEvents, TRUE);

 

-	m_pUnks.AddTail(pDVDC);

-	m_pUnks.AddTail(pDVDI);

-

 	if(clsid == CLSID_DVDNavigator)

 		CResetDVD(CString(buff));

 

@@ -1836,5 +2013,29 @@ CFGManagerMuxer::CFGManagerMuxer(LPCTSTR pName, LPUNKNOWN pUnk)
 	: CFGManagerCustom(pName, pUnk, ~0, ~0)

 {

 	m_source.AddTail(new CFGFilterInternal<CSubtitleSourceASS>());

+	m_source.AddTail(new CFGFilterInternal<CSSFSourceFilter>());

+}

+

+//

+// CFGAggregator

+//

+

+CFGAggregator::CFGAggregator(const CLSID& clsid, LPCTSTR pName, LPUNKNOWN pUnk, HRESULT& hr)

+	: CUnknown(pName, pUnk)

+{

+	hr = m_pUnkInner.CoCreateInstance(clsid, GetOwner());

+}

+

+CFGAggregator::~CFGAggregator()

+{

+	m_pUnkInner.Release();

 }

 

+STDMETHODIMP CFGAggregator::NonDelegatingQueryInterface(REFIID riid, void** ppv)

+{

+    CheckPointer(ppv, E_POINTER);

+

+	return

+		m_pUnkInner && (riid != IID_IUnknown && SUCCEEDED(m_pUnkInner->QueryInterface(riid, ppv))) ? S_OK :

+		__super::NonDelegatingQueryInterface(riid, ppv);

+}

diff --git a/src/apps/mplayerc/FGManager.h b/src/apps/mplayerc/FGManager.h
index a660b5478..49579f6b3 100644
--- a/src/apps/mplayerc/FGManager.h
+++ b/src/apps/mplayerc/FGManager.h
@@ -60,6 +60,7 @@ protected:
 

 	static bool CheckBytes(HANDLE hFile, CString chkbytes);

 

+	HRESULT EnumSourceFilters(LPCWSTR lpcwstrFileName, CFGFilterList& fl);

 	HRESULT AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppBF);

 

 	// IFilterGraph

@@ -144,6 +145,7 @@ class CFGManagerDVD : public CFGManagerPlayer
 protected:

 	// IGraphBuilder

 

+	STDMETHODIMP RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayList);

 	STDMETHODIMP AddSourceFilter(LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, IBaseFilter** ppFilter);

 

 public:

@@ -162,3 +164,17 @@ public:
 	CFGManagerMuxer(LPCTSTR pName, LPUNKNOWN pUnk);

 };

 

+//

+

+class CFGAggregator : public CUnknown

+{

+protected:

+	CComPtr<IUnknown> m_pUnkInner;

+

+public:

+	CFGAggregator(const CLSID& clsid, LPCTSTR pName, LPUNKNOWN pUnk, HRESULT& hr);

+	virtual ~CFGAggregator();

+

+    DECLARE_IUNKNOWN;

+    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+};

diff --git a/src/apps/mplayerc/FavoriteOrganizeDlg.cpp b/src/apps/mplayerc/FavoriteOrganizeDlg.cpp
index 1d4b09a50..01345f080 100644
--- a/src/apps/mplayerc/FavoriteOrganizeDlg.cpp
+++ b/src/apps/mplayerc/FavoriteOrganizeDlg.cpp
@@ -112,9 +112,9 @@ BOOL CFavoriteOrganizeDlg::OnInitDialog()
 {

 	__super::OnInitDialog();

 

-	m_tab.InsertItem(0, ResStr(IDS_R_FAVFILES));

-	m_tab.InsertItem(1, ResStr(IDS_R_FAVDVDS));

-//	m_tab.InsertItem(2, ResStr(IDS_R_FAVDEVICES));

+	m_tab.InsertItem(0, ResStr(IDS_FAVFILES));

+	m_tab.InsertItem(1, ResStr(IDS_FAVDVDS));

+//	m_tab.InsertItem(2, ResStr(IDS_FAVDEVICES));

 	m_tab.SetCurSel(0);

 

 	m_list.InsertColumn(0, _T(""));

diff --git a/src/apps/mplayerc/MediaFormats.cpp b/src/apps/mplayerc/MediaFormats.cpp
index 644e95511..d64033931 100644
--- a/src/apps/mplayerc/MediaFormats.cpp
+++ b/src/apps/mplayerc/MediaFormats.cpp
@@ -75,7 +75,7 @@ void CMediaFormatCategory::UpdateData(bool fSave)
 	}

 }

 

-CMediaFormatCategory::CMediaFormatCategory(CMediaFormatCategory& mfc)

+CMediaFormatCategory::CMediaFormatCategory(const CMediaFormatCategory& mfc)

 {

 	*this = mfc;

 }

@@ -90,8 +90,7 @@ CMediaFormatCategory& CMediaFormatCategory::operator = (const CMediaFormatCatego
 	m_backupexts.AddTailList(&mfc.m_backupexts);

 	m_fAudioOnly = mfc.m_fAudioOnly;

 	m_engine = mfc.m_engine;

-

-	return(*this);

+	return *this;

 }

 

 void CMediaFormatCategory::RestoreDefaultExts()

@@ -211,6 +210,8 @@ void CMediaFormats::UpdateData(bool fSave)
 		ADDFMT((_T("Real Script file"), _T("rt rp smi smil"), false, _T("RealOne or codec pack"), RealMedia));

 		ADDFMT((_T("Dirac Video file"), _T("drc"), false));

 		ADDFMT((_T("DirectShow Media file"), _T("dsm dsv dsa dss")));

+		ADDFMT((_T("Musepack file"), _T("mpc"), true));

+		ADDFMT((_T("Flash Video file "), _T("flv")));

 		ADDFMT((_T("Shockwave Flash file"), _T("swf"), false, _T("ShockWave ActiveX control"), ShockWave));

 		ADDFMT((_T("Quicktime file "), _T("mov qt amr"), false, _T("QuickTime Player or codec pack"), QuickTime));

 		ADDFMT((_T("Image file"), _T("jpeg jpg bmp gif pic png dib tiff tif")));

diff --git a/src/apps/mplayerc/MediaFormats.h b/src/apps/mplayerc/MediaFormats.h
index ae54f9717..0f3f4a1c7 100644
--- a/src/apps/mplayerc/MediaFormats.h
+++ b/src/apps/mplayerc/MediaFormats.h
@@ -26,7 +26,6 @@
 

 class CMediaFormatCategory

 {

-public:

 protected:

 	CString m_label, m_specreqnote;

 	CAtlList<CString> m_exts, m_backupexts;

@@ -45,7 +44,7 @@ public:
 

 	void UpdateData(bool fSave);

 

-	CMediaFormatCategory(CMediaFormatCategory& mfc);

+	CMediaFormatCategory(const CMediaFormatCategory& mfc);

 	CMediaFormatCategory& operator = (const CMediaFormatCategory& mfc);

 

 	void RestoreDefaultExts();

@@ -65,7 +64,7 @@ public:
 	void SetEngineType(engine_t e) {m_engine = e;}

 };

 

-class CMediaFormats : public CArray<CMediaFormatCategory>

+class CMediaFormats : public CAtlArray<CMediaFormatCategory>

 {

 protected:

 	engine_t m_iRtspHandler;

diff --git a/src/apps/mplayerc/PPageDVD.cpp b/src/apps/mplayerc/PPageDVD.cpp
index e0813b539..b15493599 100644
--- a/src/apps/mplayerc/PPageDVD.cpp
+++ b/src/apps/mplayerc/PPageDVD.cpp
@@ -29,150 +29,150 @@
 struct

 {

 	LCID lcid;

-	TCHAR name[64];

+	LPCSTR name;

 } 

 LCIDNameList[] =

 {

-	{0x0000, _T("Default")},

-	{0x0436, _T("Afrikaans")},

-	{0x041c, _T("Albanian")},

-	{0x0401, _T("Arabic (Saudi Arabia)")},

-	{0x0801, _T("Arabic (Iraq)")},

-	{0x0c01, _T("Arabic (Egypt)")},

-	{0x1001, _T("Arabic (Libya)")},

-	{0x1401, _T("Arabic (Algeria)")},

-	{0x1801, _T("Arabic (Morocco)")},

-	{0x1c01, _T("Arabic (Tunisia)")},

-	{0x2001, _T("Arabic (Oman)")},

-	{0x2401, _T("Arabic (Yemen)")},

-	{0x2801, _T("Arabic (Syria)")},

-	{0x2c01, _T("Arabic (Jordan)")},

-	{0x3001, _T("Arabic (Lebanon)")},

-	{0x3401, _T("Arabic (Kuwait)")},

-	{0x3801, _T("Arabic (U.A.E.)")},

-	{0x3c01, _T("Arabic (Bahrain)")},

-	{0x4001, _T("Arabic (Qatar)")},

-	{0x042b, _T("Armenian")},

-	{0x042c, _T("Azeri (Latin)")},

-	{0x082c, _T("Azeri (Cyrillic)")},

-	{0x042d, _T("Basque")},

-	{0x0423, _T("Belarusian")},

-	{0x0402, _T("Bulgarian")},

-	{0x0455, _T("Burmese")},

-	{0x0403, _T("Catalan")},

-	{0x0404, _T("Chinese (Taiwan)")},

-	{0x0804, _T("Chinese (PRC)")},

-	{0x0c04, _T("Chinese (Hong Kong SAR, PRC)")},

-	{0x1004, _T("Chinese (Singapore)")},

-	{0x1404, _T("Chinese (Macau SAR)")},

-	{0x041a, _T("Croatian")},

-	{0x0405, _T("Czech")},

-	{0x0406, _T("Danish")},

-	{0x0465, _T("Divehi")},

-	{0x0413, _T("Dutch (Netherlands)")},

-	{0x0813, _T("Dutch (Belgium)")},

-	{0x0409, _T("English (United States)")},

-	{0x0809, _T("English (United Kingdom)")},

-	{0x0c09, _T("English (Australian)")},

-	{0x1009, _T("English (Canadian)")},

-	{0x1409, _T("English (New Zealand)")},

-	{0x1809, _T("English (Ireland)")},

-	{0x1c09, _T("English (South Africa)")},

-	{0x2009, _T("English (Jamaica)")},

-	{0x2409, _T("English (Caribbean)")},

-	{0x2809, _T("English (Belize)")},

-	{0x2c09, _T("English (Trinidad)")},

-	{0x3009, _T("English (Zimbabwe)")},

-	{0x3409, _T("English (Philippines)")},

-	{0x0425, _T("Estonian")},

-	{0x0438, _T("Faeroese")},

-	{0x0429, _T("Farsi")},

-	{0x040b, _T("Finnish")},

-	{0x040c, _T("French (Standard)")},

-	{0x080c, _T("French (Belgian)")},

-	{0x0c0c, _T("French (Canadian)")},

-	{0x100c, _T("French (Switzerland)")},

-	{0x140c, _T("French (Luxembourg)")},

-	{0x180c, _T("French (Monaco)")},

-	{0x0456, _T("Galician")},

-	{0x0437, _T("Georgian")},

-	{0x0407, _T("German (Standard)")},

-	{0x0807, _T("German (Switzerland)")},

-	{0x0c07, _T("German (Austria)")},

-	{0x1007, _T("German (Luxembourg)")},

-	{0x1407, _T("German (Liechtenstein)")},

-	{0x0408, _T("Greek")},

-	{0x0447, _T("Gujarati")},

-	{0x040d, _T("Hebrew")},

-	{0x0439, _T("Hindi")},

-	{0x040e, _T("Hungarian")},

-	{0x040f, _T("Icelandic")},

-	{0x0421, _T("Indonesian")},

-	{0x0410, _T("Italian (Standard)")},

-	{0x0810, _T("Italian (Switzerland)")},

-	{0x0411, _T("Japanese")},

-	{0x044b, _T("Kannada")},

-	{0x0457, _T("Konkani")},

-	{0x0412, _T("Korean")},

-	{0x0812, _T("Korean (Johab)")},

-	{0x0440, _T("Kyrgyz")},

-	{0x0426, _T("Latvian")},

-	{0x0427, _T("Lithuanian")},

-	{0x0827, _T("Lithuanian (Classic)")},

-	{0x042f, _T("FYRO Macedonian")},

-	{0x043e, _T("Malay (Malaysian)")},

-	{0x083e, _T("Malay (Brunei Darussalam)")},

-	{0x044e, _T("Marathi")},

-	{0x0450, _T("Mongolian")},

-	{0x0414, _T("Norwegian (Bokmal)")},

-	{0x0814, _T("Norwegian (Nynorsk)")},

-	{0x0415, _T("Polish")},

-	{0x0416, _T("Portuguese (Brazil)")},

-	{0x0816, _T("Portuguese (Portugal)")},

-	{0x0446, _T("Punjabi")},

-	{0x0418, _T("Romanian")},

-	{0x0419, _T("Russian")},

-	{0x044f, _T("Sanskrit")},

-	{0x0c1a, _T("Serbian (Cyrillic)")},

-	{0x081a, _T("Serbian (Latin)")},

-	{0x041b, _T("Slovak")},

-	{0x0424, _T("Slovenian")},

-	{0x040a, _T("Spanish (Spain, Traditional Sort)")},

-	{0x080a, _T("Spanish (Mexican)")},

-	{0x0c0a, _T("Spanish (Spain, International Sort)")},

-	{0x100a, _T("Spanish (Guatemala)")},

-	{0x140a, _T("Spanish (Costa Rica)")},

-	{0x180a, _T("Spanish (Panama)")},

-	{0x1c0a, _T("Spanish (Dominican Republic)")},

-	{0x200a, _T("Spanish (Venezuela)")},

-	{0x240a, _T("Spanish (Colombia)")},

-	{0x280a, _T("Spanish (Peru)")},

-	{0x2c0a, _T("Spanish (Argentina)")},

-	{0x300a, _T("Spanish (Ecuador)")},

-	{0x340a, _T("Spanish (Chile)")},

-	{0x380a, _T("Spanish (Uruguay)")},

-	{0x3c0a, _T("Spanish (Paraguay)")},

-	{0x400a, _T("Spanish (Bolivia)")},

-	{0x440a, _T("Spanish (El Salvador)")},

-	{0x480a, _T("Spanish (Honduras)")},

-	{0x4c0a, _T("Spanish (Nicaragua)")},

-	{0x500a, _T("Spanish (Puerto Rico)")},

-	{0x0430, _T("Sutu")},

-	{0x0441, _T("Swahili (Kenya)")},

-	{0x041d, _T("Swedish")},

-	{0x081d, _T("Swedish (Finland)")},

-	{0x045a, _T("Syriac")},

-	{0x0449, _T("Tamil")},

-	{0x0444, _T("Tatar (Tatarstan)")},

-	{0x044a, _T("Telugu")},

-	{0x041e, _T("Thai")},

-	{0x041f, _T("Turkish")},

-	{0x0422, _T("Ukrainian")},

-	{0x0420, _T("Urdu (Pakistan)")},

-	{0x0820, _T("Urdu (India)")},

-	{0x0443, _T("Uzbek (Latin)")},

-	{0x0843, _T("Uzbek (Cyrillic)")},

-	{0x042a, _T("Vietnamese")}

+	{0x0000, "Default"},

+	{0x0436, "Afrikaans"},

+	{0x041c, "Albanian"},

+	{0x0401, "Arabic (Saudi Arabia)"},

+	{0x0801, "Arabic (Iraq)"},

+	{0x0c01, "Arabic (Egypt)"},

+	{0x1001, "Arabic (Libya)"},

+	{0x1401, "Arabic (Algeria)"},

+	{0x1801, "Arabic (Morocco)"},

+	{0x1c01, "Arabic (Tunisia)"},

+	{0x2001, "Arabic (Oman)"},

+	{0x2401, "Arabic (Yemen)"},

+	{0x2801, "Arabic (Syria)"},

+	{0x2c01, "Arabic (Jordan)"},

+	{0x3001, "Arabic (Lebanon)"},

+	{0x3401, "Arabic (Kuwait)"},

+	{0x3801, "Arabic (U.A.E.)"},

+	{0x3c01, "Arabic (Bahrain)"},

+	{0x4001, "Arabic (Qatar)"},

+	{0x042b, "Armenian"},

+	{0x042c, "Azeri (Latin)"},

+	{0x082c, "Azeri (Cyrillic)"},

+	{0x042d, "Basque"},

+	{0x0423, "Belarusian"},

+	{0x0402, "Bulgarian"},

+	{0x0455, "Burmese"},

+	{0x0403, "Catalan"},

+	{0x0404, "Chinese (Taiwan)"},

+	{0x0804, "Chinese (PRC)"},

+	{0x0c04, "Chinese (Hong Kong SAR, PRC)"},

+	{0x1004, "Chinese (Singapore)"},

+	{0x1404, "Chinese (Macau SAR)"},

+	{0x041a, "Croatian"},

+	{0x0405, "Czech"},

+	{0x0406, "Danish"},

+	{0x0465, "Divehi"},

+	{0x0413, "Dutch (Netherlands)"},

+	{0x0813, "Dutch (Belgium)"},

+	{0x0409, "English (United States)"},

+	{0x0809, "English (United Kingdom)"},

+	{0x0c09, "English (Australian)"},

+	{0x1009, "English (Canadian)"},

+	{0x1409, "English (New Zealand)"},

+	{0x1809, "English (Ireland)"},

+	{0x1c09, "English (South Africa)"},

+	{0x2009, "English (Jamaica)"},

+	{0x2409, "English (Caribbean)"},

+	{0x2809, "English (Belize)"},

+	{0x2c09, "English (Trinidad)"},

+	{0x3009, "English (Zimbabwe)"},

+	{0x3409, "English (Philippines)"},

+	{0x0425, "Estonian"},

+	{0x0438, "Faeroese"},

+	{0x0429, "Farsi"},

+	{0x040b, "Finnish"},

+	{0x040c, "French (Standard)"},

+	{0x080c, "French (Belgian)"},

+	{0x0c0c, "French (Canadian)"},

+	{0x100c, "French (Switzerland)"},

+	{0x140c, "French (Luxembourg)"},

+	{0x180c, "French (Monaco)"},

+	{0x0456, "Galician"},

+	{0x0437, "Georgian"},

+	{0x0407, "German (Standard)"},

+	{0x0807, "German (Switzerland)"},

+	{0x0c07, "German (Austria)"},

+	{0x1007, "German (Luxembourg)"},

+	{0x1407, "German (Liechtenstein)"},

+	{0x0408, "Greek"},

+	{0x0447, "Gujarati"},

+	{0x040d, "Hebrew"},

+	{0x0439, "Hindi"},

+	{0x040e, "Hungarian"},

+	{0x040f, "Icelandic"},

+	{0x0421, "Indonesian"},

+	{0x0410, "Italian (Standard)"},

+	{0x0810, "Italian (Switzerland)"},

+	{0x0411, "Japanese"},

+	{0x044b, "Kannada"},

+	{0x0457, "Konkani"},

+	{0x0412, "Korean"},

+	{0x0812, "Korean (Johab)"},

+	{0x0440, "Kyrgyz"},

+	{0x0426, "Latvian"},

+	{0x0427, "Lithuanian"},

+	{0x0827, "Lithuanian (Classic)"},

+	{0x042f, "FYRO Macedonian"},

+	{0x043e, "Malay (Malaysian)"},

+	{0x083e, "Malay (Brunei Darussalam)"},

+	{0x044e, "Marathi"},

+	{0x0450, "Mongolian"},

+	{0x0414, "Norwegian (Bokmal)"},

+	{0x0814, "Norwegian (Nynorsk)"},

+	{0x0415, "Polish"},

+	{0x0416, "Portuguese (Brazil)"},

+	{0x0816, "Portuguese (Portugal)"},

+	{0x0446, "Punjabi"},

+	{0x0418, "Romanian"},

+	{0x0419, "Russian"},

+	{0x044f, "Sanskrit"},

+	{0x0c1a, "Serbian (Cyrillic)"},

+	{0x081a, "Serbian (Latin)"},

+	{0x041b, "Slovak"},

+	{0x0424, "Slovenian"},

+	{0x040a, "Spanish (Spain, Traditional Sort)"},

+	{0x080a, "Spanish (Mexican)"},

+	{0x0c0a, "Spanish (Spain, International Sort)"},

+	{0x100a, "Spanish (Guatemala)"},

+	{0x140a, "Spanish (Costa Rica)"},

+	{0x180a, "Spanish (Panama)"},

+	{0x1c0a, "Spanish (Dominican Republic)"},

+	{0x200a, "Spanish (Venezuela)"},

+	{0x240a, "Spanish (Colombia)"},

+	{0x280a, "Spanish (Peru)"},

+	{0x2c0a, "Spanish (Argentina)"},

+	{0x300a, "Spanish (Ecuador)"},

+	{0x340a, "Spanish (Chile)"},

+	{0x380a, "Spanish (Uruguay)"},

+	{0x3c0a, "Spanish (Paraguay)"},

+	{0x400a, "Spanish (Bolivia)"},

+	{0x440a, "Spanish (El Salvador)"},

+	{0x480a, "Spanish (Honduras)"},

+	{0x4c0a, "Spanish (Nicaragua)"},

+	{0x500a, "Spanish (Puerto Rico)"},

+	{0x0430, "Sutu"},

+	{0x0441, "Swahili (Kenya)"},

+	{0x041d, "Swedish"},

+	{0x081d, "Swedish (Finland)"},

+	{0x045a, "Syriac"},

+	{0x0449, "Tamil"},

+	{0x0444, "Tatar (Tatarstan)"},

+	{0x044a, "Telugu"},

+	{0x041e, "Thai"},

+	{0x041f, "Turkish"},

+	{0x0422, "Ukrainian"},

+	{0x0420, "Urdu (Pakistan)"},

+	{0x0820, "Urdu (India)"},

+	{0x0443, "Uzbek (Latin)"},

+	{0x0843, "Uzbek (Cyrillic)"},

+	{0x042a, "Vietnamese"}

 };

 

 

@@ -253,7 +253,7 @@ BOOL CPPageDVD::OnInitDialog()
 

 	for(int i = 0; i < countof(LCIDNameList); i++)

 	{

-		m_lcids.AddString(LCIDNameList[i].name);

+		m_lcids.AddString(CString(LCIDNameList[i].name));

 		m_lcids.SetItemData(i, LCIDNameList[i].lcid);

 	}

 

diff --git a/src/apps/mplayerc/PPageInternalFilters.cpp b/src/apps/mplayerc/PPageInternalFilters.cpp
index a65a59cd2..52a411396 100644
--- a/src/apps/mplayerc/PPageInternalFilters.cpp
+++ b/src/apps/mplayerc/PPageInternalFilters.cpp
@@ -43,17 +43,18 @@ s_filters[] =
 	{_T("AVI"), 0, SRC_AVI, IDS_SRC_AVI, NULL},

 	{_T("CDDA (Audio CD)"), 0, SRC_CDDA, IDS_SRC_CDDA, NULL},

 	{_T("CDXA (VCD/SVCD/XCD)"), 0, SRC_CDXA, IDS_SRC_CDXA, NULL},

-	{_T("Dirac"), 0, SRC_DIRAC, IDS_SRC_DIRAC, NULL},

+	__if_exists(CDiracSplitterFilter) {{_T("Dirac"), 0, SRC_DIRAC, IDS_SRC_DIRAC, NULL},}

 	{_T("DirectShow Media"), 0, SRC_DSM, IDS_SRC_DSM, NULL},

 	{_T("DTS/AC3"), 0, SRC_DTSAC3, IDS_SRC_DTSAC3, NULL},

 	{_T("DVD Video Title Set"), 0, SRC_VTS, IDS_SRC_VTS, NULL},

 	{_T("DVD2AVI Project File"), 0, SRC_D2V, IDS_SRC_D2V, NULL},

 	{_T("FLI/FLC"), 0, SRC_FLIC, IDS_SRC_FLIC, NULL},

+	{_T("FLV"), 0, SRC_FLV, IDS_SRC_FLV, NULL},

 	{_T("Matroska"), 0, SRC_MATROSKA, IDS_SRC_MATROSKA, NULL},

 	{_T("MP4/MOV"), 0, SRC_MP4, IDS_SRC_MP4, NULL},

 	{_T("MPEG Audio"), 0, SRC_MPA, IDS_SRC_MPA, NULL},

 	{_T("MPEG PS/TS/PVA"), 0, SRC_MPEG, 0, NULL},

-	{_T("Nut"), 0, SRC_NUT, IDS_SRC_NUT, NULL},

+	__if_exists(CNutSplitterFilter) {{_T("Nut"), 0, SRC_NUT, IDS_SRC_NUT, NULL},}

 	{_T("Ogg"), 0, SRC_OGG, IDS_SRC_OGG, NULL},

 	{_T("RealMedia"), 0, SRC_REALMEDIA, IDS_SRC_REALMEDIA, NULL},

 	{_T("RoQ"), 0, SRC_ROQ, IDS_SRC_ROQ, NULL},

@@ -62,7 +63,8 @@ s_filters[] =
 	{_T("AAC"), 1, TRA_AAC, IDS_TRA_AAC, CreateInstance<CMpaDecFilter>},

 	{_T("AC3"), 1, TRA_AC3, IDS_TRA_AC3, CreateInstance<CMpaDecFilter>},

 	{_T("DTS"), 1, TRA_DTS, IDS_TRA_DTS, CreateInstance<CMpaDecFilter>},

-	{_T("Dirac"), 1, TRA_DIRAC, IDS_TRA_DIRAC, NULL},

+	__if_exists(CDiracVideoDecoder) {{_T("Dirac"), 1, TRA_DIRAC, IDS_TRA_DIRAC, NULL},}

+	__if_exists(CFLVVideoDecoder) {{_T("FLV4"), 1, TRA_FLV4, 0, NULL},}

 	{_T("LPCM"), 1, TRA_LPCM, IDS_TRA_LPCM, CreateInstance<CMpaDecFilter>},

 	{_T("MPEG Audio"), 1, TRA_MPA, IDS_TRA_MPA, CreateInstance<CMpaDecFilter>},

 	{_T("MPEG-1 Video"), 1, TRA_MPEG1, IDS_TRA_MPEG1, CreateInstance<CMpeg2DecFilter>},

@@ -71,6 +73,7 @@ s_filters[] =
 	{_T("RealVideo"), 1, TRA_RV, IDS_TRA_RV, NULL},

 	{_T("RealAudio"), 1, TRA_RA, IDS_TRA_RA, NULL},

 	{_T("Vorbis"), 1, TRA_VORBIS, 0, NULL /* TODO: CreateInstance<CMpaDecFilter>*/},

+	__if_exists(CFLVVideoDecoder) {{_T("VP62"), 1, TRA_VP62, 0, NULL},}

 };

 

 IMPLEMENT_DYNAMIC(CPPageInternalFiltersListBox, CCheckListBox)

diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp
index d116cc87a..765c3d9ab 100644
--- a/src/apps/mplayerc/PlayerPlaylistBar.cpp
+++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp
@@ -322,10 +322,13 @@ bool CPlayerPlaylistBar::ParseMPCPlayList(CString fn)
 	CAtlMap<int, CPlaylistItem> pli;

 	CAtlArray<int> idx;

 

-	CWebTextFile f(CTextFile::ANSI);

+	CWebTextFile f;

 	if(!f.Open(fn) || !f.ReadString(str) || str != _T("MPCPLAYLIST"))

 		return false;

 

+	if(f.GetEncoding() == CTextFile::ASCII) 

+		f.SetEncoding(CTextFile::ANSI);

+

 	CPath base(fn);

 	base.RemoveFileSpec();

 

diff --git a/src/apps/mplayerc/PlayerStatusBar.cpp b/src/apps/mplayerc/PlayerStatusBar.cpp
index 18240774b..56ae566d1 100644
--- a/src/apps/mplayerc/PlayerStatusBar.cpp
+++ b/src/apps/mplayerc/PlayerStatusBar.cpp
@@ -159,15 +159,6 @@ void CPlayerStatusBar::SetStatusMessage(CString str)
 	m_status.SetWindowText(str);

 }

 

-CString CPlayerStatusBar::GetStatusTimer()

-{

-	CString		strResult;

-

-	m_time.GetWindowText(strResult);

-

-	return strResult;

-}

-

 void CPlayerStatusBar::SetStatusTimer(CString str)

 {

 	CString tmp;

diff --git a/src/apps/mplayerc/PlayerStatusBar.h b/src/apps/mplayerc/PlayerStatusBar.h
index 4e459be17..6f09f2740 100644
--- a/src/apps/mplayerc/PlayerStatusBar.h
+++ b/src/apps/mplayerc/PlayerStatusBar.h
@@ -49,8 +49,6 @@ public:
 	void SetStatusTimer(CString str);

 	void SetStatusTimer(REFERENCE_TIME rtNow, REFERENCE_TIME rtDur, bool fHighPrecision, const GUID* pTimeFormat = &TIME_FORMAT_MEDIA_TIME);

 

-	CString GetStatusTimer();

-

 	void ShowTimer(bool fShow);

 

 // Overrides

diff --git a/src/apps/mplayerc/StaticLink.cpp b/src/apps/mplayerc/StaticLink.cpp
index eefc883ce..b29c1f53d 100644
--- a/src/apps/mplayerc/StaticLink.cpp
+++ b/src/apps/mplayerc/StaticLink.cpp
@@ -60,7 +60,7 @@ CStaticLink::CStaticLink(LPCTSTR lpText, BOOL bDeleteOnDestroy)
 // lines of code and more reliable than turning on SS_NOTIFY in OnCtlColor 

 // because Windows doesn't send WM_CTLCOLOR to bitmap static controls. 

 // 

-UINT CStaticLink::OnNcHitTest(CPoint point) 

+LRESULT CStaticLink::OnNcHitTest(CPoint point) 

 { 

     return HTCLIENT; 

 } 

diff --git a/src/apps/mplayerc/StaticLink.h b/src/apps/mplayerc/StaticLink.h
index 55742a1df..32c878e40 100644
--- a/src/apps/mplayerc/StaticLink.h
+++ b/src/apps/mplayerc/StaticLink.h
@@ -72,7 +72,7 @@ protected:
 

     // message handlers 

     DECLARE_MESSAGE_MAP() 

-    afx_msg UINT    OnNcHitTest(CPoint point); 

+    afx_msg LRESULT    OnNcHitTest(CPoint point); 

     afx_msg HBRUSH CtlColor(CDC* pDC, UINT nCtlColor); 

     afx_msg void    OnLButtonDown(UINT nFlags, CPoint point); 

     afx_msg BOOL    OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); 

diff --git a/src/apps/mplayerc/WebServer.cpp b/src/apps/mplayerc/WebServer.cpp
index a58b29f7d..0210c8472 100644
--- a/src/apps/mplayerc/WebServer.cpp
+++ b/src/apps/mplayerc/WebServer.cpp
@@ -52,7 +52,7 @@ CWebServer::CWebServer(CMainFrame* pMainFrame, int nPort)
 		m_downloads[_T("/seekbarmid.png")] = IDF_SEEKBARMID_PNG;

 		m_downloads[_T("/seekbarright.png")] = IDF_SEEKBARRIGHT_PNG;

 		m_downloads[_T("/seekbargrip.png")] = IDF_SEEKBARGRIP_PNG;

-		m_downloads[_T("/logo.png")] = IDF_LOGO_PNG;

+		m_downloads[_T("/logo.png")] = IDF_LOGO7;

 		m_downloads[_T("/controlback.png")] = IDF_CONTROLBACK_PNG;

 		m_downloads[_T("/controlbuttonplay.png")] = IDF_CONTROLBUTTONPLAY_PNG;

 		m_downloads[_T("/controlbuttonpause.png")] = IDF_CONTROLBUTTONPAUSE_PNG;

diff --git a/src/apps/mplayerc/mplayerc.sln b/src/apps/mplayerc/mplayerc.sln
index c03b4ecf4..183c70a1b 100644
--- a/src/apps/mplayerc/mplayerc.sln
+++ b/src/apps/mplayerc/mplayerc.sln
@@ -1,5 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mplayerc", "mplayerc.vcproj", "{8CE7E5D0-C821-47AC-A247-28EC95B34670}"

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mplayerc", "mplayerc.vcproj", "{CEAF0A23-A949-443E-BDA4-2F025DD774F6}"

 	ProjectSection(ProjectDependencies) = postProject

 		{1A2DFD1A-3C6C-44D1-909D-294AF646B575} = {1A2DFD1A-3C6C-44D1-909D-294AF646B575}

 		{03208025-D5C2-426A-B0FA-251D4338F30C} = {03208025-D5C2-426A-B0FA-251D4338F30C}

@@ -16,208 +17,184 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subtitles", "..\..\subtitle
 	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsutil", "..\..\dsutil\dsutil.vcproj", "{FC70988B-1AE5-4381-866D-4F405E28AC42}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subpic", "..\..\subpic\subpic.vcproj", "{D514EA4D-EAFB-47A9-A437-A582CA571251}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decss", "..\..\decss\decss.vcproj", "{1A2DFD1A-3C6C-44D1-909D-294AF646B575}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResizableLib", "..\..\ui\ResizableLib\ResizableLib.vcproj", "{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdUI", "..\..\ui\CmdUI\CmdUI.vcproj", "{03208025-D5C2-426A-B0FA-251D4338F30C}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sizecbar", "..\..\ui\sizecbar\sizecbar.vcproj", "{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TreePropSheet", "..\..\ui\TreePropSheet\TreePropSheet.vcproj", "{AB494732-EF6D-44D0-BCF8-80FF04858D10}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

 EndProject

 Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Debug Unicode = Debug Unicode

-		Debug win2k = Debug win2k

-		Debug win98 = Debug win98

-		Release = Release

-		Release Unicode = Release Unicode

-		Release win2k = Release win2k

-		Release win98 = Release win98

-		ResourceDLL = ResourceDLL

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug.ActiveCfg = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug.Build.0 = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug win2k.ActiveCfg = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug win2k.Build.0 = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug win98.ActiveCfg = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Debug win98.Build.0 = Debug|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release.ActiveCfg = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release.Build.0 = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release Unicode.Build.0 = Release Unicode|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release win2k.ActiveCfg = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release win2k.Build.0 = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release win98.ActiveCfg = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.Release win98.Build.0 = Release|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.ResourceDLL.ActiveCfg = ResourceDLL|Win32

-		{8CE7E5D0-C821-47AC-A247-28EC95B34670}.ResourceDLL.Build.0 = ResourceDLL|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug.ActiveCfg = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug.Build.0 = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win2k.ActiveCfg = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win2k.Build.0 = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win98.ActiveCfg = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win98.Build.0 = Debug|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release.ActiveCfg = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release.Build.0 = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release Unicode.Build.0 = Release Unicode|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win2k.ActiveCfg = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win2k.Build.0 = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win98.ActiveCfg = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win98.Build.0 = Release|Win32

-		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug.ActiveCfg = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug.Build.0 = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win2k.ActiveCfg = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win2k.Build.0 = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win98.ActiveCfg = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win98.Build.0 = Debug|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release.ActiveCfg = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release.Build.0 = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release Unicode.Build.0 = Release Unicode|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win2k.ActiveCfg = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win2k.Build.0 = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win98.ActiveCfg = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win98.Build.0 = Release|Win32

-		{FC70988B-1AE5-4381-866D-4F405E28AC42}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug.ActiveCfg = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug.Build.0 = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win2k.ActiveCfg = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win2k.Build.0 = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win98.ActiveCfg = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win98.Build.0 = Debug|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release.ActiveCfg = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release.Build.0 = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release Unicode.Build.0 = Release Unicode|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win2k.ActiveCfg = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win2k.Build.0 = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win98.ActiveCfg = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win98.Build.0 = Release|Win32

-		{D514EA4D-EAFB-47A9-A437-A582CA571251}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug.ActiveCfg = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug.Build.0 = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win2k.ActiveCfg = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win2k.Build.0 = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win98.ActiveCfg = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win98.Build.0 = Debug|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release.ActiveCfg = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release.Build.0 = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release Unicode.Build.0 = Release Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win2k.ActiveCfg = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win2k.Build.0 = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win98.ActiveCfg = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win98.Build.0 = Release|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.ResourceDLL.Build.0 = Release Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug.ActiveCfg = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug.Build.0 = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win2k.ActiveCfg = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win2k.Build.0 = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win98.ActiveCfg = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win98.Build.0 = Debug|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release.ActiveCfg = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release.Build.0 = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release Unicode.Build.0 = Release Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win2k.ActiveCfg = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win2k.Build.0 = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win98.ActiveCfg = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win98.Build.0 = Release|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.ResourceDLL.Build.0 = Release Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug.ActiveCfg = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug.Build.0 = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win2k.ActiveCfg = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win2k.Build.0 = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win98.ActiveCfg = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win98.Build.0 = Debug|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release.ActiveCfg = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release.Build.0 = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release Unicode.Build.0 = Release Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win2k.ActiveCfg = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win2k.Build.0 = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win98.ActiveCfg = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win98.Build.0 = Release|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{03208025-D5C2-426A-B0FA-251D4338F30C}.ResourceDLL.Build.0 = Release Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug.ActiveCfg = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug.Build.0 = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win2k.ActiveCfg = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win2k.Build.0 = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win98.ActiveCfg = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win98.Build.0 = Debug|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release.ActiveCfg = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release.Build.0 = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release Unicode.Build.0 = Release Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win2k.ActiveCfg = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win2k.Build.0 = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win98.ActiveCfg = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win98.Build.0 = Release|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.ResourceDLL.Build.0 = Release Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug.ActiveCfg = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug.Build.0 = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug Unicode.ActiveCfg = Debug Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug Unicode.Build.0 = Debug Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win2k.ActiveCfg = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win2k.Build.0 = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win98.ActiveCfg = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win98.Build.0 = Debug|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release.ActiveCfg = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release.Build.0 = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release Unicode.ActiveCfg = Release Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release Unicode.Build.0 = Release Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win2k.ActiveCfg = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win2k.Build.0 = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win98.ActiveCfg = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win98.Build.0 = Release|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.ResourceDLL.ActiveCfg = Release Unicode|Win32

-		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.ResourceDLL.Build.0 = Release Unicode|Win32

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Debug win2k|Win32 = Debug win2k|Win32

+		Debug win98|Win32 = Debug win98|Win32

+		Debug|Win32 = Debug|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+		Release win2k|Win32 = Release win2k|Win32

+		Release win98|Win32 = Release win98|Win32

+		Release|Win32 = Release|Win32

+		ResourceDLL|Win32 = ResourceDLL|Win32

 	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Debug win2k|Win32.ActiveCfg = Debug Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Debug win98|Win32.ActiveCfg = Debug Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Release win2k|Win32.ActiveCfg = Release Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Release win98|Win32.ActiveCfg = Release Unicode|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.Release|Win32.ActiveCfg = Release|Win32

+		{CEAF0A23-A949-443E-BDA4-2F025DD774F6}.ResourceDLL|Win32.ActiveCfg = ResourceDLL|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug win98|Win32.Build.0 = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Debug|Win32.Build.0 = Debug|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win2k|Win32.Build.0 = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win98|Win32.ActiveCfg = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release win98|Win32.Build.0 = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.ActiveCfg = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.Release|Win32.Build.0 = Release|Win32

+		{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug win98|Win32.Build.0 = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug|Win32.ActiveCfg = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Debug|Win32.Build.0 = Debug|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win2k|Win32.Build.0 = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win98|Win32.ActiveCfg = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release win98|Win32.Build.0 = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release|Win32.ActiveCfg = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.Release|Win32.Build.0 = Release|Win32

+		{FC70988B-1AE5-4381-866D-4F405E28AC42}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug win98|Win32.Build.0 = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Debug|Win32.Build.0 = Debug|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win2k|Win32.Build.0 = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win98|Win32.ActiveCfg = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release win98|Win32.Build.0 = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|Win32.ActiveCfg = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.Release|Win32.Build.0 = Release|Win32

+		{D514EA4D-EAFB-47A9-A437-A582CA571251}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug win98|Win32.Build.0 = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Debug|Win32.Build.0 = Debug|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win2k|Win32.Build.0 = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win98|Win32.ActiveCfg = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release win98|Win32.Build.0 = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release|Win32.ActiveCfg = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.Release|Win32.Build.0 = Release|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{1A2DFD1A-3C6C-44D1-909D-294AF646B575}.ResourceDLL|Win32.Build.0 = Release Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug win98|Win32.Build.0 = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Debug|Win32.Build.0 = Debug|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win2k|Win32.Build.0 = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win98|Win32.ActiveCfg = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release win98|Win32.Build.0 = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release|Win32.ActiveCfg = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.Release|Win32.Build.0 = Release|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}.ResourceDLL|Win32.Build.0 = Release Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug win98|Win32.Build.0 = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Debug|Win32.Build.0 = Debug|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win2k|Win32.Build.0 = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win98|Win32.ActiveCfg = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release win98|Win32.Build.0 = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release|Win32.ActiveCfg = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.Release|Win32.Build.0 = Release|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{03208025-D5C2-426A-B0FA-251D4338F30C}.ResourceDLL|Win32.Build.0 = Release Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug win98|Win32.Build.0 = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug|Win32.ActiveCfg = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Debug|Win32.Build.0 = Debug|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win2k|Win32.Build.0 = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win98|Win32.ActiveCfg = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release win98|Win32.Build.0 = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release|Win32.ActiveCfg = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.Release|Win32.Build.0 = Release|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}.ResourceDLL|Win32.Build.0 = Release Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win2k|Win32.ActiveCfg = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win2k|Win32.Build.0 = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win98|Win32.ActiveCfg = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug win98|Win32.Build.0 = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Debug|Win32.Build.0 = Debug|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win2k|Win32.ActiveCfg = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win2k|Win32.Build.0 = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win98|Win32.ActiveCfg = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release win98|Win32.Build.0 = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release|Win32.ActiveCfg = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.Release|Win32.Build.0 = Release|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.ResourceDLL|Win32.ActiveCfg = Release Unicode|Win32

+		{AB494732-EF6D-44D0-BCF8-80FF04858D10}.ResourceDLL|Win32.Build.0 = Release Unicode|Win32

 	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

 	EndGlobalSection

 EndGlobal

diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index ba9727210..a14e906f2 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -1,105 +1,155 @@
 <?xml version="1.0" encoding="windows-1250"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="mplayerc"

 	ProjectGUID="{CEAF0A23-A949-443E-BDA4-2F025DD774F6}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="MFCProj">

+	Keyword="MFCProj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory=".\$(ConfigurationName)"

 			IntermediateDirectory=".\$(OutDir)"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

 			UseOfATL="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

-			WholeProgramOptimization="FALSE">

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release_unicode/mplayerc.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="2"

 				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

 				AdditionalIncludeDirectories=""

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				AssemblerListingLocation=".\$(OutDir)/"

 				ObjectFile=".\$(OutDir)/"

 				ProgramDataBaseFileName=".\$(OutDir)/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"/>

+				SuppressStartupBanner="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=""

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="Delayimp.lib detours.lib qtmlClient.lib wmstub.lib d3dx9.lib dxguid.lib Dsound.lib strmbaseRU.lib dsutilRU.lib subpicRU.lib subtitlesRU.lib asyncreaderRU.lib audioswitcherRU.lib avi2ac3filterRU.lib bufferfilterRU.lib cddareaderRU.lib cdxareaderRU.lib d2vsourceRU.lib decssfilterRU.lib flicsourceRU.lib dtsac3sourceRU.lib basesourceRU.lib wavdestRU.lib shoutcastsourceRU.lib streamdrivethruRU.lib vtsreaderRU.lib basesplitterRU.lib MatroskaSplitterRU.lib MatroskaMuxerRU.lib RealMediaSplitterRU.lib AviSplitterRU.lib Mpeg2DecFilterRU.lib MpaDecFilterRU.lib RoQSplitterRU.lib OggSplitterRU.lib NutSplitterRU.lib MpegSplitterRU.lib DiracSplitterRU.lib MpaSplitterRU.lib DSMSplitterRU.lib BaseMuxerRU.lib DSMMuxerRU.lib zlibR.lib subtitlesourceRU.lib strmiids.lib MP4SplitterRU.lib udpreaderRU.lib Psapi.lib setupapi.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../../../lib;../../../lib/wm7;../../../lib/qt6;../../../lib/detours"

 				IgnoreDefaultLibraryNames="MSVCRT"

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll"

 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

 				SubSystem="2"

-				SupportUnloadOfDelayLoadedDLL="TRUE"/>

+				SupportUnloadOfDelayLoadedDLL="true"

+			/>

 			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release_unicode/mplayerc.tlb"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="..\..\..\bin\upx.exe --best &quot;$(TargetPath)&quot;"

-				ExcludedFromBuild="TRUE"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories=""/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+				CommandLine="..\..\..\bin\upx.exe --best &quot;$(TargetPath)&quot;"

+				ExcludedFromBuild="true"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory=".\$(ConfigurationName)"

 			IntermediateDirectory=".\$(OutDir)"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="1">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -107,143 +157,202 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;pascal="

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				AssemblerListingLocation=".\$(OutDir)/"

 				ObjectFile=".\$(OutDir)/"

 				ProgramDataBaseFileName=".\$(OutDir)/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"/>

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_AFXDLL;_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

-				AdditionalDependencies="Delayimp.lib detours.lib qtmlClient.lib wmstub.lib d3dx9.lib Dsound.lib dxguid.lib strmbaseDU.lib dsutilDU.lib subpicDU.lib subtitlesDU.lib asyncreaderDU.lib audioswitcherDU.lib avi2ac3filterDU.lib bufferfilterDU.lib cddareaderDU.lib cdxareaderDU.lib d2vsourceDU.lib decssfilterDU.lib flicsourceDU.lib dtsac3sourceDU.lib basesourceDU.lib subtitlesourceDU.lib wavdestDU.lib shoutcastsourceDU.lib streamdrivethruDU.lib vtsreaderDU.lib basesplitterDU.lib MatroskaSplitterDU.lib MatroskaMuxerDU.lib RealMediaSplitterDU.lib AviSplitterDU.lib Mpeg2DecFilterDU.lib MpaDecFilterDU.lib RoQSplitterDU.lib OggSplitterDU.lib NutSplitterDU.lib MpegSplitterDU.lib DiracSplitterDU.lib MpaSplitterDU.lib DSMSplitterDU.lib BaseMuxerDU.lib DSMMuxerDU.lib zlibD.lib strmiids.lib MP4SplitterDU.lib udpreaderDU.lib Psapi.lib  setupapi.lib"

+				AdditionalDependencies="Delayimp.lib detours.lib qtmlClient.lib wmstub.lib d3dx9.lib Dsound.lib dxguid.lib strmbaseDU.lib dsutilDU.lib subpicDU.lib subtitlesDU.lib asyncreaderDU.lib audioswitcherDU.lib avi2ac3filterDU.lib bufferfilterDU.lib cddareaderDU.lib cdxareaderDU.lib d2vsourceDU.lib decssfilterDU.lib flicsourceDU.lib dtsac3sourceDU.lib basesourceDU.lib subtitlesourceDU.lib wavdestDU.lib shoutcastsourceDU.lib streamdrivethruDU.lib vtsreaderDU.lib basesplitterDU.lib MatroskaSplitterDU.lib MatroskaMuxerDU.lib RealMediaSplitterDU.lib AviSplitterDU.lib Mpeg2DecFilterDU.lib MpaDecFilterDU.lib RoQSplitterDU.lib OggSplitterDU.lib NutSplitterDU.lib MpegSplitterDU.lib DiracSplitterDU.lib MpaSplitterDU.lib DSMSplitterDU.lib BaseMuxerDU.lib DSMMuxerDU.lib zlibD.lib strmiids.lib MP4SplitterDU.lib udpreaderDU.lib Psapi.lib setupapi.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../../../lib;../../../lib/wm7;../../../lib/qt6;../../../lib/detours"

 				IgnoreDefaultLibraryNames="MSVCRT;LIBCMT;MSVCR71D"

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

-				SubSystem="2"/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				SubSystem="2"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_AFXDLL;_DEBUG"

-				Culture="1033"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory=".\$(ConfigurationName)"

 			IntermediateDirectory=".\$(OutDir)"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/mplayerc.tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="2"

 				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

 				AdditionalIncludeDirectories=""

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				AssemblerListingLocation=".\$(OutDir)/"

 				ObjectFile=".\$(OutDir)/"

 				ProgramDataBaseFileName=".\$(OutDir)/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"/>

+				SuppressStartupBanner="true"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+				AdditionalIncludeDirectories=""

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="Delayimp.lib detours.lib qtmlClient.lib wmstub.lib d3dx9.lib Dsound.lib dxguid.lib strmbaseR.lib dsutilR.lib subpicR.lib subtitlesR.lib asyncreaderR.lib audioswitcherR.lib avi2ac3filterR.lib bufferfilterR.lib cddareaderR.lib cdxareaderR.lib d2vsourceR.lib decssfilterR.lib flicsourceR.lib dtsac3sourceR.lib basesourceR.lib wavdestR.lib shoutcastsourceR.lib streamdrivethruR.lib vtsreaderR.lib basesplitterR.lib MatroskaSplitterR.lib MatroskaMuxerR.lib RealMediaSplitterR.lib AviSplitterR.lib Mpeg2DecFilterR.lib MpaDecFilterR.lib RadGtSplitterR.lib RoQSplitterR.lib OggSplitterR.lib NutSplitterR.lib MpegSplitterR.lib DiracSplitterR.lib MpaSplitterR.lib DSMSplitterR.lib BaseMuxerR.lib DSMMuxerR.lib zlibR.lib subtitlesourceR.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../../../lib;../../../lib/wm7;../../../lib/qt6;../../../lib/detours"

 				IgnoreDefaultLibraryNames="MSVCRT"

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll"

 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

 				SubSystem="2"

-				SupportUnloadOfDelayLoadedDLL="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="NDEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName=".\Release/mplayerc.tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="..\..\..\bin\upx.exe --best &quot;$(TargetPath)&quot;"

-				ExcludedFromBuild="TRUE"/>

+				SupportUnloadOfDelayLoadedDLL="true"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

-				AdditionalIncludeDirectories=""/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+				CommandLine="..\..\..\bin\upx.exe --best &quot;$(TargetPath)&quot;"

+				ExcludedFromBuild="true"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory=".\$(ConfigurationName)"

 			IntermediateDirectory=".\$(OutDir)"

 			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="true"

+				SuppressStartupBanner="true"

+				TargetEnvironment="1"

+				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

@@ -251,92 +360,130 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				AssemblerListingLocation=".\$(OutDir)/"

 				ObjectFile=".\$(OutDir)/"

 				ProgramDataBaseFileName=".\$(OutDir)/"

 				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"/>

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_AFXDLL;_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="Delayimp.lib detours.lib qtmlClient.lib wmstub.lib d3dx9.lib Dsound.lib dxguid.lib strmbaseD.lib dsutilD.lib subpicD.lib subtitlesD.lib asyncreaderD.lib audioswitcherD.lib avi2ac3filterD.lib bufferfilterD.lib cddareaderD.lib cdxareaderD.lib d2vsourceD.lib decssfilterD.lib flicsourceD.lib dtsac3sourceD.lib basesourceD.lib subtitlesourceD.lib wavdestD.lib shoutcastsourceD.lib streamdrivethruD.lib vtsreaderD.lib basesplitterD.lib MatroskaSplitterD.lib MatroskaMuxerD.lib RealMediaSplitterD.lib AviSplitterD.lib Mpeg2DecFilterD.lib MpaDecFilterD.lib RadGtSplitterD.lib RoQSplitterD.lib OggSplitterD.lib NutSplitterD.lib MpegSplitterD.lib DiracSplitterD.lib MpaSplitterD.lib DSMSplitterD.lib BaseMuxerD.lib DSMMuxerD.lib zlibD.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				LinkIncremental="2"

-				SuppressStartupBanner="TRUE"

+				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../../../lib;../../../lib/wm7;../../../lib/qt6;../../../lib/detours"

 				IgnoreDefaultLibraryNames="MSVCRT;LIBCMT"

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll"

-				GenerateDebugInformation="TRUE"

+				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

-				SubSystem="2"/>

-			<Tool

-				Name="VCMIDLTool"

-				PreprocessorDefinitions="_DEBUG"

-				MkTypLibCompatible="TRUE"

-				SuppressStartupBanner="TRUE"

-				TargetEnvironment="1"

-				TypeLibraryName="$(OutDir)\$(ProjectName).tlb"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				SubSystem="2"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_AFXDLL;_DEBUG"

-				Culture="1033"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCAppVerifierTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCWebDeploymentTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="ResourceDLL|Win32"

 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2">

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			>

 			<Tool

-				Name="VCCLCompilerTool"/>

+				Name="VCPreBuildEventTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCCustomBuildTool"

+			/>

 			<Tool

-				Name="VCLinkerTool"

-				ResourceOnlyDLL="TRUE"/>

+				Name="VCXMLDataGeneratorTool"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCLinkerTool"

+				ResourceOnlyDLL="true"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCManifestTool"

+			/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -344,1612 +491,2184 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

 			<File

-				RelativePath=".\AuthDlg.cpp">

+				RelativePath=".\AuthDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="BaseGraph.cpp">

+				RelativePath="BaseGraph.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ChildView.cpp">

+				RelativePath=".\ChildView.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="ComPropertyPage.cpp">

+				RelativePath="ComPropertyPage.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="ComPropertySheet.cpp">

+				RelativePath="ComPropertySheet.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ConvertChapDlg.cpp">

+				RelativePath=".\ConvertChapDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertDlg.cpp">

+				RelativePath=".\ConvertDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertPropsDlg.cpp">

+				RelativePath=".\ConvertPropsDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertResDlg.cpp">

+				RelativePath=".\ConvertResDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="CShockwaveFlash.cpp">

+				RelativePath="CShockwaveFlash.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\D3DFont.cpp">

+				RelativePath=".\D3DFont.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\DeinterlacerFilter.cpp">

+				RelativePath=".\DeinterlacerFilter.cpp"

+				>

 			</File>

 			<File

-				RelativePath="DX7AllocatorPresenter.cpp">

+				RelativePath="DX7AllocatorPresenter.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="DX9AllocatorPresenter.cpp">

+				RelativePath="DX9AllocatorPresenter.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FakeFilterMapper2.cpp">

+				RelativePath=".\FakeFilterMapper2.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FavoriteAddDlg.cpp">

+				RelativePath="FavoriteAddDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FavoriteOrganizeDlg.cpp">

+				RelativePath="FavoriteOrganizeDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FGFilter.cpp">

+				RelativePath=".\FGFilter.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\FGManager.cpp">

+				RelativePath=".\FGManager.cpp"

+				>

 			</File>

 			<File

-				RelativePath="FileDropTarget.cpp">

+				RelativePath="FileDropTarget.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FloatEdit.cpp">

+				RelativePath="FloatEdit.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FullscreenWnd.cpp">

+				RelativePath=".\FullscreenWnd.cpp"

+				>

 			</File>

 			<File

-				RelativePath="GoToDlg.cpp">

+				RelativePath="GoToDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\ShuttlePN31\Common\Interface.c">

+				RelativePath="..\ShuttlePN31\Common\Interface.c"

+				>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"/>

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"/>

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\..\filters\InternalPropertyPage.cpp">

+				RelativePath="..\..\filters\InternalPropertyPage.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\IPinHook.cpp">

+				RelativePath=".\IPinHook.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ISDb.cpp">

+				RelativePath=".\ISDb.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\jpeg.cpp">

+				RelativePath=".\jpeg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="KeyProvider.cpp">

+				RelativePath="KeyProvider.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\LineNumberEdit.cpp">

+				RelativePath=".\LineNumberEdit.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\MacrovisionKicker.cpp">

+				RelativePath=".\MacrovisionKicker.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\MainFrm.cpp">

+				RelativePath=".\MainFrm.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="MediaFormats.cpp">

+				RelativePath="MediaFormats.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="MediaTypesDlg.cpp">

+				RelativePath="MediaTypesDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\mplayerc.cpp">

+				RelativePath=".\mplayerc.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\mplayerc.rc">

+				RelativePath=".\mplayerc.rc"

+				>

 			</File>

 			<File

-				RelativePath="OpenCapDeviceDlg.cpp">

+				RelativePath="OpenCapDeviceDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="OpenDlg.cpp">

+				RelativePath="OpenDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\OpenFileDlg.cpp">

+				RelativePath=".\OpenFileDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="..\..\filters\PinInfoWnd.cpp">

+				RelativePath="..\..\filters\PinInfoWnd.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\PixelShaderCompiler.cpp">

+				RelativePath=".\PixelShaderCompiler.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PlayerCaptureBar.cpp">

+				RelativePath="PlayerCaptureBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerCaptureDialog.cpp">

+				RelativePath="PlayerCaptureDialog.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerInfoBar.cpp">

+				RelativePath="PlayerInfoBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerListCtrl.cpp">

+				RelativePath="PlayerListCtrl.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerPlaylistBar.cpp">

+				RelativePath="PlayerPlaylistBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerSeekBar.cpp">

+				RelativePath="PlayerSeekBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PlayerShaderEditorBar.cpp">

+				RelativePath=".\PlayerShaderEditorBar.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PlayerStatusBar.cpp">

+				RelativePath="PlayerStatusBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerSubresyncBar.cpp">

+				RelativePath="PlayerSubresyncBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerToolBar.cpp">

+				RelativePath="PlayerToolBar.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="Playlist.cpp">

+				RelativePath="Playlist.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PnSPresetsDlg.cpp">

+				RelativePath="PnSPresetsDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageAccelTbl.cpp">

+				RelativePath="PPageAccelTbl.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageAudioSwitcher.cpp">

+				RelativePath="PPageAudioSwitcher.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageBase.cpp">

+				RelativePath="PPageBase.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageCasimir.cpp">

+				RelativePath=".\PPageCasimir.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PPageDVD.cpp">

+				RelativePath="PPageDVD.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageExternalFilters.cpp">

+				RelativePath=".\PPageExternalFilters.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PPageFileInfoClip.cpp">

+				RelativePath="PPageFileInfoClip.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageFileInfoDetails.cpp">

+				RelativePath="PPageFileInfoDetails.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageFileInfoRes.cpp">

+				RelativePath=".\PPageFileInfoRes.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PPageFileInfoSheet.cpp">

+				RelativePath="PPageFileInfoSheet.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageFormats.cpp">

+				RelativePath="PPageFormats.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageInternalFilters.cpp">

+				RelativePath=".\PPageInternalFilters.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\PPageLogo.cpp">

+				RelativePath=".\PPageLogo.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\PPageOutput.cpp">

+				RelativePath=".\PPageOutput.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PPagePlayback.cpp">

+				RelativePath="PPagePlayback.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPagePlayer.cpp">

+				RelativePath="PPagePlayer.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageSheet.cpp">

+				RelativePath="PPageSheet.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageSubDB.cpp">

+				RelativePath=".\PPageSubDB.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PPageSubStyle.cpp">

+				RelativePath="PPageSubStyle.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageSubtitles.cpp">

+				RelativePath="PPageSubtitles.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageTweaks.cpp">

+				RelativePath="PPageTweaks.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageWebServer.cpp">

+				RelativePath=".\PPageWebServer.cpp"

+				>

 			</File>

 			<File

-				RelativePath="QuicktimeGraph.cpp">

+				RelativePath="QuicktimeGraph.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RealMediaGraph.cpp">

+				RelativePath="RealMediaGraph.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RealMediaWindowlessSite.cpp">

+				RelativePath="RealMediaWindowlessSite.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RegFilterChooserDlg.cpp">

+				RelativePath="RegFilterChooserDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="SaveDlg.cpp">

+				RelativePath="SaveDlg.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="SaveTextFileDialog.cpp">

+				RelativePath="SaveTextFileDialog.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SaveThumbnailsDialog.cpp">

+				RelativePath=".\SaveThumbnailsDialog.cpp"

+				>

 			</File>

 			<File

-				RelativePath="SelectMediaType.cpp">

+				RelativePath="SelectMediaType.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ShaderAutoCompleteDlg.cpp">

+				RelativePath=".\ShaderAutoCompleteDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ShaderCombineDlg.cpp">

+				RelativePath=".\ShaderCombineDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ShaderEditorDlg.cpp">

+				RelativePath=".\ShaderEditorDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="ShockwaveGraph.cpp">

+				RelativePath="ShockwaveGraph.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\ShuttlePN31\Common\ShuttlePN31Client.cpp">

+				RelativePath="..\ShuttlePN31\Common\ShuttlePN31Client.cpp"

+				>

 			</File>

 			<File

-				RelativePath="StaticLink.cpp">

+				RelativePath="StaticLink.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="StatusLabel.cpp">

+				RelativePath="StatusLabel.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\StdAfx.cpp">

+				RelativePath=".\StdAfx.cpp"

+				>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SubtitleDlDlg.cpp">

+				RelativePath=".\SubtitleDlDlg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="TextPassThruFilter.cpp">

+				RelativePath="TextPassThruFilter.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\VMROSD.cpp">

+				RelativePath=".\VMROSD.cpp"

+				>

 			</File>

 			<File

-				RelativePath="VolumeCtrl.cpp">

+				RelativePath="VolumeCtrl.cpp"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCLCompilerTool"/>

+						Name="VCCLCompilerTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\WebClientSocket.cpp">

+				RelativePath=".\WebClientSocket.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\WebServer.cpp">

+				RelativePath=".\WebServer.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\WebServerSocket.cpp">

+				RelativePath=".\WebServerSocket.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

+			Filter="h;hpp;hxx;hm;inl"

+			>

 			<File

-				RelativePath=".\AuthDlg.h">

+				RelativePath=".\AuthDlg.h"

+				>

 			</File>

 			<File

-				RelativePath="BaseGraph.h">

+				RelativePath="BaseGraph.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ChildView.h">

+				RelativePath=".\ChildView.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="ComPropertyPage.h">

+				RelativePath="ComPropertyPage.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="ComPropertySheet.h">

+				RelativePath="ComPropertySheet.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ConvertChapDlg.h">

+				RelativePath=".\ConvertChapDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertDlg.h">

+				RelativePath=".\ConvertDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertPropsDlg.h">

+				RelativePath=".\ConvertPropsDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ConvertResDlg.h">

+				RelativePath=".\ConvertResDlg.h"

+				>

 			</File>

 			<File

-				RelativePath="CShockwaveFlash.h">

+				RelativePath="CShockwaveFlash.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\D3DFont.h">

+				RelativePath=".\D3DFont.h"

+				>

 			</File>

 			<File

-				RelativePath=".\DeinterlacerFilter.h">

+				RelativePath=".\DeinterlacerFilter.h"

+				>

 			</File>

 			<File

-				RelativePath="DX7AllocatorPresenter.h">

+				RelativePath="DX7AllocatorPresenter.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="DX9AllocatorPresenter.h">

+				RelativePath="DX9AllocatorPresenter.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FakeFilterMapper2.h">

+				RelativePath=".\FakeFilterMapper2.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FavoriteAddDlg.h">

+				RelativePath="FavoriteAddDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FavoriteOrganizeDlg.h">

+				RelativePath="FavoriteOrganizeDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FGFilter.h">

+				RelativePath=".\FGFilter.h"

+				>

 			</File>

 			<File

-				RelativePath=".\FGManager.h">

+				RelativePath=".\FGManager.h"

+				>

 			</File>

 			<File

-				RelativePath="FileDropTarget.h">

+				RelativePath="FileDropTarget.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="FloatEdit.h">

+				RelativePath="FloatEdit.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\FullscreenWnd.h">

+				RelativePath=".\FullscreenWnd.h"

+				>

 			</File>

 			<File

-				RelativePath="GoToDlg.h">

+				RelativePath="GoToDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\IGraphBuilder2.h">

+				RelativePath=".\IGraphBuilder2.h"

+				>

 			</File>

 			<File

-				RelativePath="..\ShuttlePN31\Common\Interface.h">

+				RelativePath="..\ShuttlePN31\Common\Interface.h"

+				>

 			</File>

 			<File

-				RelativePath=".\IPinHook.h">

+				RelativePath=".\IPinHook.h"

+				>

 			</File>

 			<File

-				RelativePath="IQTVideoSurface.h">

+				RelativePath="IQTVideoSurface.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ISDb.h">

+				RelativePath=".\ISDb.h"

+				>

 			</File>

 			<File

-				RelativePath=".\jpeg.h">

+				RelativePath=".\jpeg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\jpeg_tables.h">

+				RelativePath=".\jpeg_tables.h"

+				>

 			</File>

 			<File

-				RelativePath="KeyProvider.h">

+				RelativePath="KeyProvider.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\LineNumberEdit.h">

+				RelativePath=".\LineNumberEdit.h"

+				>

 			</File>

 			<File

-				RelativePath=".\MacrovisionKicker.h">

+				RelativePath=".\MacrovisionKicker.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\MainFrm.h">

+				RelativePath=".\MainFrm.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="MediaFormats.h">

+				RelativePath="MediaFormats.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="MediaTypesDlg.h">

+				RelativePath="MediaTypesDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\mplayerc.h">

+				RelativePath=".\mplayerc.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="OpenCapDeviceDlg.h">

+				RelativePath="OpenCapDeviceDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="OpenDlg.h">

+				RelativePath="OpenDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\OpenFileDlg.h">

+				RelativePath=".\OpenFileDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\PixelShaderCompiler.h">

+				RelativePath=".\PixelShaderCompiler.h"

+				>

 			</File>

 			<File

-				RelativePath="PlayerCaptureBar.h">

+				RelativePath="PlayerCaptureBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerCaptureDialog.h">

+				RelativePath="PlayerCaptureDialog.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerInfoBar.h">

+				RelativePath="PlayerInfoBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerListCtrl.h">

+				RelativePath="PlayerListCtrl.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerPlaylistBar.h">

+				RelativePath="PlayerPlaylistBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerSeekBar.h">

+				RelativePath="PlayerSeekBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PlayerShaderEditorBar.h">

+				RelativePath=".\PlayerShaderEditorBar.h"

+				>

 			</File>

 			<File

-				RelativePath="PlayerStatusBar.h">

+				RelativePath="PlayerStatusBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerSubresyncBar.h">

+				RelativePath="PlayerSubresyncBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PlayerToolBar.h">

+				RelativePath="PlayerToolBar.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="Playlist.h">

+				RelativePath="Playlist.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PnSPresetsDlg.h">

+				RelativePath="PnSPresetsDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageAccelTbl.h">

+				RelativePath="PPageAccelTbl.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageAudioSwitcher.h">

+				RelativePath="PPageAudioSwitcher.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageBase.h">

+				RelativePath="PPageBase.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageCasimir.h">

+				RelativePath=".\PPageCasimir.h"

+				>

 			</File>

 			<File

-				RelativePath="PPageDVD.h">

+				RelativePath="PPageDVD.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageExternalFilters.h">

+				RelativePath=".\PPageExternalFilters.h"

+				>

 			</File>

 			<File

-				RelativePath="PPageFileInfoClip.h">

+				RelativePath="PPageFileInfoClip.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageFileInfoDetails.h">

+				RelativePath="PPageFileInfoDetails.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageFileInfoRes.h">

+				RelativePath=".\PPageFileInfoRes.h"

+				>

 			</File>

 			<File

-				RelativePath="PPageFileInfoSheet.h">

+				RelativePath="PPageFileInfoSheet.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageFormats.h">

+				RelativePath="PPageFormats.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageInternalFilters.h">

+				RelativePath=".\PPageInternalFilters.h"

+				>

 			</File>

 			<File

-				RelativePath=".\PPageLogo.h">

+				RelativePath=".\PPageLogo.h"

+				>

 			</File>

 			<File

-				RelativePath=".\PPageOutput.h">

+				RelativePath=".\PPageOutput.h"

+				>

 			</File>

 			<File

-				RelativePath="PPagePlayback.h">

+				RelativePath="PPagePlayback.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPagePlayer.h">

+				RelativePath="PPagePlayer.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageSheet.h">

+				RelativePath="PPageSheet.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageSubDB.h">

+				RelativePath=".\PPageSubDB.h"

+				>

 			</File>

 			<File

-				RelativePath="PPageSubStyle.h">

+				RelativePath="PPageSubStyle.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageSubtitles.h">

+				RelativePath="PPageSubtitles.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="PPageTweaks.h">

+				RelativePath="PPageTweaks.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\PPageWebServer.h">

+				RelativePath=".\PPageWebServer.h"

+				>

 			</File>

 			<File

-				RelativePath="QuicktimeGraph.h">

+				RelativePath="QuicktimeGraph.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RealMediaGraph.h">

+				RelativePath="RealMediaGraph.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RealMediaWindowlessSite.h">

+				RelativePath="RealMediaWindowlessSite.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="RegFilterChooserDlg.h">

+				RelativePath="RegFilterChooserDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\Resource.h">

+				RelativePath=".\Resource.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="SaveDlg.h">

+				RelativePath="SaveDlg.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="SaveTextFileDialog.h">

+				RelativePath="SaveTextFileDialog.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SaveThumbnailsDialog.h">

+				RelativePath=".\SaveThumbnailsDialog.h"

+				>

 			</File>

 			<File

-				RelativePath="SelectMediaType.h">

+				RelativePath="SelectMediaType.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\ShaderAutoCompleteDlg.h">

+				RelativePath=".\ShaderAutoCompleteDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ShaderCombineDlg.h">

+				RelativePath=".\ShaderCombineDlg.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ShaderEditorDlg.h">

+				RelativePath=".\ShaderEditorDlg.h"

+				>

 			</File>

 			<File

-				RelativePath="ShockwaveGraph.h">

+				RelativePath="ShockwaveGraph.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\ShuttlePN31\Common\ShuttlePN31Client.h">

+				RelativePath="..\ShuttlePN31\Common\ShuttlePN31Client.h"

+				>

 			</File>

 			<File

-				RelativePath="StaticLink.h">

+				RelativePath="StaticLink.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="StatusLabel.h">

+				RelativePath="StatusLabel.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\StdAfx.h">

+				RelativePath=".\StdAfx.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SubtitleDlDlg.h">

+				RelativePath=".\SubtitleDlDlg.h"

+				>

 			</File>

 			<File

-				RelativePath="TextPassThruFilter.h">

+				RelativePath="TextPassThruFilter.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\VMROSD.h">

+				RelativePath=".\VMROSD.h"

+				>

 			</File>

 			<File

-				RelativePath="VolumeCtrl.h">

+				RelativePath="VolumeCtrl.h"

+				>

 				<FileConfiguration

 					Name="ResourceDLL|Win32"

-					ExcludedFromBuild="TRUE">

+					ExcludedFromBuild="true"

+					>

 					<Tool

-						Name="VCCustomBuildTool"/>

+						Name="VCCustomBuildTool"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\WebClientSocket.h">

+				RelativePath=".\WebClientSocket.h"

+				>

 			</File>

 			<File

-				RelativePath=".\WebServer.h">

+				RelativePath=".\WebServer.h"

+				>

 			</File>

 			<File

-				RelativePath=".\WebServerSocket.h">

+				RelativePath=".\WebServerSocket.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 			<File

-				RelativePath="res\ani.avi">

+				RelativePath="res\ani.avi"

+				>

 			</File>

 			<File

-				RelativePath=".\res\authhdrpic.bmp">

+				RelativePath=".\res\authhdrpic.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\icon.ico">

+				RelativePath="res\icon.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\Icon_114.ico">

+				RelativePath="res\Icon_114.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\Icon_116.ico">

+				RelativePath="res\Icon_116.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\Icon_41.ico">

+				RelativePath="res\Icon_41.ico"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.0.bmp">

+				RelativePath=".\res\logo.0.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.1.bmp">

+				RelativePath=".\res\logo.1.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.2.bmp">

+				RelativePath=".\res\logo.2.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.3.bmp">

+				RelativePath=".\res\logo.3.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.4.bmp">

+				RelativePath=".\res\logo.4.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.5.bmp">

+				RelativePath=".\res\logo.5.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.6.bmp">

+				RelativePath=".\res\logo.6.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\logo.7.bmp">

+				RelativePath=".\res\logo.7.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\mono.bmp">

+				RelativePath="res\mono.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\mplayerc.manifest">

+				RelativePath="res\mplayerc.manifest"

+				>

+				<FileConfiguration

+					Name="Release Unicode|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="ResourceDLL|Win32"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCustomBuildTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="res\multi.ico">

+				RelativePath="res\multi.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\noaudio.bmp">

+				RelativePath="res\noaudio.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\onoff.bmp">

+				RelativePath="res\onoff.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\single.ico">

+				RelativePath="res\single.ico"

+				>

 			</File>

 			<File

-				RelativePath="res\stereo.bmp">

+				RelativePath="res\stereo.bmp"

+				>

 			</File>

 			<File

-				RelativePath=".\res\streamtypes.bmp">

+				RelativePath=".\res\streamtypes.bmp"

+				>

 			</File>

 			<File

-				RelativePath="res\toolbar1.bmp">

+				RelativePath="res\toolbar1.bmp"

+				>

 			</File>

 			<Filter

 				Name="web"

-				Filter="">

+				>

 				<File

-					RelativePath=".\res\web\1pix.gif">

+					RelativePath=".\res\web\1pix.gif"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\404.html">

+					RelativePath=".\res\web\404.html"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\bottomside.PNG">

+					RelativePath=".\res\web\bottomside.PNG"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\browser.html">

+					RelativePath=".\res\web\browser.html"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlback.png">

+					RelativePath=".\res\web\controlback.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttondecrate.png">

+					RelativePath=".\res\web\controlbuttondecrate.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonincrate.png">

+					RelativePath=".\res\web\controlbuttonincrate.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonpause.png">

+					RelativePath=".\res\web\controlbuttonpause.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonplay.png">

+					RelativePath=".\res\web\controlbuttonplay.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonskipback.png">

+					RelativePath=".\res\web\controlbuttonskipback.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonskipforward.png">

+					RelativePath=".\res\web\controlbuttonskipforward.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonstep.png">

+					RelativePath=".\res\web\controlbuttonstep.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlbuttonstop.png">

+					RelativePath=".\res\web\controlbuttonstop.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controls.html">

+					RelativePath=".\res\web\controls.html"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlvolumebar.png">

+					RelativePath=".\res\web\controlvolumebar.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlvolumegrip.png">

+					RelativePath=".\res\web\controlvolumegrip.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlvolumeoff.png">

+					RelativePath=".\res\web\controlvolumeoff.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\controlvolumeon.png">

+					RelativePath=".\res\web\controlvolumeon.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\default.css">

+					RelativePath=".\res\web\default.css"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\headerback.png">

+					RelativePath=".\res\web\headerback.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\headerclose.png">

+					RelativePath=".\res\web\headerclose.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\headericon.png">

+					RelativePath=".\res\web\headericon.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\index.html">

+					RelativePath=".\res\web\index.html"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\leftbottomside.png">

+					RelativePath=".\res\web\leftbottomside.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\leftside.png">

+					RelativePath=".\res\web\leftside.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\logo.png">

+					RelativePath=".\res\web\logo.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\player.html">

+					RelativePath=".\res\web\player.html"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\rightbottomside.png">

+					RelativePath=".\res\web\rightbottomside.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\rightside.png">

+					RelativePath=".\res\web\rightside.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\seekbargrip.png">

+					RelativePath=".\res\web\seekbargrip.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\seekbarleft.png">

+					RelativePath=".\res\web\seekbarleft.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\seekbarmid.png">

+					RelativePath=".\res\web\seekbarmid.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\seekbarright.png">

+					RelativePath=".\res\web\seekbarright.png"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\sliderback.gif">

+					RelativePath=".\res\web\sliderback.gif"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\sliderbar.gif">

+					RelativePath=".\res\web\sliderbar.gif"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\slidergrip.gif">

+					RelativePath=".\res\web\slidergrip.gif"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\vbg.gif">

+					RelativePath=".\res\web\vbg.gif"

+					>

 				</File>

 				<File

-					RelativePath=".\res\web\vbs.GIF">

+					RelativePath=".\res\web\vbs.GIF"

+					>

 				</File>

 			</Filter>

 			<Filter

 				Name="shaders"

-				Filter="">

+				>

 				<File

-					RelativePath=".\res\shaders\contour.psh">

+					RelativePath=".\res\shaders\contour.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\deinterlace (blend).psh">

+					RelativePath=".\res\shaders\deinterlace (blend).psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\EdgeSharpen.psh">

+					RelativePath=".\res\shaders\EdgeSharpen.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\emboss.psh">

+					RelativePath=".\res\shaders\emboss.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\empty.psh">

+					RelativePath=".\res\shaders\empty.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\grayscale.psh">

+					RelativePath=".\res\shaders\grayscale.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\invert.psh">

+					RelativePath=".\res\shaders\invert.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\letterbox.psh">

+					RelativePath=".\res\shaders\letterbox.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\procamp.psh">

+					RelativePath=".\res\shaders\procamp.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\resizer.psh">

+					RelativePath=".\res\shaders\resizer.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\sharpen.psh">

+					RelativePath=".\res\shaders\sharpen.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\SharpenComplex.psh">

+					RelativePath=".\res\shaders\SharpenComplex.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\sphere.psh">

+					RelativePath=".\res\shaders\sphere.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\spotlight.psh">

+					RelativePath=".\res\shaders\spotlight.psh"

+					>

 				</File>

 				<File

-					RelativePath=".\res\shaders\wave.psh">

+					RelativePath=".\res\shaders\wave.psh"

+					>

 				</File>

 			</Filter>

 		</Filter>

 		<File

-			RelativePath=".\History.txt">

+			RelativePath=".\History.txt"

+			>

 		</File>

 		<File

-			RelativePath=".\res\PN31Snoop.sys">

+			RelativePath=".\res\PN31Snoop.sys"

+			>

 		</File>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="1"/>

+			Value="1"

+		/>

 		<Global

 			Name="RESOURCE_FILE"

-			Value="mplayerc.rc"/>

+			Value="mplayerc.rc"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj
index 4effa274f..5de3f0f99 100644
--- a/src/decss/decss.vcproj
+++ b/src/decss/decss.vcproj
@@ -1,190 +1,282 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="decss"

 	ProjectGUID="{1A2DFD1A-3C6C-44D1-909D-294AF646B575}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/$(ProjectName)D.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/$(ProjectName)D.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/$(ProjectName)R.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/$(ProjectName)R.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/$(ProjectName)DU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/$(ProjectName)DU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/$(ProjectName)RU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/$(ProjectName)RU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -192,93 +284,120 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="CSSauth.cpp">

+				RelativePath="CSSauth.cpp"

+				>

 			</File>

 			<File

-				RelativePath="CSSscramble.cpp">

+				RelativePath="CSSscramble.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\DeCSSInputPin.cpp">

+				RelativePath=".\DeCSSInputPin.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="VobDec.cpp">

+				RelativePath="VobDec.cpp"

+				>

 			</File>

 			<File

-				RelativePath="VobFile.cpp">

+				RelativePath="VobFile.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath="CSSauth.h">

+				RelativePath="CSSauth.h"

+				>

 			</File>

 			<File

-				RelativePath="CSSscramble.h">

+				RelativePath="CSSscramble.h"

+				>

 			</File>

 			<File

-				RelativePath="decss.h">

+				RelativePath="decss.h"

+				>

 			</File>

 			<File

-				RelativePath=".\DeCSSInputPin.h">

+				RelativePath=".\DeCSSInputPin.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 			<File

-				RelativePath="VobDec.h">

+				RelativePath="VobDec.h"

+				>

 			</File>

 			<File

-				RelativePath="VobFile.h">

+				RelativePath="VobFile.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 		<Filter

 			Name="vstrip"

-			Filter="">

+			>

 			<File

-				RelativePath="udf.cpp">

+				RelativePath="udf.cpp"

+				>

 			</File>

 			<File

-				RelativePath="udf.h">

+				RelativePath="udf.h"

+				>

 			</File>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/dsutil/DSMPropertyBag.cpp b/src/dsutil/DSMPropertyBag.cpp
index 4efd36ecb..3e8f97997 100644
--- a/src/dsutil/DSMPropertyBag.cpp
+++ b/src/dsutil/DSMPropertyBag.cpp
@@ -253,18 +253,39 @@ STDMETHODIMP IDSMResourceBagImpl::ResRemoveAll(DWORD_PTR tag)
 // CDSMChapter

 //

 

+CDSMChapter::CDSMChapter()

+{

+	order = counter++;

+	rt = 0;

+}

+

 CDSMChapter::CDSMChapter(REFERENCE_TIME rt, LPCWSTR name)

 {

+	order = counter++;

 	this->rt = rt;

 	this->name = name;

 }

 

 void CDSMChapter::operator = (const CDSMChapter& c)

 {

+	order = c.counter;

 	rt = c.rt;

 	name = c.name;

 }

 

+int CDSMChapter::counter = 0;

+

+int CDSMChapter::Compare(const void* a, const void* b)

+{

+	const CDSMChapter* ca = (const CDSMChapter*)a;

+	const CDSMChapter* cb = (const CDSMChapter*)b;

+

+	if(ca->rt > cb->rt) return 1;

+	else if(ca->rt < cb->rt) return -1;

+

+	return ca->order - cb->order;

+}

+

 //

 // IDSMChapterBagImpl

 //

@@ -348,17 +369,10 @@ STDMETHODIMP_(long) IDSMChapterBagImpl::ChapLookup(REFERENCE_TIME* prt, BSTR* pp
 	return i;

 }

 

-static int chapter_comp(const void* a, const void* b)

-{

-	if(((CDSMChapter*)a)->rt > ((CDSMChapter*)b)->rt) return 1;

-	else if(((CDSMChapter*)a)->rt < ((CDSMChapter*)b)->rt) return -1;

-	return 0;

-}

-

 STDMETHODIMP IDSMChapterBagImpl::ChapSort()

 {

 	if(m_fSorted) return S_FALSE;

-	qsort(m_chapters.GetData(), m_chapters.GetCount(), sizeof(CDSMChapter), chapter_comp);

+	qsort(m_chapters.GetData(), m_chapters.GetCount(), sizeof(CDSMChapter), CDSMChapter::Compare);

 	m_fSorted = true;

 	return S_OK;

 }

diff --git a/src/dsutil/DSMPropertyBag.h b/src/dsutil/DSMPropertyBag.h
index 5af71c29e..bd91914cf 100644
--- a/src/dsutil/DSMPropertyBag.h
+++ b/src/dsutil/DSMPropertyBag.h
@@ -112,12 +112,16 @@ interface IDSMChapterBag : public IUnknown
 

 class CDSMChapter

 {

+	static int counter;

+	int order;

+

 public:

 	REFERENCE_TIME rt;

 	CStringW name;

-	CDSMChapter() {rt = 0;}

+	CDSMChapter();

 	CDSMChapter(REFERENCE_TIME rt, LPCWSTR name);

 	void operator = (const CDSMChapter& c);

+	static int Compare(const void* a, const void* b);

 };

 

 class IDSMChapterBagImpl : public IDSMChapterBag

diff --git a/src/dsutil/MediaTypeEx.cpp b/src/dsutil/MediaTypeEx.cpp
index e014c8476..b674f2c73 100644
--- a/src/dsutil/MediaTypeEx.cpp
+++ b/src/dsutil/MediaTypeEx.cpp
@@ -327,6 +327,8 @@ CString CMediaTypeEx::GetSubtitleCodecName(const GUID& subtype)
 		names[MEDIASUBTYPE_UTF8] = _T("UTF-8");

 		names[MEDIASUBTYPE_SSA] = _T("SubStation Alpha");

 		names[MEDIASUBTYPE_ASS] = _T("Advanced SubStation Alpha");

+		names[MEDIASUBTYPE_ASS2] = _T("Advanced SubStation Alpha");

+		names[MEDIASUBTYPE_SSF] = _T("Stuctured Subtitle Format");

 		names[MEDIASUBTYPE_USF] = _T("Universal Subtitle Format");

 		names[MEDIASUBTYPE_VOBSUB] = _T("VobSub");

 		// names[''] = _T("");

@@ -472,8 +474,6 @@ void CMediaTypeEx::Dump(CAtlList<CString>& sl)
 		sl.AddTail(str);

 		str.Format(_T("biYPelsPerMeter: %d"), bih->biYPelsPerMeter);

 		sl.AddTail(str);

-		str.Format(_T("biYPelsPerMeter: %d"), bih->biYPelsPerMeter);

-		sl.AddTail(str);

 		str.Format(_T("biClrUsed: %d"), bih->biClrUsed);

 		sl.AddTail(str);

 		str.Format(_T("biClrImportant: %d"), bih->biClrImportant);

diff --git a/src/dsutil/dsutil.vcproj b/src/dsutil/dsutil.vcproj
index 240efff1a..66616ad2a 100644
--- a/src/dsutil/dsutil.vcproj
+++ b/src/dsutil/dsutil.vcproj
@@ -1,195 +1,287 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="dsutil"

 	ProjectGUID="{FC70988B-1AE5-4381-866D-4F405E28AC42}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="vfw32.lib Version.lib"

 				OutputFile="../../lib/$(ProjectName)D.lib"

-				IgnoreAllDefaultLibraries="FALSE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				IgnoreAllDefaultLibraries="false"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				AdditionalDependencies="vfw32.lib Version.lib"

-				OutputFile="../../lib/$(ProjectName)R.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				AdditionalDependencies="vfw32.lib Version.lib"

+				OutputFile="../../lib/$(ProjectName)R.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				AdditionalDependencies="vfw32.lib Version.lib"

-				OutputFile="../../lib/$(ProjectName)DU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				AdditionalDependencies="vfw32.lib Version.lib"

+				OutputFile="../../lib/$(ProjectName)DU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				AdditionalDependencies="vfw32.lib Version.lib"

-				OutputFile="../../lib/$(ProjectName)RU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				AdditionalDependencies="vfw32.lib Version.lib"

+				OutputFile="../../lib/$(ProjectName)RU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -197,203 +289,248 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath=".\a_yuv2rgb.asm">

+				RelativePath=".\a_yuv2rgb.asm"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\a_yuvtable.asm">

+				RelativePath=".\a_yuvtable.asm"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\convert_a.asm">

+				RelativePath=".\convert_a.asm"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCustomBuildTool"

-						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;

-"

-						Outputs="$(OutDir)\$(InputName).obj"/>

+						CommandLine="ml /c /coff /Cx /nologo /Fo&quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"

+						Outputs="$(OutDir)\$(InputName).obj"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\DSMPropertyBag.cpp">

+				RelativePath=".\DSMPropertyBag.cpp"

+				>

 			</File>

 			<File

-				RelativePath="DSUtil.cpp">

+				RelativePath="DSUtil.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\FontInstaller.cpp">

+				RelativePath=".\FontInstaller.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\MediaTypeEx.cpp">

+				RelativePath=".\MediaTypeEx.cpp"

+				>

 			</File>

 			<File

-				RelativePath="MediaTypes.cpp">

+				RelativePath="MediaTypes.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\NullRenderers.cpp">

+				RelativePath=".\NullRenderers.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\text.cpp">

+				RelativePath=".\text.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\vd.cpp">

+				RelativePath=".\vd.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath=".\DSMPropertyBag.h">

+				RelativePath=".\DSMPropertyBag.h"

+				>

 			</File>

 			<File

-				RelativePath="DSUtil.h">

+				RelativePath="DSUtil.h"

+				>

 			</File>

 			<File

-				RelativePath=".\FontInstaller.h">

+				RelativePath=".\FontInstaller.h"

+				>

 			</File>

 			<File

-				RelativePath=".\MediaTypeEx.h">

+				RelativePath=".\MediaTypeEx.h"

+				>

 			</File>

 			<File

-				RelativePath="MediaTypes.h">

+				RelativePath="MediaTypes.h"

+				>

 			</File>

 			<File

-				RelativePath=".\NullRenderers.h">

+				RelativePath=".\NullRenderers.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 			<File

-				RelativePath=".\text.h">

+				RelativePath=".\text.h"

+				>

 			</File>

 			<File

-				RelativePath=".\vd.h">

+				RelativePath=".\vd.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/subpic/DX9SubPic.cpp b/src/subpic/DX9SubPic.cpp
index 4f70babaa..c95ea900e 100644
--- a/src/subpic/DX9SubPic.cpp
+++ b/src/subpic/DX9SubPic.cpp
@@ -173,6 +173,10 @@ STDMETHODIMP CDX9SubPic::Unlock(RECT* pDirtyRect)
 	{

 		m_rcDirty = *pDirtyRect;

 		m_rcDirty.InflateRect(1, 1);

+		m_rcDirty.left &= ~127;

+		m_rcDirty.top &= ~63;

+		m_rcDirty.right = (m_rcDirty.right + 127) & ~127;

+		m_rcDirty.bottom = (m_rcDirty.bottom + 63) & ~63;

 		m_rcDirty &= CRect(CPoint(0, 0), m_size);

 	}

 	else

diff --git a/src/subpic/ISubPic.cpp b/src/subpic/ISubPic.cpp
index f6f3eab3f..3dcb71ad7 100644
--- a/src/subpic/ISubPic.cpp
+++ b/src/subpic/ISubPic.cpp
@@ -558,10 +558,8 @@ DWORD CSubPicQueue::ThreadProc()
 

 			while(GetCount() && GetTail()->GetStop() > rtInvalidate)

 			{

-				if(GetTail()->GetStart() < rtInvalidate)

-					GetTail()->SetStop(rtInvalidate);

-				else

-					RemoveTail();

+				if(GetTail()->GetStart() < rtInvalidate) GetTail()->SetStop(rtInvalidate);

+				else RemoveTail();

 			}

 

 			m_fBreakBuffering = false;

diff --git a/src/subpic/subpic.vcproj b/src/subpic/subpic.vcproj
index a50448de9..e8182ee55 100644
--- a/src/subpic/subpic.vcproj
+++ b/src/subpic/subpic.vcproj
@@ -1,206 +1,296 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="subpic"

 	ProjectGUID="{D514EA4D-EAFB-47A9-A437-A582CA571251}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				ForceConformanceInForLoopScope="TRUE"

-				UsePrecompiledHeader="3"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				AdditionalDependencies="d3d9.lib ddraw.lib"

-				OutputFile="../../lib/$(ProjectName)D.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				AdditionalDependencies="d3d9.lib ddraw.lib"

+				OutputFile="../../lib/$(ProjectName)D.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

-				OmitFramePointers="TRUE"

-				OptimizeForProcessor="2"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				ForceConformanceInForLoopScope="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				AdditionalDependencies="d3d9.lib ddraw.lib"

-				OutputFile="../../lib/$(ProjectName)R.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				AdditionalDependencies="d3d9.lib ddraw.lib"

+				OutputFile="../../lib/$(ProjectName)R.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				ForceConformanceInForLoopScope="TRUE"

-				UsePrecompiledHeader="3"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="d3d9.lib ddraw.lib"

 				OutputFile="../../lib/$(ProjectName)DU.lib"

-				AdditionalLibraryDirectories=""/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				AdditionalLibraryDirectories=""

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

-				OmitFramePointers="TRUE"

-				OptimizeForProcessor="2"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				ForceConformanceInForLoopScope="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				ForceConformanceInForLoopScope="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

 				Name="VCLibrarianTool"

 				AdditionalDependencies="d3d9.lib ddraw.lib"

 				OutputFile="../../lib/$(ProjectName)RU.lib"

-				AdditionalLibraryDirectories=""/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				AdditionalLibraryDirectories=""

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -208,80 +298,104 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath=".\CoordGeom.cpp">

+				RelativePath=".\CoordGeom.cpp"

+				>

 			</File>

 			<File

-				RelativePath="DX7SubPic.cpp">

+				RelativePath="DX7SubPic.cpp"

+				>

 			</File>

 			<File

-				RelativePath="DX9SubPic.cpp">

+				RelativePath="DX9SubPic.cpp"

+				>

 			</File>

 			<File

-				RelativePath="ISubPic.cpp">

+				RelativePath="ISubPic.cpp"

+				>

 			</File>

 			<File

-				RelativePath="MemSubPic.cpp">

+				RelativePath="MemSubPic.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath=".\CoordGeom.h">

+				RelativePath=".\CoordGeom.h"

+				>

 			</File>

 			<File

-				RelativePath="DX7SubPic.h">

+				RelativePath="DX7SubPic.h"

+				>

 			</File>

 			<File

-				RelativePath="DX9SubPic.h">

+				RelativePath="DX9SubPic.h"

+				>

 			</File>

 			<File

-				RelativePath="ISubPic.h">

+				RelativePath="ISubPic.h"

+				>

 			</File>

 			<File

-				RelativePath="MemSubPic.h">

+				RelativePath="MemSubPic.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="1"/>

+			Value="1"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/subtitles/RTS.cpp b/src/subtitles/RTS.cpp
index f38686bda..27351d5e4 100644
--- a/src/subtitles/RTS.cpp
+++ b/src/subtitles/RTS.cpp
@@ -47,20 +47,19 @@ CMyFont::CMyFont(STSStyle& style)
 	lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;

 	lf.lfQuality = ANTIALIASED_QUALITY;

 	lf.lfPitchAndFamily = DEFAULT_PITCH|FF_DONTCARE;

-lf.lfEscapement = lf.lfOrientation = 0;

+

 	if(!CreateFontIndirect(&lf))

 	{

 		_tcscpy(lf.lfFaceName, _T("Arial"));

 		CreateFontIndirect(&lf);

 	}

 

-	HFONT hOldFont = (HFONT)SelectObject(g_hDC, *this);

+	HFONT hOldFont = SelectFont(g_hDC, *this);

 	TEXTMETRIC tm;

-	BOOL b = GetTextMetrics(g_hDC, &tm);

-	DWORD ret = GetLastError();

+	GetTextMetrics(g_hDC, &tm);

 	m_ascent = ((tm.tmAscent + 4) >> 3);

 	m_descent = ((tm.tmDescent + 4) >> 3);

-	SelectObject(g_hDC, hOldFont);

+	SelectFont(g_hDC, hOldFont);

 }

 

 // CWord

@@ -212,14 +211,14 @@ bool CWord::CreateOpaqueBox()
 CText::CText(STSStyle& style, CStringW str, int ktype, int kstart, int kend)

 	: CWord(style, str, ktype, kstart, kend)

 {

-	if(m_str.GetLength() == 1 && m_str[0] == ' ')

+	if(m_str == L" ")

 	{

 		m_fWhiteSpaceChar = true;

 	}

 

 	CMyFont font(m_style);

 

-	HFONT hOldFont = (HFONT)SelectObject(g_hDC, font);

+	HFONT hOldFont = SelectFont(g_hDC, font);

 

 	if(m_style.fontSpacing || (long)GetVersion() < 0)

 	{

@@ -228,7 +227,7 @@ CText::CText(STSStyle& style, CStringW str, int ktype, int kstart, int kend)
 		for(LPCWSTR s = m_str; *s; s++)

 		{

 			CSize extent;

-			if(!GetTextExtentPoint32W(g_hDC, s, 1, &extent)) {SelectObject(g_hDC, hOldFont); ASSERT(0); return;}

+			if(!GetTextExtentPoint32W(g_hDC, s, 1, &extent)) {SelectFont(g_hDC, hOldFont); ASSERT(0); return;}

 			m_width += extent.cx + (int)m_style.fontSpacing;

 		}

 //			m_width -= (int)m_style.fontSpacing; // TODO: subtract only at the end of the line

@@ -236,13 +235,13 @@ CText::CText(STSStyle& style, CStringW str, int ktype, int kstart, int kend)
 	else

 	{

 		CSize extent;

-		if(!GetTextExtentPoint32W(g_hDC, m_str, wcslen(str), &extent)) {SelectObject(g_hDC, hOldFont); ASSERT(0); return;}

+		if(!GetTextExtentPoint32W(g_hDC, m_str, wcslen(str), &extent)) {SelectFont(g_hDC, hOldFont); ASSERT(0); return;}

 		m_width += extent.cx;

 	}

 

 	m_width = (int)(m_style.fontScaleX/100*m_width + 4) >> 3;

 

-	SelectObject(g_hDC, hOldFont);

+	SelectFont(g_hDC, hOldFont);

 }

 

 CWord* CText::Copy()

@@ -258,7 +257,8 @@ bool CText::Append(CWord* w)
 bool CText::CreatePath()

 {

 	CMyFont font(m_style);

-	HFONT hOldFont = (HFONT)SelectObject(g_hDC, font);

+

+	HFONT hOldFont = SelectFont(g_hDC, font);

 

 	int width = 0;

 

@@ -269,7 +269,7 @@ bool CText::CreatePath()
 		for(LPCWSTR s = m_str; *s; s++)

 		{

 			CSize extent;

-			if(!GetTextExtentPoint32W(g_hDC, s, 1, &extent)) {SelectObject(g_hDC, hOldFont); ASSERT(0); return(false);}

+			if(!GetTextExtentPoint32W(g_hDC, s, 1, &extent)) {SelectFont(g_hDC, hOldFont); ASSERT(0); return(false);}

 

 			PartialBeginPath(g_hDC, bFirstPath); bFirstPath = false;

 			TextOutW(g_hDC, 0, 0, s, 1);

@@ -281,14 +281,14 @@ bool CText::CreatePath()
 	else

 	{

 		CSize extent;

-		if(!GetTextExtentPoint32W(g_hDC, m_str, m_str.GetLength(), &extent)) {SelectObject(g_hDC, hOldFont); ASSERT(0); return(false);}

+		if(!GetTextExtentPoint32W(g_hDC, m_str, m_str.GetLength(), &extent)) {SelectFont(g_hDC, hOldFont); ASSERT(0); return(false);}

 

 		BeginPath(g_hDC);

 		TextOutW(g_hDC, 0, 0, m_str, m_str.GetLength());

 		EndPath(g_hDC);

 	}

 

-	SelectObject(g_hDC, hOldFont);

+	SelectFont(g_hDC, hOldFont);

 

 	return(true);

 }

diff --git a/src/subtitles/Rasterizer.cpp b/src/subtitles/Rasterizer.cpp
index 218965a91..7efa63c04 100644
--- a/src/subtitles/Rasterizer.cpp
+++ b/src/subtitles/Rasterizer.cpp
@@ -783,7 +783,7 @@ bool Rasterizer::Rasterize(int xsub, int ysub, bool fBlur)
 #include <xmmintrin.h>

 #include <emmintrin.h>

 

-__forceinline void pixmix_sse2(DWORD* dst, DWORD color, DWORD alpha)

+static __forceinline void pixmix_sse2(DWORD* dst, DWORD color, DWORD alpha)

 {

 	alpha = ((alpha * (color>>24)) >> 6) & 0xff;

 	color &= 0xffffff;

diff --git a/src/subtitles/SSF.cpp b/src/subtitles/SSF.cpp
index e4578bcec..98b43e96f 100644
--- a/src/subtitles/SSF.cpp
+++ b/src/subtitles/SSF.cpp
@@ -17,231 +17,223 @@
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

  *  http://www.gnu.org/copyleft/gpl.html

  *

+ *  TODO: 

+ *  - fill effect

+ *  - outline bkg still very slow

+ *

  */

 

 #include "stdafx.h"

+#include <xmmintrin.h>

+#include <emmintrin.h>

 #include "SSF.h"

+#include "..\subpic\MemSubPic.h"

 

-CRenderedSSF::CRenderedSSF(CCritSec* pLock)

-	: ISubPicProviderImpl(pLock)

-{

-}

-

-CRenderedSSF::~CRenderedSSF()

-{

-}

-

-bool CRenderedSSF::Open(CString fn, CString name)

+namespace ssf

 {

-	m_fn.Empty();

-	m_name.Empty();

-	m_psf.Free();

-

-	if(name.IsEmpty())

+	CRenderer::CRenderer(CCritSec* pLock)

+		: ISubPicProviderImpl(pLock)

 	{

-		CString str = fn;

-		str.Replace('\\', '/');

-		name = str.Left(str.ReverseFind('.'));

-		name = name.Mid(name.ReverseFind('/')+1);

-		name = name.Mid(name.ReverseFind('.')+1);

 	}

 

-	try

+	CRenderer::~CRenderer()

 	{

-		if(Open(ssf::FileStream(fn), name)) 

-		{

-			m_fn = fn;

-			return true;

-		}

 	}

-	catch(ssf::Exception& e)

+

+	bool CRenderer::Open(CString fn, CString name)

 	{

-		TRACE(_T("%s\n"), e.ToString());

-	}

+		m_fn.Empty();

+		m_name.Empty();

+		m_file.Free();

+		m_renderer.Free();

 

-	return false;	

-}

+		if(name.IsEmpty())

+		{

+			CString str = fn;

+			str.Replace('\\', '/');

+			name = str.Left(str.ReverseFind('.'));

+			name = name.Mid(name.ReverseFind('/')+1);

+			name = name.Mid(name.ReverseFind('.')+1);

+		}

 

-bool CRenderedSSF::Open(ssf::Stream& s, CString name)

-{

-	m_fn.Empty();

-	m_name.Empty();

-	m_psf.Free();

-

-	try

-	{

-		m_psf.Attach(new ssf::SubtitleFile());

-		m_psf->Parse(s);

-#ifdef DEBUG

-		m_psf->Dump(ssf::PLow);

-		double at = 0;

-		for(int i = 9000; i < 12000; i += 10)

+		try

 		{

-			double at = (double)i/1000;

-			CAutoPtrList<ssf::Subtitle> subs;

-			m_psf->Lookup(at, subs);

-			POSITION pos = subs.GetHeadPosition();

-			while(pos)

+			if(Open(FileInputStream(fn), name)) 

 			{

-				const ssf::Subtitle* s = subs.GetNext(pos);

-

-				POSITION pos = s->m_text.GetHeadPosition();

-				while(pos)

-				{

-					const ssf::Text& t = s->m_text.GetNext(pos);

-					TRACE(_T("%.3f: [%.2f] %s\n"), at, t.style.font.size, t.str);

-				}

+				m_fn = fn;

+				return true;

 			}

 		}

-#endif

-		m_name = name;

-		return true;

+		catch(Exception& e)

+		{

+			TRACE(_T("%s\n"), e.ToString());

+		}

+

+		return false;	

 	}

-	catch(ssf::Exception& e)

+

+	bool CRenderer::Open(InputStream& s, CString name)

 	{

-		TRACE(_T("%s\n"), e.ToString());

-	}

+		m_fn.Empty();

+		m_name.Empty();

+		m_file.Free();

+		m_renderer.Free();

 

-	return false;

-}

+		try

+		{

+			m_file.Attach(new SubtitleFile());

+			m_file->Parse(s);

+			m_renderer.Attach(new Renderer());

+			m_name = name;

+			return true;

+		}

+		catch(Exception& e)

+		{

+			TRACE(_T("%s\n"), e.ToString());

+		}

 

-STDMETHODIMP CRenderedSSF::NonDelegatingQueryInterface(REFIID riid, void** ppv)

-{

-    CheckPointer(ppv, E_POINTER);

-    *ppv = NULL;

+		return false;

+	}

 

-    return 

-		QI(IPersist)

-		QI(ISubStream)

-		QI(ISubPicProvider)

-		__super::NonDelegatingQueryInterface(riid, ppv);

-}

+	void CRenderer::Append(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, LPCWSTR str)

+	{

+		if(!m_file) return;

 

-// ISubPicProvider

+		try

+		{

+			m_file->Append(ssf::WCharInputStream(str), (float)rtStart / 10000000, (float)rtStop / 10000000);

+		}

+		catch(Exception& e)

+		{

+			TRACE(_T("%s\n"), e.ToString());

+		}

+	}

 

-STDMETHODIMP_(POSITION) CRenderedSSF::GetStartPosition(REFERENCE_TIME rt, double fps)

-{

-	size_t k;

-	return m_psf && m_psf->m_segments.Lookup((double)rt/10000000, k) ? (POSITION)(++k) : NULL;

-}

+	STDMETHODIMP CRenderer::NonDelegatingQueryInterface(REFIID riid, void** ppv)

+	{

+		CheckPointer(ppv, E_POINTER);

+		*ppv = NULL;

+

+		return 

+			QI(IPersist)

+			QI(ISubStream)

+			QI(ISubPicProvider)

+			__super::NonDelegatingQueryInterface(riid, ppv);

+	}

 

-STDMETHODIMP_(POSITION) CRenderedSSF::GetNext(POSITION pos)

-{

-	size_t k = (size_t)pos;

-	return m_psf && m_psf->m_segments.GetSegment(k) ? (POSITION)(++k) : NULL;

-}

+	// ISubPicProvider

 

-STDMETHODIMP_(REFERENCE_TIME) CRenderedSSF::GetStart(POSITION pos, double fps)

-{

-	size_t k = (size_t)pos-1;

-	const ssf::SubtitleFile::Segment* s = m_psf ? m_psf->m_segments.GetSegment(k) : NULL;

-	return s ? (REFERENCE_TIME)(s->m_start*10000000) : 0;

-}

+	STDMETHODIMP_(POSITION) CRenderer::GetStartPosition(REFERENCE_TIME rt, double fps)

+	{

+		size_t k;

+		return m_file && m_file->m_segments.Lookup((float)rt/10000000, k) ? (POSITION)(++k) : NULL;

+	}

 

-STDMETHODIMP_(REFERENCE_TIME) CRenderedSSF::GetStop(POSITION pos, double fps)

-{

-	CheckPointer(m_psf, 0);

+	STDMETHODIMP_(POSITION) CRenderer::GetNext(POSITION pos)

+	{

+		size_t k = (size_t)pos;

+		return m_file && m_file->m_segments.GetSegment(k) ? (POSITION)(++k) : NULL;

+	}

+

+	STDMETHODIMP_(REFERENCE_TIME) CRenderer::GetStart(POSITION pos, double fps)

+	{

+		size_t k = (size_t)pos-1;

+		const SubtitleFile::Segment* s = m_file ? m_file->m_segments.GetSegment(k) : NULL;

+		return s ? (REFERENCE_TIME)(s->m_start*10000000) : 0;

+	}

 

-	size_t k = (size_t)pos-1;

-	const ssf::SubtitleFile::Segment* s = m_psf ? m_psf->m_segments.GetSegment(k) : NULL;

-	return s ? (REFERENCE_TIME)(s->m_stop*10000000) : 0;

-}

+	STDMETHODIMP_(REFERENCE_TIME) CRenderer::GetStop(POSITION pos, double fps)

+	{

+		CheckPointer(m_file, 0);

 

-STDMETHODIMP_(bool) CRenderedSSF::IsAnimated(POSITION pos)

-{

-	return true;

-}

+		size_t k = (size_t)pos-1;

+		const SubtitleFile::Segment* s = m_file ? m_file->m_segments.GetSegment(k) : NULL;

+		return s ? (REFERENCE_TIME)(s->m_stop*10000000) : 0;

+	}

 

-STDMETHODIMP CRenderedSSF::Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox)

-{

-	CheckPointer(m_psf, E_UNEXPECTED);

+	STDMETHODIMP_(bool) CRenderer::IsAnimated(POSITION pos)

+	{

+		return true;

+	}

 

-	CAutoLock csAutoLock(m_pLock);

+	STDMETHODIMP CRenderer::Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox)

+	{

+		CheckPointer(m_file, E_UNEXPECTED);

+		CheckPointer(m_renderer, E_UNEXPECTED);	

 

-	double at = (double)rt/10000000;

+		if(spd.type != MSP_RGB32) return E_INVALIDARG;

 

-	CAutoPtrList<ssf::Subtitle> subs;

-	m_psf->Lookup(at, subs);

+		CAutoLock csAutoLock(m_pLock);

 

-	POSITION pos = subs.GetHeadPosition();

-	while(pos)

-	{

-		ssf::Subtitle* s = subs.GetNext(pos);

+		CRect bbox2;

+		bbox2.SetRectEmpty();

 

-		// TODO: render s...

+		CAutoPtrList<Subtitle> subs;

+		m_file->Lookup((float)rt/10000000, subs);

 

-		TRACE(_T("start: %.3f, stop: %.3f\n"), s->m_time.start, s->m_time.stop);

+		m_renderer->NextSegment(subs);

 

-		POSITION pos = s->m_text.GetHeadPosition();

+		POSITION pos = subs.GetHeadPosition();

 		while(pos)

 		{

-			ssf::Text& t = s->m_text.GetNext(pos);

-/*

-

-			ssf::Placement& p = t.style.placement;

-			TRACE(_T("%.1f: %d [%.0f-%.0f-%.0f-%.0f, %f, %.0f-%.0f-%.0f-%.0f] '%s'\n"), 

-				at, 

-				t.style.fill.id,

-				t.style.font.color[0], t.style.font.color[1], t.style.font.color[2], t.style.font.color[3],

-				t.style.fill.width, 

-				t.style.fill.color[0], t.style.fill.color[1], t.style.fill.color[2], t.style.fill.color[3],

-				t.str);

-*/

+			const Subtitle* s = subs.GetNext(pos);

+			const RenderedSubtitle* rs = m_renderer->Lookup(s, CSize(spd.w, spd.h), spd.vidrect);

+			if(rs) bbox2 |= rs->Draw(spd);

 		}

 

-		TRACE(_T("------------\n"));

+		bbox = bbox2 & CRect(0, 0, spd.w, spd.h);

+

+		return S_OK;

 	}

 

-	return E_NOTIMPL;

-}

+	// IPersist

 

-// IPersist

+	STDMETHODIMP CRenderer::GetClassID(CLSID* pClassID)

+	{

+		return pClassID ? *pClassID = __uuidof(this), S_OK : E_POINTER;

+	}

 

-STDMETHODIMP CRenderedSSF::GetClassID(CLSID* pClassID)

-{

-	return pClassID ? *pClassID = __uuidof(this), S_OK : E_POINTER;

-}

+	// ISubStream

 

-// ISubStream

+	STDMETHODIMP_(int) CRenderer::GetStreamCount()

+	{

+		return 1;

+	}

 

-STDMETHODIMP_(int) CRenderedSSF::GetStreamCount()

-{

-	return 1;

-}

+	STDMETHODIMP CRenderer::GetStreamInfo(int iStream, WCHAR** ppName, LCID* pLCID)

+	{

+		if(iStream != 0) return E_INVALIDARG;

 

-STDMETHODIMP CRenderedSSF::GetStreamInfo(int iStream, WCHAR** ppName, LCID* pLCID)

-{

-	if(iStream != 0) return E_INVALIDARG;

+		if(ppName)

+		{

+			if(!(*ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR))))

+				return E_OUTOFMEMORY;

 

-	if(ppName)

-	{

-		if(!(*ppName = (WCHAR*)CoTaskMemAlloc((m_name.GetLength()+1)*sizeof(WCHAR))))

-			return E_OUTOFMEMORY;

+			wcscpy(*ppName, CStringW(m_name));

+		}

+

+		if(pLCID)

+		{

+			*pLCID = 0; // TODO

+		}

 

-		wcscpy(*ppName, CStringW(m_name));

+		return S_OK;

 	}

 

-	if(pLCID)

+	STDMETHODIMP_(int) CRenderer::GetStream()

 	{

-		*pLCID = 0; // TODO

+		return 0;

 	}

 

-	return S_OK;

-}

-

-STDMETHODIMP_(int) CRenderedSSF::GetStream()

-{

-	return 0;

-}

-

-STDMETHODIMP CRenderedSSF::SetStream(int iStream)

-{

-	return iStream == 0 ? S_OK : E_FAIL;

-}

+	STDMETHODIMP CRenderer::SetStream(int iStream)

+	{

+		return iStream == 0 ? S_OK : E_FAIL;

+	}

 

-STDMETHODIMP CRenderedSSF::Reload()

-{

-	CAutoLock csAutoLock(m_pLock);

+	STDMETHODIMP CRenderer::Reload()

+	{

+		CAutoLock csAutoLock(m_pLock);

 

-	return !m_fn.IsEmpty() && Open(m_fn, m_name) ? S_OK : E_FAIL;

-}

+		return !m_fn.IsEmpty() && Open(m_fn, m_name) ? S_OK : E_FAIL;

+	}

+}
\ No newline at end of file
diff --git a/src/subtitles/SSF.h b/src/subtitles/SSF.h
index 4dc5f9b1f..a047ffa55 100644
--- a/src/subtitles/SSF.h
+++ b/src/subtitles/SSF.h
@@ -21,43 +21,50 @@
 

 #pragma once

 

-//#include "Rasterizer.h"

 #include "..\SubPic\ISubPic.h"

 #include ".\libssf\SubtitleFile.h"

+#include ".\libssf\Renderer.h"

 

 #pragma once

 

-[uuid("E0593632-0AB7-47CA-8BE1-E9D2A6A4825E")]

-class CRenderedSSF : public ISubPicProviderImpl, public ISubStream

+namespace ssf

 {

-	CString m_fn, m_name;

-	CAutoPtr<ssf::SubtitleFile> m_psf;

-

-public:

-	CRenderedSSF(CCritSec* pLock);

-	virtual ~CRenderedSSF();

-

-	bool Open(CString fn, CString name = _T(""));

-	bool Open(ssf::Stream& s, CString name);

-

-	DECLARE_IUNKNOWN

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

-

-	// ISubPicProvider

-	STDMETHODIMP_(POSITION) GetStartPosition(REFERENCE_TIME rt, double fps);

-	STDMETHODIMP_(POSITION) GetNext(POSITION pos);

-	STDMETHODIMP_(REFERENCE_TIME) GetStart(POSITION pos, double fps);

-	STDMETHODIMP_(REFERENCE_TIME) GetStop(POSITION pos, double fps);

-	STDMETHODIMP_(bool) IsAnimated(POSITION pos);

-	STDMETHODIMP Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox);

-

-	// IPersist

-	STDMETHODIMP GetClassID(CLSID* pClassID);

-

-	// ISubStream

-	STDMETHODIMP_(int) GetStreamCount();

-	STDMETHODIMP GetStreamInfo(int i, WCHAR** ppName, LCID* pLCID);

-	STDMETHODIMP_(int) GetStream();

-	STDMETHODIMP SetStream(int iStream);

-	STDMETHODIMP Reload();

-};

+	[uuid("E0593632-0AB7-47CA-8BE1-E9D2A6A4825E")]

+	class CRenderer : public ISubPicProviderImpl, public ISubStream

+	{

+		CString m_fn, m_name;

+		CAutoPtr<SubtitleFile> m_file;

+		CAutoPtr<Renderer> m_renderer;

+

+	public:

+		CRenderer(CCritSec* pLock);

+		virtual ~CRenderer();

+

+		bool Open(CString fn, CString name = _T(""));

+		bool Open(InputStream& s, CString name);

+

+		void Append(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, LPCWSTR str);

+

+		DECLARE_IUNKNOWN

+		STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+

+		// ISubPicProvider

+		STDMETHODIMP_(POSITION) GetStartPosition(REFERENCE_TIME rt, double fps);

+		STDMETHODIMP_(POSITION) GetNext(POSITION pos);

+		STDMETHODIMP_(REFERENCE_TIME) GetStart(POSITION pos, double fps);

+		STDMETHODIMP_(REFERENCE_TIME) GetStop(POSITION pos, double fps);

+		STDMETHODIMP_(bool) IsAnimated(POSITION pos);

+		STDMETHODIMP Render(SubPicDesc& spd, REFERENCE_TIME rt, double fps, RECT& bbox);

+

+		// IPersist

+		STDMETHODIMP GetClassID(CLSID* pClassID);

+

+		// ISubStream

+		STDMETHODIMP_(int) GetStreamCount();

+		STDMETHODIMP GetStreamInfo(int i, WCHAR** ppName, LCID* pLCID);

+		STDMETHODIMP_(int) GetStream();

+		STDMETHODIMP SetStream(int iStream);

+		STDMETHODIMP Reload();

+	};

+

+}
\ No newline at end of file
diff --git a/src/subtitles/STS.cpp b/src/subtitles/STS.cpp
index 54fad6e58..c2e4cf2ed 100644
--- a/src/subtitles/STS.cpp
+++ b/src/subtitles/STS.cpp
@@ -447,9 +447,6 @@ static CStringW MBCSSSAToUnicode(CStringW str, int CharSet)
 

 CStringW RemoveSSATags(CStringW str, bool fUnicode, int CharSet)

 {

-	str.Replace (L"{\\i1}", L"<i>");	// Casimir666 : tag <i> supported in SRT files!

-	str.Replace (L"{\\i}", L"</i>");

-

 	for(int i = 0, j; i < str.GetLength(); )

 	{

 		if((i = FindChar(str, '{', i, fUnicode, CharSet)) < 0) break;

@@ -1720,20 +1717,20 @@ static bool OpenMPL2(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet)
 

 typedef bool (*STSOpenFunct)(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet);

 

-typedef struct {STSOpenFunct open; tmode mode; exttype type; } OpenFunctStruct;

+typedef struct {STSOpenFunct open; tmode mode;} OpenFunctStruct;

 

 static OpenFunctStruct OpenFuncts[] = 

 {

-	OpenSubRipper, TIME, EXTSRT,

-	OpenOldSubRipper, TIME, EXTSRT,

-	OpenSubViewer, TIME, EXTSUB,

-	OpenMicroDVD, FRAME, EXTSSA,

-	OpenSami, TIME, EXTSMI,

-	OpenVPlayer, TIME, EXTSRT,

-	OpenSubStationAlpha, TIME, EXTSSA,

-	OpenXombieSub, TIME, EXTXSS,

-	OpenUSF, TIME, EXTUSF,

-	OpenMPL2, TIME, EXTSRT,

+	OpenSubRipper, TIME,

+	OpenOldSubRipper, TIME,

+	OpenSubViewer, TIME,

+	OpenMicroDVD, FRAME,

+	OpenSami, TIME,

+	OpenVPlayer, TIME,

+	OpenSubStationAlpha, TIME,

+	OpenXombieSub, TIME,

+	OpenUSF, TIME,

+	OpenMPL2, TIME,

 };

 

 static int nOpenFuncts = countof(OpenFuncts);

@@ -1786,8 +1783,6 @@ void CSimpleTextSubtitle::Copy(CSimpleTextSubtitle& sts)
 

 	m_name = sts.m_name;

 	m_mode = sts.m_mode;

-	m_path = sts.m_path;

-	m_exttype = sts.m_exttype;

 	m_dstScreenSize = sts.m_dstScreenSize;

 	m_defaultWrapStyle = sts.m_defaultWrapStyle;

 	m_collisions = sts.m_collisions;

@@ -2572,7 +2567,6 @@ bool CSimpleTextSubtitle::Open(CTextFile* f, int CharSet, CString name)
 		}

 

 		m_name = name;

-		m_exttype = OpenFuncts[i].type;

 		m_mode = OpenFuncts[i].mode;

 		m_encoding = f->GetEncoding();

 		m_path = f->GetFilePath();

@@ -2963,11 +2957,7 @@ void STSStyle::operator = (LOGFONT& lf)
 LOGFONTA& operator <<= (LOGFONTA& lfa, STSStyle& s)

 {

 	lfa.lfCharSet = s.charSet;

-#ifdef UNICODE

-	wcstombs(lfa.lfFaceName, s.fontName, 32);

-#else

-	strncpy(lfa.lfFaceName, s.fontName, 32);

-#endif

+	strcpy_s(lfa.lfFaceName, CStringA(s.fontName));

 	HDC hDC = GetDC(0);

 	lfa.lfHeight = -MulDiv((int)(s.fontSize+0.5), GetDeviceCaps(hDC, LOGPIXELSY), 72);

 	ReleaseDC(0, hDC);

@@ -2975,18 +2965,13 @@ LOGFONTA& operator <<= (LOGFONTA& lfa, STSStyle& s)
 	lfa.lfItalic = s.fItalic?-1:0;

 	lfa.lfUnderline = s.fUnderline?-1:0;

 	lfa.lfStrikeOut = s.fStrikeOut?-1:0;

-

 	return(lfa);

 }

 

 LOGFONTW& operator <<= (LOGFONTW& lfw, STSStyle& s)

 {

 	lfw.lfCharSet = s.charSet;

-#ifdef UNICODE

-	wcsncpy(lfw.lfFaceName, s.fontName, 32);

-#else

-	mbstowcs(lfw.lfFaceName, s.fontName, 32);

-#endif

+	wcscpy_s(lfw.lfFaceName, CStringW(s.fontName));

 	HDC hDC = GetDC(0);

 	lfw.lfHeight = -MulDiv((int)(s.fontSize+0.5), GetDeviceCaps(hDC, LOGPIXELSY), 72);

 	ReleaseDC(0, hDC);

@@ -2994,7 +2979,6 @@ LOGFONTW& operator <<= (LOGFONTW& lfw, STSStyle& s)
 	lfw.lfItalic = s.fItalic?-1:0;

 	lfw.lfUnderline = s.fUnderline?-1:0;

 	lfw.lfStrikeOut = s.fStrikeOut?-1:0;

-

 	return(lfw);

 }

 

diff --git a/src/subtitles/STS.h b/src/subtitles/STS.h
index f5b45766f..ad0bad29f 100644
--- a/src/subtitles/STS.h
+++ b/src/subtitles/STS.h
@@ -108,7 +108,6 @@ protected:
 

 public:

 	CString m_name;

-	exttype m_exttype;

 	tmode m_mode;

 	CTextFile::enc m_encoding;

 	CString m_path;

diff --git a/src/subtitles/SubtitleInputPin.cpp b/src/subtitles/SubtitleInputPin.cpp
index af7fd2ad6..4f44b293c 100644
--- a/src/subtitles/SubtitleInputPin.cpp
+++ b/src/subtitles/SubtitleInputPin.cpp
@@ -23,6 +23,7 @@
 #include "SubtitleInputPin.h"

 #include "VobSubFile.h"

 #include "RTS.h"

+#include "SSF.h"

 

 #include <initguid.h>

 #include "..\..\include\moreuuids.h"

@@ -59,6 +60,7 @@ HRESULT CSubtitleInputPin::CheckMediaType(const CMediaType* pmt)
 	return pmt->majortype == MEDIATYPE_Text && (pmt->subtype == MEDIASUBTYPE_NULL || pmt->subtype == FOURCCMap((DWORD)0))

 		|| pmt->majortype == MEDIATYPE_Subtitle && pmt->subtype == MEDIASUBTYPE_UTF8

 		|| pmt->majortype == MEDIATYPE_Subtitle && (pmt->subtype == MEDIASUBTYPE_SSA || pmt->subtype == MEDIASUBTYPE_ASS || pmt->subtype == MEDIASUBTYPE_ASS2)

+		|| pmt->majortype == MEDIATYPE_Subtitle && pmt->subtype == MEDIASUBTYPE_SSF

 		|| pmt->majortype == MEDIATYPE_Subtitle && (pmt->subtype == MEDIASUBTYPE_VOBSUB)

 		? S_OK 

 		: E_FAIL;

@@ -112,6 +114,12 @@ HRESULT CSubtitleInputPin::CompleteConnect(IPin* pReceivePin)
 			}

 

 		}

+		else if(m_mt.subtype == MEDIASUBTYPE_SSF)

+		{

+			if(!(m_pSubStream = new ssf::CRenderer(m_pSubLock))) return E_FAIL;

+			ssf::CRenderer* pSSF = (ssf::CRenderer*)(ISubStream*)m_pSubStream;

+			pSSF->Open(ssf::MemoryInputStream(m_mt.pbFormat + dwOffset, m_mt.cbFormat - dwOffset, false, false), name);

+		}

 		else if(m_mt.subtype == MEDIASUBTYPE_VOBSUB)

 		{

 			if(!(m_pSubStream = new CVobSubStream(m_pSubLock))) return E_FAIL;

@@ -166,8 +174,16 @@ STDMETHODIMP CSubtitleInputPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME
 		pRTS->RemoveAll();

 		pRTS->CreateSegments();

 	}

-	else if(m_mt.majortype == MEDIATYPE_Subtitle 

-	&& (m_mt.subtype == MEDIASUBTYPE_VOBSUB))

+	else if(m_mt.majortype == MEDIATYPE_Subtitle && m_mt.subtype == MEDIASUBTYPE_SSF)

+	{

+		CAutoLock cAutoLock(m_pSubLock);

+		ssf::CRenderer* pSSF = (ssf::CRenderer*)(ISubStream*)m_pSubStream;

+		// LAME, implement RemoveSubtitles

+		DWORD dwOffset = ((SUBTITLEINFO*)m_mt.pbFormat)->dwOffset;

+		pSSF->Open(ssf::MemoryInputStream(m_mt.pbFormat + dwOffset, m_mt.cbFormat - dwOffset, false, false), _T(""));

+		// pSSF->RemoveSubtitles();

+	}

+	else if(m_mt.majortype == MEDIATYPE_Subtitle && (m_mt.subtype == MEDIASUBTYPE_VOBSUB))

 	{

 		CAutoLock cAutoLock(m_pSubLock);

 		CVobSubStream* pVSS = (CVobSubStream*)(ISubStream*)m_pSubStream;

@@ -323,6 +339,17 @@ STDMETHODIMP CSubtitleInputPin::Receive(IMediaSample* pSample)
 				}

 			}

 		}

+		else if(m_mt.subtype == MEDIASUBTYPE_SSF)

+		{

+			ssf::CRenderer* pSSF = (ssf::CRenderer*)(ISubStream*)m_pSubStream;

+

+			CStringW str = UTF8To16(CStringA((LPCSTR)pData, len)).Trim();

+			if(!str.IsEmpty())

+			{

+				pSSF->Append(tStart, tStop, str);

+				fInvalidate = true;

+			}

+		}

 		else if(m_mt.subtype == MEDIASUBTYPE_VOBSUB)

 		{

 			CVobSubStream* pVSS = (CVobSubStream*)(ISubStream*)m_pSubStream;

diff --git a/src/subtitles/TextFile.cpp b/src/subtitles/TextFile.cpp
index 9811e79be..c07a4f3a3 100644
--- a/src/subtitles/TextFile.cpp
+++ b/src/subtitles/TextFile.cpp
@@ -101,17 +101,22 @@ bool CTextFile::Save(LPCTSTR lpszFileName, enc e)
 

 	m_encoding = e;

 

-	return(true);

+	return true;

+}

+

+void CTextFile::SetEncoding(enc e)

+{

+	m_encoding = e;

 }

 

 CTextFile::enc CTextFile::GetEncoding()

 {

-	return(m_encoding);

+	return m_encoding;

 }

 

 bool CTextFile::IsUnicode()

 {

-	return(m_encoding == UTF8 || m_encoding == LE16 || m_encoding == BE16);

+	return m_encoding == UTF8 || m_encoding == LE16 || m_encoding == BE16;

 }

 

 // CFile

@@ -192,7 +197,7 @@ void CTextFile::WriteString(LPCWSTR lpsz/*CStringW str*/)
 	else if(m_encoding == ANSI)

 	{

 		str.Replace(L"\n", L"\r\n");

-		CStringA stra = CStringA(CString(str));

+		CStringA stra = CStringA(CString(str)); // TODO: codepage

 		Write((LPCSTR)stra, stra.GetLength());

 	}

 	else if(m_encoding == UTF8)

@@ -341,7 +346,7 @@ BOOL CTextFile::ReadString(CStringW& str)
 			if(c == '\n') break;

 			stra += c;

 		}

-		str = CStringW(CString(stra));

+		str = CStringW(CString(stra)); // TODO: codepage

 	}

 	else if(m_encoding == UTF8)

 	{

diff --git a/src/subtitles/TextFile.h b/src/subtitles/TextFile.h
index 82ecc5238..88adc239b 100644
--- a/src/subtitles/TextFile.h
+++ b/src/subtitles/TextFile.h
@@ -38,6 +38,7 @@ public:
 	virtual bool Open(LPCTSTR lpszFileName);

 	virtual bool Save(LPCTSTR lpszFileName, enc e /*= ASCII*/);

 

+	void SetEncoding(enc e);

 	enc GetEncoding();

 	bool IsUnicode();

 

diff --git a/src/subtitles/VobSubFile.cpp b/src/subtitles/VobSubFile.cpp
index 14bfddf85..02ccd5c4c 100644
--- a/src/subtitles/VobSubFile.cpp
+++ b/src/subtitles/VobSubFile.cpp
@@ -27,152 +27,152 @@
 

 //

 

-struct lang_type {unsigned short id; TCHAR lang_long[64];} lang_tbl[] =

-{

-	{'--', _T("(Not detected)")},

-	{'cc', _T("Closed Caption")},

-	{'aa', _T("Afar")},

-	{'ab', _T("Abkhazian")},

-	{'af', _T("Afrikaans")},

-	{'am', _T("Amharic")},

-	{'ar', _T("Arabic")},

-	{'as', _T("Assamese")},

-	{'ay', _T("Aymara")},

-	{'az', _T("Azerbaijani")},

-	{'ba', _T("Bashkir")},

-	{'be', _T("Byelorussian")},

-	{'bg', _T("Bulgarian")},

-	{'bh', _T("Bihari")},

-	{'bi', _T("Bislama")},

-	{'bn', _T("Bengali; Bangla")},

-	{'bo', _T("Tibetan")},

-	{'br', _T("Breton")},

-	{'ca', _T("Catalan")},

-	{'co', _T("Corsican")},

-	{'cs', _T("Czech")},

-	{'cy', _T("Welsh")},

-	{'da', _T("Dansk")},

-	{'de', _T("Deutsch")},

-	{'dz', _T("Bhutani")},

-	{'el', _T("Greek")},

-	{'en', _T("English")},

-	{'eo', _T("Esperanto")},

-	{'es', _T("Espanol")},

-	{'et', _T("Estonian")},

-	{'eu', _T("Basque")},

-	{'fa', _T("Persian")},

-	{'fi', _T("Finnish")},

-	{'fj', _T("Fiji")},

-	{'fo', _T("Faroese")},

-	{'fr', _T("Francais")},

-	{'fy', _T("Frisian")},

-	{'ga', _T("Irish")},

-	{'gd', _T("Scots Gaelic")},

-	{'gl', _T("Galician")},

-	{'gn', _T("Guarani")},

-	{'gu', _T("Gujarati")},

-	{'ha', _T("Hausa")},

-	{'he', _T("Hebrew")},

-	{'hi', _T("Hindi")},

-	{'hr', _T("Hrvatski")},

-	{'hu', _T("Hungarian")},

-	{'hy', _T("Armenian")},

-	{'ia', _T("Interlingua")},

-	{'id', _T("Indonesian")},

-	{'ie', _T("Interlingue")},

-	{'ik', _T("Inupiak")},

-	{'in', _T("Indonesian")},

-	{'is', _T("Islenska")},

-	{'it', _T("Italiano")},

-	{'iu', _T("Inuktitut")},

-	{'iw', _T("Hebrew")},

-	{'ja', _T("Japanese")},

-	{'ji', _T("Yiddish")},

-	{'jw', _T("Javanese")},

-	{'ka', _T("Georgian")},

-	{'kk', _T("Kazakh")},

-	{'kl', _T("Greenlandic")},

-	{'km', _T("Cambodian")},

-	{'kn', _T("Kannada")},

-	{'ko', _T("Korean")},

-	{'ks', _T("Kashmiri")},

-	{'ku', _T("Kurdish")},

-	{'ky', _T("Kirghiz")},

-	{'la', _T("Latin")},

-	{'ln', _T("Lingala")},

-	{'lo', _T("Laothian")},

-	{'lt', _T("Lithuanian")},

-	{'lv', _T("Latvian, Lettish")},

-	{'mg', _T("Malagasy")},

-	{'mi', _T("Maori")},

-	{'mk', _T("Macedonian")},

-	{'ml', _T("Malayalam")},

-	{'mn', _T("Mongolian")},

-	{'mo', _T("Moldavian")},

-	{'mr', _T("Marathi")},

-	{'ms', _T("Malay")},

-	{'mt', _T("Maltese")},

-	{'my', _T("Burmese")},

-	{'na', _T("Nauru")},

-	{'ne', _T("Nepali")},

-	{'nl', _T("Nederlands")},

-	{'no', _T("Norsk")},

-	{'oc', _T("Occitan")},

-	{'om', _T("(Afan) Oromo")},

-	{'or', _T("Oriya")},

-	{'pa', _T("Punjabi")},

-	{'pl', _T("Polish")},

-	{'ps', _T("Pashto, Pushto")},

-	{'pt', _T("Portugues")},

-	{'qu', _T("Quechua")},

-	{'rm', _T("Rhaeto-Romance")},

-	{'rn', _T("Kirundi")},

-	{'ro', _T("Romanian")},

-	{'ru', _T("Russian")},

-	{'rw', _T("Kinyarwanda")},

-	{'sa', _T("Sanskrit")},

-	{'sd', _T("Sindhi")},

-	{'sg', _T("Sangho")},

-	{'sh', _T("Serbo-Croatian")},

-	{'si', _T("Sinhalese")},

-	{'sk', _T("Slovak")},

-	{'sl', _T("Slovenian")},

-	{'sm', _T("Samoan")},

-	{'sn', _T("Shona")},

-	{'so', _T("Somali")},

-	{'sq', _T("Albanian")},

-	{'sr', _T("Serbian")},

-	{'ss', _T("Siswati")},

-	{'st', _T("Sesotho")},

-	{'su', _T("Sundanese")},

-	{'sv', _T("Svenska")},

-	{'sw', _T("Swahili")},

-	{'ta', _T("Tamil")},

-	{'te', _T("Telugu")},

-	{'tg', _T("Tajik")},

-	{'th', _T("Thai")},

-	{'ti', _T("Tigrinya")},

-	{'tk', _T("Turkmen")},

-	{'tl', _T("Tagalog")},

-	{'tn', _T("Setswana")},

-	{'to', _T("Tonga")},

-	{'tr', _T("Turkish")},

-	{'ts', _T("Tsonga")},

-	{'tt', _T("Tatar")},

-	{'tw', _T("Twi")},

-	{'ug', _T("Uighur")},

-	{'uk', _T("Ukrainian")},

-	{'ur', _T("Urdu")},

-	{'uz', _T("Uzbek")},

-	{'vi', _T("Vietnamese")},

-	{'vo', _T("Volapuk")},

-	{'wo', _T("Wolof")},

-	{'xh', _T("Xhosa")},

-	{'yi', _T("Yiddish")},				// formerly ji

-	{'yo', _T("Yoruba")},

-	{'za', _T("Zhuang")},

-	{'zh', _T("Chinese")},

-	{'zu', _T("Zulu")},

+struct lang_type {unsigned short id; LPCSTR lang_long;} lang_tbl[] =

+{

+	{'--', "(Not detected)"},

+	{'cc', "Closed Caption"},

+	{'aa', "Afar"},

+	{'ab', "Abkhazian"},

+	{'af', "Afrikaans"},

+	{'am', "Amharic"},

+	{'ar', "Arabic"},

+	{'as', "Assamese"},

+	{'ay', "Aymara"},

+	{'az', "Azerbaijani"},

+	{'ba', "Bashkir"},

+	{'be', "Byelorussian"},

+	{'bg', "Bulgarian"},

+	{'bh', "Bihari"},

+	{'bi', "Bislama"},

+	{'bn', "Bengali; Bangla"},

+	{'bo', "Tibetan"},

+	{'br', "Breton"},

+	{'ca', "Catalan"},

+	{'co', "Corsican"},

+	{'cs', "Czech"},

+	{'cy', "Welsh"},

+	{'da', "Dansk"},

+	{'de', "Deutsch"},

+	{'dz', "Bhutani"},

+	{'el', "Greek"},

+	{'en', "English"},

+	{'eo', "Esperanto"},

+	{'es', "Espanol"},

+	{'et', "Estonian"},

+	{'eu', "Basque"},

+	{'fa', "Persian"},

+	{'fi', "Finnish"},

+	{'fj', "Fiji"},

+	{'fo', "Faroese"},

+	{'fr', "Francais"},

+	{'fy', "Frisian"},

+	{'ga', "Irish"},

+	{'gd', "Scots Gaelic"},

+	{'gl', "Galician"},

+	{'gn', "Guarani"},

+	{'gu', "Gujarati"},

+	{'ha', "Hausa"},

+	{'he', "Hebrew"},

+	{'hi', "Hindi"},

+	{'hr', "Hrvatski"},

+	{'hu', "Hungarian"},

+	{'hy', "Armenian"},

+	{'ia', "Interlingua"},

+	{'id', "Indonesian"},

+	{'ie', "Interlingue"},

+	{'ik', "Inupiak"},

+	{'in', "Indonesian"},

+	{'is', "Islenska"},

+	{'it', "Italiano"},

+	{'iu', "Inuktitut"},

+	{'iw', "Hebrew"},

+	{'ja', "Japanese"},

+	{'ji', "Yiddish"},

+	{'jw', "Javanese"},

+	{'ka', "Georgian"},

+	{'kk', "Kazakh"},

+	{'kl', "Greenlandic"},

+	{'km', "Cambodian"},

+	{'kn', "Kannada"},

+	{'ko', "Korean"},

+	{'ks', "Kashmiri"},

+	{'ku', "Kurdish"},

+	{'ky', "Kirghiz"},

+	{'la', "Latin"},

+	{'ln', "Lingala"},

+	{'lo', "Laothian"},

+	{'lt', "Lithuanian"},

+	{'lv', "Latvian, Lettish"},

+	{'mg', "Malagasy"},

+	{'mi', "Maori"},

+	{'mk', "Macedonian"},

+	{'ml', "Malayalam"},

+	{'mn', "Mongolian"},

+	{'mo', "Moldavian"},

+	{'mr', "Marathi"},

+	{'ms', "Malay"},

+	{'mt', "Maltese"},

+	{'my', "Burmese"},

+	{'na', "Nauru"},

+	{'ne', "Nepali"},

+	{'nl', "Nederlands"},

+	{'no', "Norsk"},

+	{'oc', "Occitan"},

+	{'om', "(Afan) Oromo"},

+	{'or', "Oriya"},

+	{'pa', "Punjabi"},

+	{'pl', "Polish"},

+	{'ps', "Pashto, Pushto"},

+	{'pt', "Portugues"},

+	{'qu', "Quechua"},

+	{'rm', "Rhaeto-Romance"},

+	{'rn', "Kirundi"},

+	{'ro', "Romanian"},

+	{'ru', "Russian"},

+	{'rw', "Kinyarwanda"},

+	{'sa', "Sanskrit"},

+	{'sd', "Sindhi"},

+	{'sg', "Sangho"},

+	{'sh', "Serbo-Croatian"},

+	{'si', "Sinhalese"},

+	{'sk', "Slovak"},

+	{'sl', "Slovenian"},

+	{'sm', "Samoan"},

+	{'sn', "Shona"},

+	{'so', "Somali"},

+	{'sq', "Albanian"},

+	{'sr', "Serbian"},

+	{'ss', "Siswati"},

+	{'st', "Sesotho"},

+	{'su', "Sundanese"},

+	{'sv', "Svenska"},

+	{'sw', "Swahili"},

+	{'ta', "Tamil"},

+	{'te', "Telugu"},

+	{'tg', "Tajik"},

+	{'th', "Thai"},

+	{'ti', "Tigrinya"},

+	{'tk', "Turkmen"},

+	{'tl', "Tagalog"},

+	{'tn', "Setswana"},

+	{'to', "Tonga"},

+	{'tr', "Turkish"},

+	{'ts', "Tsonga"},

+	{'tt', "Tatar"},

+	{'tw', "Twi"},

+	{'ug', "Uighur"},

+	{'uk', "Ukrainian"},

+	{'ur', "Urdu"},

+	{'uz', "Uzbek"},

+	{'vi', "Vietnamese"},

+	{'vo', "Volapuk"},

+	{'wo', "Wolof"},

+	{'xh', "Xhosa"},

+	{'yi', "Yiddish"},				// formerly ji

+	{'yo', "Yoruba"},

+	{'za', "Zhuang"},

+	{'zh', "Chinese"},

+	{'zu', "Zulu"},

 };

 

 int find_lang(unsigned short id)

@@ -192,7 +192,7 @@ int find_lang(unsigned short id)
 

 CString FindLangFromId(WORD id)

 {

-	return(lang_tbl[find_lang(id)].lang_long);

+	return CString(lang_tbl[find_lang(id)].lang_long);

 }

 

 //

diff --git a/src/subtitles/stdafx.h b/src/subtitles/stdafx.h
index 0d7d3f6fe..259f5ac11 100644
--- a/src/subtitles/stdafx.h
+++ b/src/subtitles/stdafx.h
@@ -39,5 +39,5 @@
 // TODO: reference additional headers your program requires here

 

 #include <streams.h>

-#import "msxml.dll"

+#import "msxml3.dll"

 #include "..\DSUtil\DSUtil.h"

diff --git a/src/subtitles/subtitles.vcproj b/src/subtitles/subtitles.vcproj
index e0774e2a9..f3f6eb0b3 100644
--- a/src/subtitles/subtitles.vcproj
+++ b/src/subtitles/subtitles.vcproj
@@ -1,208 +1,298 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="subtitles"

 	ProjectGUID="{5E56335F-0FB1-4EEA-B240-D8DC5E0608E4}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				TreatWChar_tAsBuiltInType="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				TreatWChar_tAsBuiltInType="false"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/subtitlesD.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/subtitlesD.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

-				OmitFramePointers="TRUE"

-				OptimizeForProcessor="2"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				TreatWChar_tAsBuiltInType="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="false"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/subtitlesR.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/subtitlesR.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				TreatWChar_tAsBuiltInType="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				TreatWChar_tAsBuiltInType="false"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/subtitlesDU.lib"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/subtitlesDU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

-				OmitFramePointers="TRUE"

-				OptimizeForProcessor="2"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				TreatWChar_tAsBuiltInType="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				TreatWChar_tAsBuiltInType="false"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../lib/subtitlesRU.lib"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../lib/subtitlesRU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -210,199 +300,261 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="CCDecoder.cpp">

+				RelativePath="CCDecoder.cpp"

+				>

 			</File>

 			<File

-				RelativePath="GFN.cpp">

+				RelativePath="GFN.cpp"

+				>

 			</File>

 			<File

-				RelativePath="Rasterizer.cpp">

+				RelativePath="Rasterizer.cpp"

+				>

 			</File>

 			<File

-				RelativePath="RTS.cpp">

+				RelativePath="RTS.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"

-						UsePrecompiledHeader="0"/>

+						RuntimeTypeInfo="true"

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"

-						UsePrecompiledHeader="0"/>

+						RuntimeTypeInfo="true"

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"

-						UsePrecompiledHeader="0"/>

+						RuntimeTypeInfo="true"

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"

-						UsePrecompiledHeader="0"/>

+						RuntimeTypeInfo="true"

+						UsePrecompiledHeader="0"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SSF.cpp">

+				RelativePath=".\SSF.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="STS.cpp">

+				RelativePath="STS.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"/>

+						RuntimeTypeInfo="true"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"/>

+						RuntimeTypeInfo="true"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"/>

+						RuntimeTypeInfo="true"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						RuntimeTypeInfo="TRUE"/>

+						RuntimeTypeInfo="true"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath=".\SubtitleInputPin.cpp">

+				RelativePath=".\SubtitleInputPin.cpp"

+				>

 			</File>

 			<File

-				RelativePath="TextFile.cpp">

+				RelativePath="TextFile.cpp"

+				>

 			</File>

 			<File

-				RelativePath="USFSubtitles.cpp">

+				RelativePath="USFSubtitles.cpp"

+				>

 			</File>

 			<File

-				RelativePath="VobSubFile.cpp">

+				RelativePath="VobSubFile.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AssemblerOutput="0"/>

+						AssemblerOutput="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AssemblerOutput="0"/>

+						AssemblerOutput="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

 						AssemblerOutput="0"

-						BrowseInformation="0"/>

+						BrowseInformation="0"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AssemblerOutput="0"/>

+						AssemblerOutput="0"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="VobSubFileRipper.cpp">

+				RelativePath="VobSubFileRipper.cpp"

+				>

 			</File>

 			<File

-				RelativePath="VobSubImage.cpp">

+				RelativePath="VobSubImage.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath="CCDecoder.h">

+				RelativePath="CCDecoder.h"

+				>

 			</File>

 			<File

-				RelativePath="GFN.h">

+				RelativePath="GFN.h"

+				>

 			</File>

 			<File

-				RelativePath="Rasterizer.h">

+				RelativePath="Rasterizer.h"

+				>

 			</File>

 			<File

-				RelativePath="RTS.h">

+				RelativePath="RTS.h"

+				>

 			</File>

 			<File

-				RelativePath=".\SSF.h">

+				RelativePath=".\SSF.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 			<File

-				RelativePath="STS.h">

+				RelativePath="STS.h"

+				>

 			</File>

 			<File

-				RelativePath=".\SubtitleInputPin.h">

+				RelativePath=".\SubtitleInputPin.h"

+				>

 			</File>

 			<File

-				RelativePath="TextFile.h">

+				RelativePath="TextFile.h"

+				>

 			</File>

 			<File

-				RelativePath="USFSubtitles.h">

+				RelativePath="USFSubtitles.h"

+				>

 			</File>

 			<File

-				RelativePath="VobSubFile.h">

+				RelativePath="VobSubFile.h"

+				>

 			</File>

 			<File

-				RelativePath="VobSubFileRipper.h">

+				RelativePath="VobSubFileRipper.h"

+				>

 			</File>

 			<File

-				RelativePath="VobSubImage.h">

+				RelativePath="VobSubImage.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="1"/>

+			Value="1"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj
index e5853c680..d21fb693f 100644
--- a/src/ui/CmdUI/CmdUI.vcproj
+++ b/src/ui/CmdUI/CmdUI.vcproj
@@ -1,180 +1,272 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="CmdUI"

 	ProjectGUID="{03208025-D5C2-426A-B0FA-251D4338F30C}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\CmdUID.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\CmdUID.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="0"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\CmdUIR.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\CmdUIR.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\CmdUIDU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\CmdUIDU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="0"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\CmdUIRU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\CmdUIRU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -183,58 +275,74 @@
 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath=".\CmdUI.cpp">

+				RelativePath=".\CmdUI.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.cpp">

+				RelativePath=".\stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 			<File

-				RelativePath=".\CmdUI.h">

+				RelativePath=".\CmdUI.h"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.h">

+				RelativePath=".\stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj
index e09f5697f..cf717e0a5 100644
--- a/src/ui/ResizableLib/ResizableLib.vcproj
+++ b/src/ui/ResizableLib/ResizableLib.vcproj
@@ -1,180 +1,272 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="ResizableLib"

 	ProjectGUID="{4CC7AE86-3E0A-430A-BFF4-BF00204CAFB0}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\ResizableLibD.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\ResizableLibD.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="0"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\ResizableLibR.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\ResizableLibR.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\ResizableLibDU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\ResizableLibDU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="0"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\ResizableLibRU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="..\..\..\lib\ResizableLibRU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -183,103 +275,134 @@
 		<Filter

 			Name="Source Files"

 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

 			<File

-				RelativePath=".\ResizableDialog.cpp">

+				RelativePath=".\ResizableDialog.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableGrip.cpp">

+				RelativePath=".\ResizableGrip.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableLayout.cpp">

+				RelativePath=".\ResizableLayout.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableMinMax.cpp">

+				RelativePath=".\ResizableMinMax.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizablePage.cpp">

+				RelativePath=".\ResizablePage.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableSheet.cpp">

+				RelativePath=".\ResizableSheet.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableState.cpp">

+				RelativePath=".\ResizableState.cpp"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.cpp">

+				RelativePath=".\stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

 			<File

-				RelativePath=".\ResizableDialog.h">

+				RelativePath=".\ResizableDialog.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableGrip.h">

+				RelativePath=".\ResizableGrip.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableLayout.h">

+				RelativePath=".\ResizableLayout.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableMinMax.h">

+				RelativePath=".\ResizableMinMax.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableMsgSupport.h">

+				RelativePath=".\ResizableMsgSupport.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableMsgSupport.inl">

+				RelativePath=".\ResizableMsgSupport.inl"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizablePage.h">

+				RelativePath=".\ResizablePage.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableSheet.h">

+				RelativePath=".\ResizableSheet.h"

+				>

 			</File>

 			<File

-				RelativePath=".\ResizableState.h">

+				RelativePath=".\ResizableState.h"

+				>

 			</File>

 			<File

-				RelativePath=".\stdafx.h">

+				RelativePath=".\stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

 		</Filter>

 		<File

-			RelativePath=".\ReadMe.txt">

+			RelativePath=".\ReadMe.txt"

+			>

 		</File>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index 35a355015..1628c1eca 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -1,195 +1,287 @@
 <?xml version="1.0" encoding="windows-1250"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="TreePropSheet"

 	ProjectGUID="{AB494732-EF6D-44D0-BCF8-80FF04858D10}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/TreePropSheetD.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/TreePropSheetD.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/TreePropSheetR.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/TreePropSheetR.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/TreePropSheetDU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/TreePropSheetDU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				ForceConformanceInForLoopScope="true"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/TreePropSheetRU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/TreePropSheetRU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -197,68 +289,88 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="PropPageFrame.cpp">

+				RelativePath="PropPageFrame.cpp"

+				>

 			</File>

 			<File

-				RelativePath="PropPageFrameDefault.cpp">

+				RelativePath="PropPageFrameDefault.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="TreePropSheet.cpp">

+				RelativePath="TreePropSheet.cpp"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath="PropPageFrame.h">

+				RelativePath="PropPageFrame.h"

+				>

 			</File>

 			<File

-				RelativePath="PropPageFrameDefault.h">

+				RelativePath="PropPageFrameDefault.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 			<File

-				RelativePath="TreePropSheet.h">

+				RelativePath="TreePropSheet.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>

diff --git a/src/ui/sizecbar/scbarg.cpp b/src/ui/sizecbar/scbarg.cpp
index f6eb86485..23a0ef7e2 100644
--- a/src/ui/sizecbar/scbarg.cpp
+++ b/src/ui/sizecbar/scbarg.cpp
@@ -144,7 +144,7 @@ void CSizingControlBarG::NcPaintGripper(CDC* pDC, CRect rcClient)
     m_biHide.Paint(pDC);

 }

 

-UINT CSizingControlBarG::OnNcHitTest(CPoint point)

+LRESULT CSizingControlBarG::OnNcHitTest(CPoint point)

 {

     CRect rcBar;

     GetWindowRect(rcBar);

diff --git a/src/ui/sizecbar/scbarg.h b/src/ui/sizecbar/scbarg.h
index 160850c6a..316633565 100644
--- a/src/ui/sizecbar/scbarg.h
+++ b/src/ui/sizecbar/scbarg.h
@@ -102,7 +102,7 @@ protected:
 // Generated message map functions

 protected:

     //{{AFX_MSG(CSizingControlBarG)

-    afx_msg UINT OnNcHitTest(CPoint point);

+    afx_msg LRESULT OnNcHitTest(CPoint point);

     afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point);

     //}}AFX_MSG

 

diff --git a/src/ui/sizecbar/sizecbar.cpp b/src/ui/sizecbar/sizecbar.cpp
index e5e9c9fe0..5e2f75f48 100644
--- a/src/ui/sizecbar/sizecbar.cpp
+++ b/src/ui/sizecbar/sizecbar.cpp
@@ -571,7 +571,7 @@ void CSizingControlBar::OnPaint()
     CPaintDC dc(this);

 }

 

-UINT CSizingControlBar::OnNcHitTest(CPoint point)

+LRESULT CSizingControlBar::OnNcHitTest(CPoint point)

 {

     CRect rcBar, rcEdge;

     GetWindowRect(rcBar);

diff --git a/src/ui/sizecbar/sizecbar.h b/src/ui/sizecbar/sizecbar.h
index 5cfbd5221..0d0cf16f9 100644
--- a/src/ui/sizecbar/sizecbar.h
+++ b/src/ui/sizecbar/sizecbar.h
@@ -174,7 +174,7 @@ protected:
     afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);

     afx_msg void OnNcPaint();

     afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);

-    afx_msg UINT OnNcHitTest(CPoint point);

+    afx_msg LRESULT OnNcHitTest(CPoint point);

     afx_msg void OnCaptureChanged(CWnd *pWnd);

     afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection);

     afx_msg void OnLButtonUp(UINT nFlags, CPoint point);

diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj
index 8258c7d71..1c36eb187 100644
--- a/src/ui/sizecbar/sizecbar.vcproj
+++ b/src/ui/sizecbar/sizecbar.vcproj
@@ -1,190 +1,282 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="7.10"

+	Version="8,00"

 	Name="sizecbar"

 	ProjectGUID="{61E6EB4D-2F1A-443B-94B0-E8200B26E99F}"

-	SccProjectName=""

-	SccAuxPath=""

-	SccLocalPath=""

-	SccProvider=""

-	Keyword="Win32Proj">

+	Keyword="Win32Proj"

+	>

 	<Platforms>

 		<Platform

-			Name="Win32"/>

+			Name="Win32"

+		/>

 	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="Debug"

 			IntermediateDirectory="Debug"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/sizecbarD.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/sizecbarD.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

 			IntermediateDirectory="Release"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="2">

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/sizecbarR.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/sizecbarR.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|Win32"

 			OutputDirectory="Debug Unicode"

 			IntermediateDirectory="Debug Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="2"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

+				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="4"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/sizecbarDU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/sizecbarDU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

 			OutputDirectory="Release Unicode"

 			IntermediateDirectory="Release Unicode"

 			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

 			UseOfMFC="1"

-			CharacterSet="1">

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

-				OmitFramePointers="TRUE"

+				OmitFramePointers="true"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

+				StringPooling="true"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="3"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="2"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

+				Detect64BitPortabilityProblems="false"

+				DebugInformationFormat="3"

+			/>

 			<Tool

-				Name="VCCustomBuildTool"/>

+				Name="VCManagedResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/sizecbarRU.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

+				Name="VCResourceCompilerTool"

+			/>

 			<Tool

-				Name="VCPostBuildEventTool"/>

+				Name="VCPreLinkEventTool"

+			/>

 			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

+				Name="VCLibrarianTool"

+				OutputFile="../../../lib/sizecbarRU.lib"

+			/>

 			<Tool

-				Name="VCResourceCompilerTool"/>

+				Name="VCALinkTool"

+			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

+				Name="VCXDCMakeTool"

+			/>

 			<Tool

-				Name="VCXMLDataGeneratorTool"/>

+				Name="VCBscMakeTool"

+			/>

 			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

+				Name="VCFxCopTool"

+			/>

 			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+				Name="VCPostBuildEventTool"

+			/>

 		</Configuration>

 	</Configurations>

 	<References>

@@ -192,68 +284,88 @@
 	<Files>

 		<Filter

 			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"

+			>

 			<File

-				RelativePath="scbarcf.cpp">

+				RelativePath="scbarcf.cpp"

+				>

 			</File>

 			<File

-				RelativePath="scbarg.cpp">

+				RelativePath="scbarg.cpp"

+				>

 			</File>

 			<File

-				RelativePath="sizecbar.cpp">

+				RelativePath="sizecbar.cpp"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.cpp">

+				RelativePath="stdafx.cpp"

+				>

 				<FileConfiguration

-					Name="Debug|Win32">

+					Name="Debug|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Win32">

+					Name="Release|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug Unicode|Win32">

+					Name="Debug Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release Unicode|Win32">

+					Name="Release Unicode|Win32"

+					>

 					<Tool

 						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="1"/>

+						UsePrecompiledHeader="1"

+					/>

 				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc">

+			Filter="h;hpp;hxx;hm;inl;inc"

+			>

 			<File

-				RelativePath="scbarcf.h">

+				RelativePath="scbarcf.h"

+				>

 			</File>

 			<File

-				RelativePath="scbarg.h">

+				RelativePath="scbarg.h"

+				>

 			</File>

 			<File

-				RelativePath="sizecbar.h">

+				RelativePath="sizecbar.h"

+				>

 			</File>

 			<File

-				RelativePath="stdafx.h">

+				RelativePath="stdafx.h"

+				>

 			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+			>

 		</Filter>

 	</Files>

 	<Globals>

 		<Global

 			Name="DevPartner_IsInstrumented"

-			Value="0"/>

+			Value="0"

+		/>

 	</Globals>

 </VisualStudioProject>