diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp index 18582a08..791cdc9c 100644 --- a/source/Irrlicht/CZipReader.cpp +++ b/source/Irrlicht/CZipReader.cpp @@ -655,6 +655,10 @@ IReadFile* CZipReader::createAndOpenFile(u32 index) return 0; // zlib not compiled, we cannot decompress the data. #endif } + case 99: + // If we come here with an encrypted file, decryption support is missing + os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR); + return 0; default: swprintf ( buf, 64, L"file has unsupported compression method. %s", Files[index].FullName.c_str() ); os::Printer::log( buf, ELL_ERROR); diff --git a/tests/archiveReader.cpp b/tests/archiveReader.cpp index ebd40308..3d2c4e28 100644 --- a/tests/archiveReader.cpp +++ b/tests/archiveReader.cpp @@ -152,6 +152,7 @@ bool testEncryptedZip(IFileSystem* fs) archive->Password="33445"; readFile = fs->createAndOpenFile(filename); +#ifdef _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if ( !readFile ) { logTestString("createAndOpenFile failed\n"); @@ -165,6 +166,7 @@ bool testEncryptedZip(IFileSystem* fs) logTestString("Read bad data from archive: %s\n", tmp); return false; } +#endif if (!fs->removeFileArchive(fs->getFileArchiveCount()-1)) { diff --git a/tests/tests-last-passed-at.txt b/tests/tests-last-passed-at.txt index ecc7ac8c..7cb7ca66 100644 --- a/tests/tests-last-passed-at.txt +++ b/tests/tests-last-passed-at.txt @@ -1,2 +1,2 @@ -Test suite pass at GMT Fri Dec 4 18:41:12 2009 - +Test suite pass at GMT Sat Dec 05 11:03:29 2009 + diff --git a/tests/tests_vc9.vcproj b/tests/tests_vc9.vcproj index 44742e3d..5624045c 100644 --- a/tests/tests_vc9.vcproj +++ b/tests/tests_vc9.vcproj @@ -286,6 +286,10 @@ RelativePath=".\terrainSceneNode.cpp" > + +