Changed : merge with Beliyaal branch

Added : support for madVR (new Video Renderer)

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

23 files changed, 34 insertions, 82 deletions

diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj
index 86cac68ae..886ec952f 100644
--- a/src/ui/CmdUI/CmdUI.vcproj
+++ b/src/ui/CmdUI/CmdUI.vcproj
@@ -43,6 +43,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

 			/>

 			<Tool

@@ -101,6 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

@@ -157,6 +159,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

 				DisableSpecificWarnings="4244"

 			/>

@@ -216,6 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

diff --git a/src/ui/CmdUI/stdafx.h b/src/ui/CmdUI/stdafx.h
index e3baf19ae..8adb7dd15 100644
--- a/src/ui/CmdUI/stdafx.h
+++ b/src/ui/CmdUI/stdafx.h
@@ -4,6 +4,7 @@
 //

 

 #pragma once

+#include "..\..\DSUtil\SharedInclude.h"

 

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

diff --git a/src/ui/LCDUI/LCDGfx.cpp b/src/ui/LCDUI/LCDGfx.cpp
index 480a27793..450f394b5 100644
--- a/src/ui/LCDUI/LCDGfx.cpp
+++ b/src/ui/LCDUI/LCDGfx.cpp
@@ -10,6 +10,8 @@
 // Copyright 2005 Logitech Inc.

 //************************************************************************

 

+#include "../../DSUtil/SharedInclude.h"

+#include <Afx.h>

 #include "LCDGfx.h"

 

 

@@ -64,7 +66,7 @@ HRESULT CLCDGfx::Initialize(int nWidth, int nHeight)
     }

     

     int nBMISize = sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD);

-    m_pBitmapInfo = (BITMAPINFO *) new BYTE [nBMISize];

+    m_pBitmapInfo = (BITMAPINFO *) DNew BYTE [nBMISize];

     if(NULL == m_pBitmapInfo)

     {

         LCDUITRACE(_T("CLCDGfx::Initialize(): failed to allocate bitmap info.\n"));

@@ -104,7 +106,7 @@ HRESULT CLCDGfx::Initialize(int nWidth, int nHeight)
         return E_FAIL;

     }

     

-    m_pLCDScreen = new lgLcdBitmap160x43x1;

+    m_pLCDScreen = DNew lgLcdBitmap160x43x1;

     if(NULL == m_pLCDScreen)

     {

         LCDUITRACE(_T("CLCDGfx::Initialize(): failed to allocate the lcd screen structure.\n"));

diff --git a/src/ui/LCDUI/LCDOutput.cpp b/src/ui/LCDUI/LCDOutput.cpp
index ec1a1396a..e9a0dcd27 100644
--- a/src/ui/LCDUI/LCDOutput.cpp
+++ b/src/ui/LCDUI/LCDOutput.cpp
@@ -10,6 +10,8 @@
 // Copyright 2005 Logitech Inc.

 //************************************************************************

 

+#include "../../DSUtil/SharedInclude.h"

+#include <Afx.h>

 #include "LCDOutput.h"

 

 #pragma comment(lib, "lgLcd.lib")

@@ -41,7 +43,7 @@ CLCDOutput::CLCDOutput()
                         LGLCD_DEVICE_FAMILY_SPEAKERS_Z10;

     m_dwDeviceFamiliesSupportedReserved1 = 0; 

 

-    m_pLastBitmap = new lgLcdBitmap160x43x1;

+    m_pLastBitmap = DNew lgLcdBitmap160x43x1;

     ClearBitmap(m_pLastBitmap);

     // Allow the first update to go through

     m_bPriorityHasChanged = TRUE;

diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj
index 0d97f09f1..97299cf2f 100644
--- a/src/ui/LCDUI/LCDUI.vcproj
+++ b/src/ui/LCDUI/LCDUI.vcproj
@@ -42,6 +42,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

 			/>

@@ -100,6 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

@@ -156,6 +158,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

 				DisableSpecificWarnings="4244"

@@ -215,6 +218,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

diff --git a/src/ui/ResizableLib/ResizableDialog.cpp b/src/ui/ResizableLib/ResizableDialog.cpp
index d61d4472b..af9d16b97 100644
--- a/src/ui/ResizableLib/ResizableDialog.cpp
+++ b/src/ui/ResizableLib/ResizableDialog.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizableDialog.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 /////////////////////////////////////////////////////////////////////////////

 // CResizableDialog

 

diff --git a/src/ui/ResizableLib/ResizableGrip.cpp b/src/ui/ResizableLib/ResizableGrip.cpp
index f1464dbb7..d1551ce6b 100644
--- a/src/ui/ResizableLib/ResizableGrip.cpp
+++ b/src/ui/ResizableLib/ResizableGrip.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizableGrip.h"

 

-#ifdef _DEBUG

-#undef THIS_FILE

-static char THIS_FILE[]=__FILE__;

-#define new DEBUG_NEW

-#endif

-

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

 //////////////////////////////////////////////////////////////////////

diff --git a/src/ui/ResizableLib/ResizableLayout.cpp b/src/ui/ResizableLib/ResizableLayout.cpp
index 8d7a4d7a9..750404b02 100644
--- a/src/ui/ResizableLib/ResizableLayout.cpp
+++ b/src/ui/ResizableLib/ResizableLayout.cpp
@@ -19,12 +19,6 @@
 #include "ResizableLayout.h"

 #include "ResizableMsgSupport.inl"

 

-#ifdef _DEBUG

-#undef THIS_FILE

-static char THIS_FILE[]=__FILE__;

-#define new DEBUG_NEW

-#endif

-

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

 //////////////////////////////////////////////////////////////////////

diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj
index 2c7dd5ea5..efee6f810 100644
--- a/src/ui/ResizableLib/ResizableLib.vcproj
+++ b/src/ui/ResizableLib/ResizableLib.vcproj
@@ -43,6 +43,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

 			/>

 			<Tool

@@ -101,6 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

@@ -157,6 +159,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

 				DisableSpecificWarnings="4244"

 			/>

@@ -216,6 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

diff --git a/src/ui/ResizableLib/ResizableMinMax.cpp b/src/ui/ResizableLib/ResizableMinMax.cpp
index 74e576d99..0a19f3002 100644
--- a/src/ui/ResizableLib/ResizableMinMax.cpp
+++ b/src/ui/ResizableLib/ResizableMinMax.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizableMinMax.h"

 

-#ifdef _DEBUG

-#undef THIS_FILE

-static char THIS_FILE[]=__FILE__;

-#define new DEBUG_NEW

-#endif

-

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

 //////////////////////////////////////////////////////////////////////

diff --git a/src/ui/ResizableLib/ResizablePage.cpp b/src/ui/ResizableLib/ResizablePage.cpp
index 10c49366e..06dcc6b96 100644
--- a/src/ui/ResizableLib/ResizablePage.cpp
+++ b/src/ui/ResizableLib/ResizablePage.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizablePage.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 /////////////////////////////////////////////////////////////////////////////

 // CResizablePage

 

diff --git a/src/ui/ResizableLib/ResizableSheet.cpp b/src/ui/ResizableLib/ResizableSheet.cpp
index 95ac673a0..a7048b085 100644
--- a/src/ui/ResizableLib/ResizableSheet.cpp
+++ b/src/ui/ResizableLib/ResizableSheet.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizableSheet.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 /////////////////////////////////////////////////////////////////////////////

 // CResizableSheet

 

diff --git a/src/ui/ResizableLib/ResizableState.cpp b/src/ui/ResizableLib/ResizableState.cpp
index be7e05e4c..748038d1a 100644
--- a/src/ui/ResizableLib/ResizableState.cpp
+++ b/src/ui/ResizableLib/ResizableState.cpp
@@ -17,12 +17,6 @@
 #include "stdafx.h"

 #include "ResizableState.h"

 

-#ifdef _DEBUG

-#undef THIS_FILE

-static char THIS_FILE[]=__FILE__;

-#define new DEBUG_NEW

-#endif

-

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

 //////////////////////////////////////////////////////////////////////

diff --git a/src/ui/ResizableLib/stdafx.h b/src/ui/ResizableLib/stdafx.h
index 17ff29a3b..aa01b8175 100644
--- a/src/ui/ResizableLib/stdafx.h
+++ b/src/ui/ResizableLib/stdafx.h
@@ -4,7 +4,7 @@
 //

 

 #pragma once

-

+#include "../../dsutil/SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/ui/TreePropSheet/PropPageFrame.cpp b/src/ui/TreePropSheet/PropPageFrame.cpp
index db76d6546..30f9f048b 100644
--- a/src/ui/TreePropSheet/PropPageFrame.cpp
+++ b/src/ui/TreePropSheet/PropPageFrame.cpp
@@ -20,14 +20,6 @@
 #include "stdafx.h"

 #include "PropPageFrame.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

-

-

 namespace TreePropSheet

 {

 

diff --git a/src/ui/TreePropSheet/PropPageFrameDefault.cpp b/src/ui/TreePropSheet/PropPageFrameDefault.cpp
index 667d9cac0..85e69940a 100644
--- a/src/ui/TreePropSheet/PropPageFrameDefault.cpp
+++ b/src/ui/TreePropSheet/PropPageFrameDefault.cpp
@@ -34,12 +34,6 @@ namespace TreePropSheet
 #include <vssym32.h>

 #endif

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 //-------------------------------------------------------------------

 // class CThemeLib

 //-------------------------------------------------------------------

diff --git a/src/ui/TreePropSheet/TreePropSheet.cpp b/src/ui/TreePropSheet/TreePropSheet.cpp
index 9c5c9f8ec..687226860 100644
--- a/src/ui/TreePropSheet/TreePropSheet.cpp
+++ b/src/ui/TreePropSheet/TreePropSheet.cpp
@@ -22,13 +22,6 @@
 #include "TreePropSheet.h"

 #include "PropPageFrameDefault.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

-

 

 namespace TreePropSheet

 {

@@ -253,13 +246,13 @@ CString CTreePropSheet::GenerateEmptyPageMessage(LPCTSTR lpszEmptyPageMessage, L
 

 CTreeCtrl* CTreePropSheet::CreatePageTreeObject()

 {

-	return new CTreeCtrl;

+	return DNew CTreeCtrl;

 }

 

 

 CPropPageFrame* CTreePropSheet::CreatePageFrame()

 {

-	return new CPropPageFrameDefault;

+	return DNew CPropPageFrameDefault;

 }

 

 

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index 28a2a840d..9125e1b61 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -43,6 +43,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

 			/>

 			<Tool

@@ -101,6 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

@@ -157,6 +159,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

 				DisableSpecificWarnings="4244"

 			/>

@@ -216,6 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

diff --git a/src/ui/TreePropSheet/stdafx.h b/src/ui/TreePropSheet/stdafx.h
index 48ffc8b90..8917673d9 100644
--- a/src/ui/TreePropSheet/stdafx.h
+++ b/src/ui/TreePropSheet/stdafx.h
@@ -4,6 +4,7 @@
 //

 

 #pragma once

+#include "..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

diff --git a/src/ui/sizecbar/scbarg.cpp b/src/ui/sizecbar/scbarg.cpp
index 23a0ef7e2..50453e395 100644
--- a/src/ui/sizecbar/scbarg.cpp
+++ b/src/ui/sizecbar/scbarg.cpp
@@ -33,12 +33,6 @@
 

 #include "scbarg.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 /////////////////////////////////////////////////////////////////////////

 // CSizingControlBarG

 

diff --git a/src/ui/sizecbar/sizecbar.cpp b/src/ui/sizecbar/sizecbar.cpp
index 8cb8d7157..e5c79c15d 100644
--- a/src/ui/sizecbar/sizecbar.cpp
+++ b/src/ui/sizecbar/sizecbar.cpp
@@ -57,12 +57,6 @@
 #include "stdafx.h"

 #include "sizecbar.h"

 

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#undef THIS_FILE

-static char THIS_FILE[] = __FILE__;

-#endif

-

 /////////////////////////////////////////////////////////////////////////

 // CSizingControlBar

 

@@ -165,7 +159,7 @@ void CSizingControlBar::EnableDocking(DWORD dwDockStyle)
 

     m_dwDockStyle = dwDockStyle;

     if (m_pDockContext == NULL)

-        m_pDockContext = new CSCBDockContext(this);

+        m_pDockContext = DNew CSCBDockContext(this);

 

     // permanently wire the bar's owner to its current parent

     if (m_hWndOwner == NULL)

diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj
index ab907d73a..63a28e88d 100644
--- a/src/ui/sizecbar/sizecbar.vcproj
+++ b/src/ui/sizecbar/sizecbar.vcproj
@@ -43,6 +43,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

 			/>

 			<Tool

@@ -101,6 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

@@ -157,6 +159,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				DisableSpecificWarnings="4244"

 			/>

@@ -216,6 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalOptions="/MP"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

diff --git a/src/ui/sizecbar/stdafx.h b/src/ui/sizecbar/stdafx.h
index 48ffc8b90..8917673d9 100644
--- a/src/ui/sizecbar/stdafx.h
+++ b/src/ui/sizecbar/stdafx.h
@@ -4,6 +4,7 @@
 //

 

 #pragma once

+#include "..\..\DSUtil\SharedInclude.h"

 

 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers

 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit