Remove uses of PropVariantTo*; removing the need to DelayLoad propsys.dll.

base/win/scoped_propvariant.h

+// Copyright (c) 2013 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.
+
+#ifndef BASE_WIN_SCOPED_PROPVARIANT_H_
+#define BASE_WIN_SCOPED_PROPVARIANT_H_
+
+#include <propidl.h>
+

[grt (UTC plus 2), 2013/01/10 03:24:05]

#include "base/base_export.h"
(for BASE_EXPORT)
#include "base/basictypes.h"
(for DISALLOW_COPY_AND_ASSIGN)
#include "base/logging.h"
(for DCHECK)

[gab, 2013/01/10 15:30:42]

Oh oops, good catch!

+namespace base {
+namespace win {
+
+// A PROPVARIANT that is automatically initialized and cleared upon respective
+// construction and destruction of this class.
+class ScopedPropVariant {

[grt (UTC plus 2), 2013/01/10 03:24:05]

class BASE_EXPORT ScopedPropVariant {

[gab, 2013/01/10 15:30:42]

This won't link, as discussed this is probably because nothing in base actually
uses any of these methods and thus it doesn't get linked in base.dll (and the
BASE_EXPORT) prevents the inlining of those methods where the header is
included.

FAILED: D:\depot_tools\python_bin\python.exe gyp-win-tool link-wrapper
environment.x86 link.exe /nologo /OUT:base_unittests.exe
/PDB:base_unittests.exe.pdb @base_unittests.exe.rsp &&
D:\depot_tools\python_bin\python.exe gyp-win-tool manifest-wrapper
environment.x86 mt.exe -nologo -manifest
obj\base\base_unittests.base_unittests.exe.intermediate.manifest
-out:base_unittests.exe.manifest
test_support_base.lib(test_support_base.test_shortcut_win.obj) : error LNK2019:
unresolved external symbol "__declspec(dllimport) public: __thiscall
base::win::ScopedPropVariant::~ScopedPropVariant(void)"
(__imp_??1ScopedPropVariant@win@base@@QAE@XZ) referenced in function "void
__cdecl base::win::ValidateShortcut(class FilePath const &,struct
base::win::ShortcutProperties const &)"
(?ValidateShortcut@win@base@@YAXABVFilePath@@ABUShortcutProperties@12@@Z)

test_support_base.lib(test_support_base.test_shortcut_win.obj) : error LNK2019:
unresolved external symbol "__declspec(dllimport) public: struct tagPROPVARIANT
const & __thiscall base::win::ScopedPropVariant::get(void)const "
(__imp_?get@ScopedPropVariant@win@base@@QBEABUtagPROPVARIANT@@XZ) referenced in
function "void __cdecl base::win::ValidateShortcut(class FilePath const &,struct
base::win::ShortcutProperties const &)"
(?ValidateShortcut@win@base@@YAXABVFilePath@@ABUShortcutProperties@12@@Z)

test_support_base.lib(test_support_base.test_shortcut_win.obj) : error LNK2019:
unresolved external symbol "__declspec(dllimport) public: struct tagPROPVARIANT
* __thiscall base::win::ScopedPropVariant::Receive(void)"
(__imp_?Receive@ScopedPropVariant@win@base@@QAEPAUtagPROPVARIANT@@XZ) referenced
in function "void __cdecl base::win::ValidateShortcut(class FilePath const
&,struct base::win::ShortcutProperties const &)"
(?ValidateShortcut@win@base@@YAXABVFilePath@@ABUShortcutProperties@12@@Z)


test_support_base.lib(test_support_base.test_shortcut_win.obj) : error LNK2019:
unresolved external symbol "__declspec(dllimport) public: __thiscall
base::win::ScopedPropVariant::ScopedPropVariant(void)"
(__imp_??0ScopedPropVariant@win@base@@QAE@XZ) referenced in function "void
__cdecl base::win::ValidateShortcut(class FilePath const &,struct
base::win::ShortcutProperties const &)"
(?ValidateShortcut@win@base@@YAXABVFilePath@@ABUShortcutProperties@12@@Z)

base_unittests.exe : fatal error LNK1120: 4 unresolved externals

+ public:
+  ScopedPropVariant() {
+    PropVariantInit(&pv_);
+  }
+  ~ScopedPropVariant() {
+    HRESULT result = PropVariantClear(&pv_);
+    DCHECK_EQ(result, S_OK);

[gab, 2013/01/09 20:43:40]

I could simply call Reset() here, but I felt it might be safer that the
destructor doesn't depend on the implementation of Reset()... what do you think?

[grt (UTC plus 2), 2013/01/10 03:24:05]

My opinion: call Reset().

[gab, 2013/01/10 15:30:42]

Done.

+  }
+
+  PROPVARIANT* Receive() {
+    DCHECK_EQ(pv_.vt, VT_EMPTY);
+    return &pv_;
+  }
+
+  void Reset() {
+    HRESULT result = PropVariantClear(&pv_);
+    DCHECK_EQ(result, S_OK);
+  }
+
+  // Allow direct read-only access to the members of |pv_| with the -> operator.
+  const PROPVARIANT* operator->() const { return &pv_; }
+
+  const PROPVARIANT* operator&() const { return &pv_; }
+
+ private:
+  PROPVARIANT pv_;
+};

[grt (UTC plus 2), 2013/01/10 03:24:05]

DISALLOW_COPY_AND_ASSIGN(ScopedPropVariant);
also probably good to do the same for operator== and operator!=

[gab, 2013/01/10 15:30:42]

Done.

+
+}  // namespace win
+}  // namespace base
+
+#endif  // BASE_WIN_SCOPED_PROPVARIANT_H_