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

Update to 7-Zip 17.00 Beta

Browse Source
This commit is contained in:
Tino Reichardt
2017-04-30 14:14:14 +02:00
parent 54389d6e2f
commit aa5ba75da0
451 changed files with 15746 additions and 8574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CPP/Common/Lang.cpp
View File

@@ -10,13 +10,13 @@
void CLang::Clear() throw()
{
delete []_text;
_text = 0;
_ids.Clear();
_offsets.Clear();
delete []_text;
_text = 0;
}
static const wchar_t *kLangSignature = L";!@Lang2@!UTF-8!";
static const char * const kLangSignature = ";!@Lang2@!UTF-8!";
bool CLang::OpenFromString(const AString &s2)
{
@@ -29,9 +29,9 @@ bool CLang::OpenFromString(const AString &s2)
if (s[0] == 0xFEFF)
i++;
for (const wchar_t *p = kLangSignature;; i++)
for (const char *p = kLangSignature;; i++)
{
wchar_t c = *p++;
Byte c = *p++;
if (c == 0)
break;
if (s[i] != c)
@@ -109,7 +109,7 @@ bool CLang::OpenFromString(const AString &s2)
return true;
}
bool CLang::Open(CFSTR fileName, const wchar_t *id)
bool CLang::Open(CFSTR fileName, const char *id)
{
Clear();
NWindows::NFile::NIO::CInFile file;
@@ -146,7 +146,7 @@ bool CLang::Open(CFSTR fileName, const wchar_t *id)
if (OpenFromString(s))
{
const wchar_t *name = Get(0);
if (name && wcscmp(name, id) == 0)
if (name && StringsAreEqual_Ascii(name, id))
return true;
}