4.40 beta

This commit is contained in:
Igor Pavlov
2006-05-01 00:00:00 +00:00
committed by Kornel Lesiński
parent 3415684502
commit bd9a40b0ed
61 changed files with 2710 additions and 187 deletions

View File

@@ -119,17 +119,15 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *va
switch(propID)
{
case kpidPath:
{
UString unicodeName;
if (item.IsNameUTF())
{
UString unicodeName;
if (!ConvertUTF8ToUnicode(item.Name, unicodeName))
propVariant = L"";
else
propVariant = (const wchar_t *)NItemName::WinNameToOSName(unicodeName);
}
ConvertUTF8ToUnicode(item.Name, unicodeName);
else
propVariant = MultiByteToUnicodeString(item.Name, CP_ACP);
unicodeName = MultiByteToUnicodeString(item.Name, CP_ACP);
propVariant = (const wchar_t *)NItemName::WinNameToOSName(unicodeName);
break;
}
case kpidIsFolder:
propVariant = item.IsDirectory();
break;