← Back to branch summary

~ubuntu-branches/ubuntu/precise/p7zip/precise-updates

« back to all changes in this revision

Viewing changes to CPP/7zip/Archive/7z/7zProperties.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mohammed Adnène Trojette
  • Date: 2009-02-14 20:12:27 UTC
  • mfrom: (1.1.11 upstream) (2.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090214201227-go63qxm9ozfdma60
Tags: 4.65~dfsg.1-1
* New upstream release.
* Remove wx2.8 Build-Depends added by mistakes (7zG is not yet
  intended to be built).
* Use dh_clean without -k.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CPP/7zip/Archive/7z/7zProperties.cpp
17
17
  STATPROPSTG StatPROPSTG;
18
18
};
19
19
 
20
 
CPropMap kPropMap[] = 
 
20
CPropMap kPropMap[] =
21
21
{
22
22
  { NID::kName, NULL, kpidPath, VT_BSTR},
23
23
  { NID::kSize, NULL, kpidSize, VT_UI8},
24
 
  { NID::kPackInfo, NULL, kpidPackedSize, VT_UI8},
 
24
  { NID::kPackInfo, NULL, kpidPackSize, VT_UI8},
25
25
  
26
26
  #ifdef _MULTI_PACK
27
27
  { 100, L"Pack0", kpidPackedSize0, VT_UI8},
31
31
  { 104, L"Pack4", kpidPackedSize4, VT_UI8},
32
32
  #endif
33
33
 
34
 
  { NID::kCreationTime, NULL, kpidCreationTime, VT_FILETIME},
35
 
  { NID::kLastWriteTime, NULL, kpidLastWriteTime, VT_FILETIME},
36
 
  { NID::kLastAccessTime, NULL, kpidLastAccessTime, VT_FILETIME},
37
 
  { NID::kWinAttributes, NULL, kpidAttributes, VT_UI4},
 
34
  { NID::kCTime, NULL, kpidCTime, VT_FILETIME},
 
35
  { NID::kMTime, NULL, kpidMTime, VT_FILETIME},
 
36
  { NID::kATime, NULL, kpidATime, VT_FILETIME},
 
37
  { NID::kWinAttributes, NULL, kpidAttrib, VT_UI4},
38
38
  { NID::kStartPos, NULL, kpidPosition, VT_UI4},
39
39
 
40
40
  { NID::kCRC, NULL, kpidCRC, VT_UI4},
58
58
  return -1;
59
59
}
60
60
 
61
 
static void CopyOneItem(CRecordVector<UInt64> &src, 
 
61
static void CopyOneItem(CRecordVector<UInt64> &src,
62
62
    CRecordVector<UInt64> &dest, UInt32 item)
63
63
{
64
64
  for (int i = 0; i < src.Size(); i++)
92
92
}
93
93
 
94
94
void CHandler::FillPopIDs()
95
 
{ 
 
95
{
96
96
  _fileInfoPopIDs.Clear();
97
97
 
98
98
  #ifdef _7Z_VOL
99
99
  if(_volumes.Size() < 1)
100
100
    return;
101
101
  const CVolume &volume = _volumes.Front();
102
 
  const CArchiveDatabaseEx &_database = volume.Database;
 
102
  const CArchiveDatabaseEx &_db = volume.Database;
103
103
  #endif
104
104
 
105
 
  CRecordVector<UInt64> fileInfoPopIDs = _database.ArchiveInfo.FileInfoPopIDs;
 
105
  CRecordVector<UInt64> fileInfoPopIDs = _db.ArchiveInfo.FileInfoPopIDs;
106
106
 
107
107
  RemoveOneItem(fileInfoPopIDs, NID::kEmptyStream);
108
108
  RemoveOneItem(fileInfoPopIDs, NID::kEmptyFile);
111
111
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kAnti);
112
112
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kSize);
113
113
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kPackInfo);
114
 
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kCreationTime);
115
 
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kLastWriteTime);
116
 
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kLastAccessTime);
 
114
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kCTime);
 
115
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kMTime);
 
116
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kATime);
117
117
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kWinAttributes);
118
118
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kCRC);
119
119
  CopyOneItem(fileInfoPopIDs, _fileInfoPopIDs, NID::kComment);
120
 
  _fileInfoPopIDs += fileInfoPopIDs; 
 
120
  _fileInfoPopIDs += fileInfoPopIDs;
121
121
 
122
122
  #ifndef _SFX
123
123
  _fileInfoPopIDs.Add(97);
133
133
  #endif
134
134
 
135
135
  #ifndef _SFX
136
 
  InsertToHead(_fileInfoPopIDs, NID::kLastWriteTime);
 
136
  InsertToHead(_fileInfoPopIDs, NID::kMTime);
137
137
  InsertToHead(_fileInfoPopIDs, NID::kPackInfo);
138
138
  InsertToHead(_fileInfoPopIDs, NID::kSize);
139
139
  InsertToHead(_fileInfoPopIDs, NID::kName);