equal
deleted
inserted
replaced
24 #include <e32math.h> |
24 #include <e32math.h> |
25 #include <f32file.h> |
25 #include <f32file.h> |
26 #include <s32buf.h> |
26 #include <s32buf.h> |
27 #include <s32crypt.h> |
27 #include <s32crypt.h> |
28 #include <utf.h> |
28 #include <utf.h> |
29 #include <DrmRights.h> |
29 #include <DRMRights.h> |
30 #include <DrmCommon.h> |
30 #include <DRMCommon.h> |
31 #include <Oma1DcfCreator.h> |
31 #include <Oma1DcfCreator.h> |
32 #include <SysUtil.h> // Disk space checking |
32 #include <sysutil.h> // Disk space checking |
33 |
33 |
34 #include "ZipFile.h" |
34 #include "zipfile.h" |
35 #include "ZipFileMemberIterator.h" |
35 #include "zipfilememberiterator.h" |
36 #include "DRMLicenseManager.h" |
36 #include "DRMLicenseManager.h" |
37 |
37 |
38 // LOCAL CONSTANTS AND MACROS |
38 // LOCAL CONSTANTS AND MACROS |
39 _LIT(KDefinitionFileName, "datafiles.def"); |
39 _LIT(KDefinitionFileName, "datafiles.def"); |
40 _LIT(KSISSuffix, ".sis"); |
40 _LIT(KSISSuffix, ".sis"); |
489 CZipFileMember* sisFile = NULL; |
489 CZipFileMember* sisFile = NULL; |
490 CZipFileMember* member = NULL; |
490 CZipFileMember* member = NULL; |
491 |
491 |
492 members = iZipFile->GetMembersL(); |
492 members = iZipFile->GetMembersL(); |
493 CleanupStack::PushL(members); |
493 CleanupStack::PushL(members); |
494 |
494 |
495 member = members->NextL(); |
495 member = members->NextL(); |
496 |
496 |
497 while (member && !sisFile) |
497 while (member && !sisFile) |
498 { |
498 { |
499 if (member->Name()->Right(4).CompareF(KSISSuffix) == 0) |
499 if (member->Name()->Right(4).CompareF(KSISSuffix) == 0) |
500 { |
500 { |
501 sisFile = member; |
501 sisFile = member; |
509 delete member; |
509 delete member; |
510 member = NULL; |
510 member = NULL; |
511 member = members->NextL(); |
511 member = members->NextL(); |
512 } |
512 } |
513 } |
513 } |
514 |
514 |
515 CleanupStack::PopAndDestroy(members); |
515 CleanupStack::PopAndDestroy(members); |
516 |
516 |
517 if(!sisFile) |
517 if(!sisFile) |
518 { |
518 { |
519 User::Leave(KErrNotFound); |
519 User::Leave(KErrNotFound); |
520 } |
520 } |
521 |
521 |
522 return sisFile; |
522 return sisFile; |
523 } |
523 } |
524 |
524 |
525 // ----------------------------------------------------------------------------- |
525 // ----------------------------------------------------------------------------- |
526 // CDRMLicenseManager::WriteSISMemberL |
526 // CDRMLicenseManager::WriteSISMemberL |