diff options
Diffstat (limited to 'CPP/7zip/UI/Console')
-rwxr-xr-x | CPP/7zip/UI/Console/List.cpp | 11 | ||||
-rwxr-xr-x | CPP/7zip/UI/Console/Main.cpp | 4 | ||||
-rwxr-xr-x | CPP/7zip/UI/Console/MainAr.cpp | 6 | ||||
-rwxr-xr-x | CPP/7zip/UI/Console/UpdateCallbackConsole.cpp | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/CPP/7zip/UI/Console/List.cpp b/CPP/7zip/UI/Console/List.cpp index 7a2b9628..6ba2830e 100755 --- a/CPP/7zip/UI/Console/List.cpp +++ b/CPP/7zip/UI/Console/List.cpp @@ -295,7 +295,16 @@ HRESULT CFieldPrinter::PrintItemInfo(IInArchive *archive, PrintSpaces(fieldInfo.PrefixSpacesWidth); NCOM::CPropVariant propVariant; - RINOK(archive->GetProperty(index, fieldInfo.PropID, &propVariant)); + if (fieldInfo.PropID == kpidPath) + { + UString s; + RINOK(GetArchiveItemPath(archive, index, defaultItemName, s)); + propVariant = s; + } + else + { + RINOK(archive->GetProperty(index, fieldInfo.PropID, &propVariant)); + } if (techMode) { g_StdOut << fieldInfo.Name << " = "; diff --git a/CPP/7zip/UI/Console/Main.cpp b/CPP/7zip/UI/Console/Main.cpp index de496530..265d2212 100755 --- a/CPP/7zip/UI/Console/Main.cpp +++ b/CPP/7zip/UI/Console/Main.cpp @@ -1,4 +1,4 @@ -/ Main.cpp +// Main.cpp #include "StdAfx.h" @@ -298,7 +298,7 @@ int Main2( stdStream << endl << "Codecs:" << endl; #ifdef EXTERNAL_CODECS - UINT32 numMethods; + UInt32 numMethods; if (codecs->GetNumberOfMethods(&numMethods) == S_OK) for (UInt32 j = 0; j < numMethods; j++) { diff --git a/CPP/7zip/UI/Console/MainAr.cpp b/CPP/7zip/UI/Console/MainAr.cpp index fd42e4f6..6cc5cf9d 100755 --- a/CPP/7zip/UI/Console/MainAr.cpp +++ b/CPP/7zip/UI/Console/MainAr.cpp @@ -48,11 +48,7 @@ static const char *kMemoryExceptionMessage = "\n\nERROR: Can't allocate required static const char *kUnknownExceptionMessage = "\n\nUnknown Error\n"; static const char *kInternalExceptionMessage = "\n\nInternal Error #"; -int -#ifdef _MSC_VER -__cdecl -#endif -main +int MY_CDECL main ( #ifndef _WIN32 int numArguments, const char *arguments[] diff --git a/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp b/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp index 1d4420da..dd4e2b9e 100755 --- a/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp +++ b/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp @@ -144,10 +144,8 @@ HRESULT CUpdateCallbackConsole::SetCompleted(const UInt64 *completeValue) HRESULT CUpdateCallbackConsole::SetRatioInfo(const UInt64 * /* inSize */, const UInt64 * /* outSize */) { - /* if (NConsoleClose::TestBreakSignal()) return E_ABORT; - */ return S_OK; } |