Adding a Set() method for copying a variant over to the ScopedVariant....

base/scoped_variant_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/scoped_variant_win.h"
 #include "base/logging.h"
 
 // Global, const instance of an empty variant.
 const VARIANT ScopedVariant::kEmptyVariant = { VT_EMPTY };
 
@@ skipping 10 matching lines @@
 ScopedVariant::ScopedVariant(const wchar_t* str, UINT length) {
   var_.vt = VT_BSTR;
   var_.bstrVal = ::SysAllocStringLen(str, length);
 }
 
 ScopedVariant::ScopedVariant(int value, VARTYPE vt) {
   var_.vt = vt;
   var_.lVal = value;
 }
 
+ScopedVariant::ScopedVariant(IDispatch* dispatch) {
+  var_.vt = VT_EMPTY;
+  Set(dispatch);
+}
+
+ScopedVariant::ScopedVariant(IUnknown* unknown) {
+  var_.vt = VT_EMPTY;
+  Set(unknown);
+}
+
+ScopedVariant::ScopedVariant(const VARIANT& var) {
+  var_.vt = VT_EMPTY;
+  Set(var);
+}
+
 void ScopedVariant::Reset(const VARIANT& var) {
   if (&var != &var_) {
     ::VariantClear(&var_);
     var_ = var;
   }
 }
 
 VARIANT ScopedVariant::Release() {
   VARIANT var = var_;
   var_.vt = VT_EMPTY;
@@ skipping 139 matching lines @@
   DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
   if (SUCCEEDED(::SafeArrayGetVartype(array, &var_.vt))) {
     var_.vt |= VT_ARRAY;
     var_.parray = array;
   } else {
     DCHECK(array == NULL) << "Unable to determine safearray vartype";
     var_.vt = VT_EMPTY;
   }
 }
 
+void ScopedVariant::Set(const VARIANT& var) {
+  DCHECK(!IsLeakableVarType(var_.vt)) << "leaking variant: " << var_.vt;
+  if (FAILED(::VariantCopy(&var_, &var))) {
+    DLOG(ERROR) << "VariantCopy failed";
+    var_.vt = VT_EMPTY;
+  }
+}
+
+ScopedVariant& ScopedVariant::operator=(const VARIANT& var) {
+  if (&var != &var_) {
+    VariantClear(&var_);
+    Set(var);
+  }
+  return *this;
+}
+
 bool ScopedVariant::IsLeakableVarType(VARTYPE vt) {
   bool leakable = false;
   switch (vt & VT_TYPEMASK) {
     case VT_BSTR:
     case VT_DISPATCH:
     // we treat VT_VARIANT as leakable to err on the safe side.
     case VT_VARIANT:
     case VT_UNKNOWN:
     case VT_SAFEARRAY:
 
@@ skipping 19 matching lines @@
       leakable = true;
       break;
   }
 
   if (!leakable && (vt & VT_ARRAY) != 0) {
     leakable = true;
   }
 
   return leakable;
 }