diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2010-10-04 04:00:00 +0400 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:04 +0300 |
| commit | 2eb60a059819da595efb8e1de49f04c241f5b981 (patch) | |
| tree | fe5423b6679c605b545b726cb875883ea9299b31 /CPP/7zip/UI/Far/Plugin.cpp | |
| parent | 044e4bb7413beb329edfa3ad27b492d819cdc811 (diff) | |
9.179.17
Diffstat (limited to 'CPP/7zip/UI/Far/Plugin.cpp')
| -rwxr-xr-x | CPP/7zip/UI/Far/Plugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CPP/7zip/UI/Far/Plugin.cpp b/CPP/7zip/UI/Far/Plugin.cpp index bc70278b..97627517 100755 --- a/CPP/7zip/UI/Far/Plugin.cpp +++ b/CPP/7zip/UI/Far/Plugin.cpp @@ -72,7 +72,7 @@ void CPlugin::ReadPluginPanelItem(PluginPanelItem &panelItem, UInt32 itemIndex) if (prop.vt != VT_BSTR) throw 272340; - CSysString oemString = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP); + AString oemString = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP); if (oemString == "..") oemString = kDotsReplaceString; @@ -133,9 +133,9 @@ void CPlugin::ReadPluginPanelItem(PluginPanelItem &panelItem, UInt32 itemIndex) panelItem.CustomColumnData = NULL; panelItem.CustomColumnNumber = 0; + panelItem.CRC32 = 0; panelItem.Reserved[0] = 0; panelItem.Reserved[1] = 0; - panelItem.Reserved[2] = 0; } int CPlugin::GetFindData(PluginPanelItem **panelItems, int *itemsNumber, int opMode) @@ -466,7 +466,7 @@ static AString PropToString(const NCOM::CPropVariant &prop, PROPID propID) AString s; if (prop.vt == VT_BSTR) - s = GetSystemString(prop.bstrVal, CP_OEMCP); + s = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP); else if (prop.vt == VT_BOOL) { int messageID = VARIANT_BOOLToBool(prop.boolVal) ? @@ -733,7 +733,7 @@ HRESULT CPlugin::ShowAttributesWindow() if (strcmp(pluginPanelItem.FindData.cFileName, "..") == 0 && NFile::NFind::NAttributes::IsDir(pluginPanelItem.FindData.dwFileAttributes)) return S_FALSE; - int itemIndex = pluginPanelItem.UserData; + int itemIndex = (int)pluginPanelItem.UserData; CObjectVector<CArchiveItemProperty> properties; UInt32 numProps; @@ -781,7 +781,7 @@ HRESULT CPlugin::ShowAttributesWindow() NCOM::CPropVariant prop; RINOK(_folder->GetProperty(itemIndex, property.ID, &prop)); - CSysString s = PropToString(prop, property.ID); + AString s = PropToString(prop, property.ID); values.Add(s); { |