Merge pull request #22 from jpgaribotti/master

Improvements in Citrix environment

Author: martineo14

DriveFusion/DriveItemPropertyStore.cpp

@@ -64,21 +64,14 @@ void CDriveItemPropertyStore::FinalRelease()
 
 HRESULT CDriveItemPropertyStore::_Initialize(const PROPERTYKEY *rgKeys, UINT cKeys, GETPROPERTYSTOREFLAGS flags, CGDriveShlExt* gDriveShlExt, PCUITEMID_CHILD pidl)
 {
+  HRESULT hr = S_OK;
   Log::WriteOutput(LogType::Debug, L"CDriveItemPropertyStore::_Initialize(const PROPERTYKEY *rgKeys, UINT cKeys, GETPROPERTYSTOREFLAGS flags, __in IShellFolder *psf, PCUITEMID_CHILD pidl)");
 
-  HRESULT hr = CIdList::CloneChild(pidl, _cpidl);
-
-  if (SUCCEEDED(hr))
-  {
-    _gDriveShlExt = gDriveShlExt;
-
-    hr = _InitializePropertyStore(rgKeys, cKeys, flags);
-
-    if (SUCCEEDED(hr))
-    {
-      _gDriveShlExt->AddRef();
-    }
-  }
+  CHECK_HR(CIdList::CloneChild(pidl, _cpidl));
+  
+  _gDriveShlExt = gDriveShlExt;
+  CHECK_HR(_InitializePropertyStore(rgKeys, cKeys, flags));
+  _gDriveShlExt->AddRef();
 
   return hr;
 }

DriveFusion/DriveItemPropertyStoreFactory.cpp

@@ -65,17 +65,15 @@ void CDriveItemPropertyStoreFactory::FinalRelease()
 
 HRESULT CDriveItemPropertyStoreFactory::_Initialize(CGDriveShlExt* gDriveShlExt, PCUITEMID_CHILD pidl)
 {
+  HRESULT hr = S_OK;
   Log::WriteOutput(LogType::Debug, L"CDriveItemPropertyStoreFactory::_Initialize()");
 
-  HRESULT hr = CIdList::CloneChild(pidl, _cpidl);
-
-  if (SUCCEEDED(hr))
-  {
-    _gDriveShlExt = gDriveShlExt;
+  CHECK_HR(CIdList::CloneChild(pidl, _cpidl));
 
-    _gDriveShlExt->AddRef();
-  }
-  return S_OK;
+  _gDriveShlExt = gDriveShlExt;
+  _gDriveShlExt->AddRef();
+  
+  return hr;
 }
 
 STDMETHODIMP CDriveItemPropertyStoreFactory::GetPropertyStore(GETPROPERTYSTOREFLAGS flags, __in_opt IUnknown * /*punkFactory*/, REFIID riid, __deref_out void **ppv)

DriveFusion/FileManager.cpp

@@ -160,8 +160,8 @@ FileInfo* FileManager::GetFile(std::wstring id, bool updateCache, bool getChildr
   // public function should all be locked
   Scoped_Lock serviceLock(&_mutex);
 
-  if (GetLog() == NULL)
-    return NULL;
+  if (GetLog() == nullptr)
+    return nullptr;
 
   if (IsRootId(id) && RootId.length() > 0)
   {