diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2017-04-30 03:00:00 +0300 |
|---|---|---|
| committer | Kornel <kornel@geekhood.net> | 2017-05-05 20:56:20 +0300 |
| commit | 2efa10565ac395d2ce9a679ead46e70fb2f963eb (patch) | |
| tree | 84c8df4deb69ec44ea15af9378f24347db55c357 /CPP/7zip/Archive/Cab | |
| parent | 603abd5528c97346e9448c0ff47949f818fe558c (diff) | |
17.0017.00
Diffstat (limited to 'CPP/7zip/Archive/Cab')
| -rw-r--r-- | CPP/7zip/Archive/Cab/CabHandler.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/CPP/7zip/Archive/Cab/CabHandler.cpp b/CPP/7zip/Archive/Cab/CabHandler.cpp index 18f58b3d..c62efbd8 100644 --- a/CPP/7zip/Archive/Cab/CabHandler.cpp +++ b/CPP/7zip/Archive/Cab/CabHandler.cpp @@ -226,12 +226,9 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) if (ai.SetID != 0) { AString s; - char temp[32]; - ConvertUInt32ToString(ai.SetID, temp); - s += temp; - ConvertUInt32ToString(ai.CabinetNumber + 1, temp); + s.Add_UInt32(ai.SetID); s += '_'; - s += temp; + s.Add_UInt32(ai.CabinetNumber + 1); s += ".cab"; prop = s; } @@ -288,7 +285,7 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val ConvertUTF8ToUnicode(item.Name, unicodeName); else unicodeName = MultiByteToUnicodeString(item.Name, CP_ACP); - prop = (const wchar_t *)NItemName::WinNameToOSName(unicodeName); + prop = (const wchar_t *)NItemName::WinPathToOsPath(unicodeName); break; } @@ -491,7 +488,7 @@ STDMETHODIMP CHandler::Open(IInStream *inStream, if (!_errorMessage.IsEmpty()) _errorMessage.Add_LF(); - _errorMessage.AddAscii("Can't open volume: "); + _errorMessage += "Can't open volume: "; _errorMessage += fullName; if (prevChecked) |