diff options
Diffstat (limited to 'CPP/7zip/UI/FileManager/NetFolder.cpp')
-rw-r--r--[-rwxr-xr-x] | CPP/7zip/UI/FileManager/NetFolder.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/CPP/7zip/UI/FileManager/NetFolder.cpp b/CPP/7zip/UI/FileManager/NetFolder.cpp index 07387328..f3d531ab 100755..100644 --- a/CPP/7zip/UI/FileManager/NetFolder.cpp +++ b/CPP/7zip/UI/FileManager/NetFolder.cpp @@ -2,7 +2,7 @@ #include "StdAfx.h" -#include "Windows/PropVariant.h" +#include "../../../Windows/PropVariant.h" #include "../../PropID.h" @@ -13,23 +13,23 @@ using namespace NWindows; using namespace NNet; -static const STATPROPSTG kProps[] = +static const PROPID kProps[] = { - { NULL, kpidName, VT_BSTR}, - { NULL, kpidLocalName, VT_BSTR}, - { NULL, kpidComment, VT_BSTR}, - { NULL, kpidProvider, VT_BSTR} + kpidName, + kpidLocalName, + kpidComment, + kpidProvider }; void CNetFolder::Init(const UString &path) { /* - if (path.Length() > 2) + if (path.Len() > 2) { if (path[0] == L'\\' && path[1] == L'\\') { CResource netResource; - netResource.RemoteName = GetSystemString(path.Left(path.Length() - 1)); + netResource.RemoteName = GetSystemString(path.Left(path.Len() - 1)); netResource.Scope = RESOURCE_GLOBALNET; netResource.Type = RESOURCETYPE_DISK; netResource.DisplayType = RESOURCEDISPLAYTYPE_SERVER; @@ -42,7 +42,8 @@ void CNetFolder::Init(const UString &path) */ CResourceW resource; resource.RemoteNameIsDefined = true; - resource.RemoteName = path.Left(path.Length() - 1); + if (!path.IsEmpty()) + resource.RemoteName.SetFrom(path, path.Len() - 1); resource.ProviderIsDefined = false; resource.LocalNameIsDefined = false; resource.CommentIsDefined = false; @@ -114,7 +115,7 @@ STDMETHODIMP CNetFolder::LoadItems() if (pos >= 0) { // _path = resource.Name.Left(pos + 1); - resource.Name = resource.Name.Mid(pos + 1); + resource.Name.DeleteFrontal(pos + 1); } _items.Add(resource); } |