mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-13 10:11:34 -06:00
4.46 beta
This commit is contained in:
committed by
Kornel Lesiński
parent
a145bfc7cf
commit
c574fc0f4b
@@ -147,8 +147,8 @@ STDMETHODIMP CExtractCallBackImp::SetOperationResult(INT32 operationResult, bool
|
||||
return E_FAIL;
|
||||
}
|
||||
char buffer[512];
|
||||
sprintf(buffer, g_StartupInfo.GetMsgString(idMessage),
|
||||
GetSystemString(m_CurrentFilePath, m_CodePage));
|
||||
const AString s = GetSystemString(m_CurrentFilePath, m_CodePage);
|
||||
sprintf(buffer, g_StartupInfo.GetMsgString(idMessage), (const char *)s);
|
||||
if (g_StartupInfo.ShowMessage(buffer) == -1)
|
||||
return E_ABORT;
|
||||
}
|
||||
|
||||
@@ -570,6 +570,15 @@ SOURCE=..\..\..\..\C\Sort.c
|
||||
|
||||
SOURCE=..\..\..\..\C\Sort.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\..\C\Threads.c
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\..\C\Threads.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
|
||||
@@ -33,8 +33,6 @@ using namespace NFar;
|
||||
|
||||
static const char *kCommandPrefix = "7-zip";
|
||||
|
||||
static const int kDescriptionMaxSize = 256;
|
||||
|
||||
static const char *kRegisrtryMainKeyName = "";
|
||||
|
||||
static const char *kRegisrtryValueNameEnabled = "UsedByDefault3";
|
||||
|
||||
@@ -21,8 +21,6 @@ using namespace NFar;
|
||||
|
||||
namespace NOverwriteDialog {
|
||||
|
||||
static const char *kHelpTopic = "OverwriteDialog";
|
||||
|
||||
struct CFileInfoStrings
|
||||
{
|
||||
CSysString Size;
|
||||
|
||||
@@ -421,8 +421,10 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
|
||||
const CArcInfoEx &arcInfo = codecs->Formats[archiverIndex];
|
||||
|
||||
char updateAddToArchiveString[512];
|
||||
const AString s = GetSystemString(arcInfo.Name, CP_OEMCP);
|
||||
|
||||
sprintf(updateAddToArchiveString,
|
||||
g_StartupInfo.GetMsgString(NMessageID::kUpdateAddToArchive), GetSystemString(arcInfo.Name), CP_OEMCP);
|
||||
g_StartupInfo.GetMsgString(NMessageID::kUpdateAddToArchive), (const char *)s);
|
||||
|
||||
int methodIndex = 0;
|
||||
int i;
|
||||
@@ -534,7 +536,6 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
|
||||
if (archiveName.Right(prevExtensionLen).CompareNoCase(prevExtension) == 0)
|
||||
{
|
||||
int pos = archiveName.Length() - prevExtensionLen;
|
||||
UString temp = archiveName.Left(pos);
|
||||
if (pos > 1)
|
||||
{
|
||||
int dotPos = archiveName.ReverseFind('.');
|
||||
|
||||
@@ -71,6 +71,7 @@ AGENT_OBJS = \
|
||||
C_OBJS = \
|
||||
$O\Alloc.obj \
|
||||
$O\Sort.obj \
|
||||
$O\Threads.obj \
|
||||
|
||||
OBJS = \
|
||||
$O\StdAfx.obj \
|
||||
|
||||
Reference in New Issue
Block a user