xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 18:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

17.00

Browse Source
This commit is contained in:
Igor Pavlov
2017-04-30 00:00:00 +00:00
committed by Kornel
parent 603abd5528
commit 2efa10565a
442 changed files with 15479 additions and 8525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CPP/7zip/Archive/Iso/IsoHandler.cpp
View File

@@ -3,7 +3,6 @@
#include "StdAfx.h"
#include "../../../Common/ComTry.h"
#include "../../../Common/IntToString.h"
#include "../../../Common/StringConvert.h"
#include "../../../Windows/PropVariant.h"
@@ -176,12 +175,10 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
{
case kpidPath:
{
AString s = "[BOOT]" STRING_PATH_SEPARATOR;
AString s ("[BOOT]" STRING_PATH_SEPARATOR);
if (_archive.BootEntries.Size() != 1)
{
char temp[16];
ConvertUInt32ToString(index + 1, temp);
s += temp;
s.Add_UInt32(index + 1);
s += '-';
}
s += be.GetName();
@@ -216,7 +213,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
if (!s.IsEmpty() && s.Back() == L'.')
s.DeleteBack();
NItemName::ConvertToOSName2(s);
NItemName::ReplaceToOsSlashes_Remove_TailSlash(s);
prop = s;
}
break;

2
CPP/7zip/Archive/Iso/IsoHeader.cpp
View File

@@ -7,6 +7,6 @@
namespace NArchive {
namespace NIso {
const char *kElToritoSpec = "EL TORITO SPECIFICATION\0\0\0\0\0\0\0\0\0";
const char * const kElToritoSpec = "EL TORITO SPECIFICATION\0\0\0\0\0\0\0\0\0";
}}

2
CPP/7zip/Archive/Iso/IsoHeader.h
View File

@@ -25,7 +25,7 @@ namespace NFileFlags
const Byte kNonFinalExtent = 1 << 7;
}
extern const char *kElToritoSpec;
extern const char * const kElToritoSpec;
const UInt32 kStartPos = 0x8000;

8
CPP/7zip/Archive/Iso/IsoIn.cpp
View File

@@ -47,17 +47,13 @@ bool CBootInitialEntry::Parse(const Byte *p)
AString CBootInitialEntry::GetName() const
{
AString s = (Bootable ? "Boot" : "NotBoot");
AString s (Bootable ? "Boot" : "NotBoot");
s += '-';
if (BootMediaType < ARRAY_SIZE(kMediaTypes))
s += kMediaTypes[BootMediaType];
else
{
char name[16];
ConvertUInt32ToString(BootMediaType, name);
s += name;
}
s.Add_UInt32(BootMediaType);
if (VendorSpec[0] == 1)
{

1
CPP/7zip/Archive/Iso/IsoIn.h
View File

@@ -3,7 +3,6 @@
#ifndef __ARCHIVE_ISO_IN_H
#define __ARCHIVE_ISO_IN_H
#include "../../../Common/IntToString.h"
#include "../../../Common/MyCom.h"
#include "../../IStream.h"

1
CPP/7zip/Archive/Iso/IsoItem.h
View File

@@ -223,6 +223,7 @@ struct CDirRecord
const bool GetPx(int skipSize, unsigned pxType, UInt32 &val) const
{
val = 0;
const Byte *p = NULL;
unsigned len = 0;
p = FindSuspRecord(skipSize, 'P', 'X', len);