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

9.06 beta

Browse Source
This commit is contained in:
Igor Pavlov
2009-08-17 00:00:00 +00:00
committed by Kornel Lesiński
parent 829409452d
commit c99f3ebdd6
445 changed files with 15246 additions and 8133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CPP/7zip/UI/Far/FarUtils.cpp
View File

@@ -2,13 +2,13 @@
#include "StdAfx.h"
#include "FarUtils.h"
#include "Common/DynamicBuffer.h"
#include "Common/StringConvert.h"
#include "Windows/Defs.h"
#include "Windows/Console.h"
#include "Windows/Error.h"
#include "FarUtils.h"
using namespace NWindows;
namespace NFar {
@@ -16,12 +16,12 @@ namespace NFar {
CStartupInfo g_StartupInfo;
void CStartupInfo::Init(const PluginStartupInfo &pluginStartupInfo,
const CSysString &pliginNameForRegestry)
const CSysString &pluginNameForRegestry)
{
m_Data = pluginStartupInfo;
m_RegistryPath = pluginStartupInfo.RootKey;
m_RegistryPath += '\\';
m_RegistryPath += pliginNameForRegestry;
m_RegistryPath = GetSystemString(pluginStartupInfo.RootKey);
m_RegistryPath += TEXT('\\');
m_RegistryPath += pluginNameForRegestry;
}
const char *CStartupInfo::GetMsgString(int messageId)
@@ -164,7 +164,7 @@ void CStartupInfo::RestoreScreen(HANDLE handle)
m_Data.RestoreScreen(handle);
}
const char kRegestryKeyDelimiter = '\'';
const TCHAR kRegestryKeyDelimiter = TEXT('\'');
CSysString CStartupInfo::GetFullKeyName(const CSysString &keyName) const
{
@@ -355,8 +355,8 @@ int CStartupInfo::Menu(
item.Checked = 0;
item.Separator = 0;
item.Selected = (i == selectedItem);
AString reducedString = items[i].Left(sizeof(item.Text) / sizeof(item.Text[0]) - 1);
MyStringCopy(item.Text, (const char *)reducedString);
CSysString reducedString = items[i].Left(sizeof(item.Text) / sizeof(item.Text[0]) - 1);
MyStringCopy(item.Text, (const char *)GetOemString(reducedString));
farMenuItems.Add(item);
}
return Menu(flags, title, helpTopic, &farMenuItems.Front(), farMenuItems.Size());
@@ -396,7 +396,7 @@ static AString DWORDToString(DWORD number)
void PrintErrorMessage(const char *message, int code)
{
CSysString tmp = message;
AString tmp = message;
tmp += " #";
tmp += DWORDToString(code);
g_StartupInfo.ShowMessage(tmp);
@@ -404,7 +404,7 @@ void PrintErrorMessage(const char *message, int code)
void PrintErrorMessage(const char *message, const char *text)
{
CSysString tmp = message;
AString tmp = message;
tmp += ":\n";
tmp += text;
g_StartupInfo.ShowMessageLines(tmp);
@@ -442,10 +442,10 @@ bool WasEscPressed()
void ShowErrorMessage(DWORD errorCode)
{
AString message;
CSysString message;
NError::MyFormatMessage(errorCode, message);
message.Replace("\x0D", "");
message.Replace("\x0A", " ");
message.Replace(TEXT("\x0D"), TEXT(""));
message.Replace(TEXT("\x0A"), TEXT(" "));
g_StartupInfo.ShowMessage(SystemStringToOemString(message));
}