diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
| commit | 530c6354edabdd19d45d883fee88793664170adf (patch) | |
| tree | d1fcf2a4b371465f0c20201a52f33db6367688e7 /src/decss | |
| parent | f39d30c0b2eba6db09f1d3f66be6fd1eb2d7f5a5 (diff) | |
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
Diffstat (limited to 'src/decss')
| -rw-r--r-- | src/decss/VobFile.cpp | 16 | ||||
| -rw-r--r-- | src/decss/decss.vcproj | 2 | ||||
| -rw-r--r-- | src/decss/stdafx.h | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/decss/VobFile.cpp b/src/decss/VobFile.cpp index 9215c0c48..b70ddc7e5 100644 --- a/src/decss/VobFile.cpp +++ b/src/decss/VobFile.cpp @@ -190,12 +190,12 @@ bool CDVDSession::SendKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData) switch(KeyType)
{
case DvdChallengeKey:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_CHALLENGE_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_CHALLENGE_KEY_LENGTH]);
key->KeyLength = DVD_CHALLENGE_KEY_LENGTH;
Reverse(key->KeyData, pKeyData, 10);
break;
case DvdBusKey2:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_BUS_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_BUS_KEY_LENGTH]);
key->KeyLength = DVD_BUS_KEY_LENGTH;
Reverse(key->KeyData, pKeyData, 5);
break;
@@ -221,22 +221,22 @@ bool CDVDSession::ReadKey(DVD_KEY_TYPE KeyType, BYTE* pKeyData, int lba) switch(KeyType)
{
case DvdChallengeKey:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_CHALLENGE_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_CHALLENGE_KEY_LENGTH]);
key->KeyLength = DVD_CHALLENGE_KEY_LENGTH;
key->Parameters.TitleOffset.QuadPart = 0;
break;
case DvdBusKey1:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_BUS_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_BUS_KEY_LENGTH]);
key->KeyLength = DVD_BUS_KEY_LENGTH;
key->Parameters.TitleOffset.QuadPart = 0;
break;
case DvdDiskKey:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_DISK_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_DISK_KEY_LENGTH]);
key->KeyLength = DVD_DISK_KEY_LENGTH;
key->Parameters.TitleOffset.QuadPart = 0;
break;
case DvdTitleKey:
- key.Attach((DVD_COPY_PROTECT_KEY*)new BYTE[DVD_TITLE_KEY_LENGTH]);
+ key.Attach((DVD_COPY_PROTECT_KEY*)DNew BYTE[DVD_TITLE_KEY_LENGTH]);
key->KeyLength = DVD_TITLE_KEY_LENGTH;
key->Parameters.TitleOffset.QuadPart = 2048i64*lba;
break;
@@ -304,7 +304,7 @@ bool CLBAFile::Open(LPCTSTR path) {
Close();
- return(!!CFile::Open(path, modeRead|typeBinary|shareDenyWrite|osSequentialScan));
+ return(!!CFile::Open(path, modeRead|typeBinary|shareDenyNone|osSequentialScan));
}
void CLBAFile::Close()
@@ -366,7 +366,7 @@ bool CVobFile::HasTitleKey(BYTE* key) bool CVobFile::Open(CString fn, CAtlList<CString>& vobs)
{
CFile f;
- if(!f.Open(fn, CFile::modeRead|CFile::typeBinary|CFile::shareDenyWrite))
+ if(!f.Open(fn, CFile::modeRead|CFile::typeBinary|CFile::shareDenyNone))
return(false);
char hdr[13];
diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj index ed27cb07c..6f455d13d 100644 --- a/src/decss/decss.vcproj +++ b/src/decss/decss.vcproj @@ -43,6 +43,7 @@ />
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
/>
@@ -102,6 +103,7 @@ />
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;"
DebugInformationFormat="3"
diff --git a/src/decss/stdafx.h b/src/decss/stdafx.h index 48ffc8b90..8a8c808cb 100644 --- a/src/decss/stdafx.h +++ b/src/decss/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
|