Renaming the following files to include the _win suffix:

scoped_comptr*.*
scoped_bstr*.*

addition: time_unittest_win.cc -> time_win_unittest.cc

BUG=6409

Also renaming the scoped_comptr class to ScopedComPtr to conform with chromium style (and not boost as before).

Review URL: http://codereview.chromium.org/18054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8098 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 66 insertions, 0 deletions

diff --git a/base/scoped_bstr_win.cc b/base/scoped_bstr_win.cc
new file mode 100644
index 0000000..0e4efca
--- /dev/null
+++ b/base/scoped_bstr_win.cc
@@ -0,0 +1,66 @@
+// Copyright (c) 2006-2008 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_bstr_win.h"
+
+#include "base/logging.h"
+
+
+ScopedBstr::ScopedBstr(const wchar_t* non_bstr)
+    : bstr_(SysAllocString(non_bstr)) {
+}
+
+ScopedBstr::~ScopedBstr() {
+  COMPILE_ASSERT(sizeof(ScopedBstr) == sizeof(BSTR), ScopedBstrSize);
+  SysFreeString(bstr_);
+}
+
+void ScopedBstr::Reset(BSTR bstr) {
+  if (bstr != bstr_) {
+    // if |bstr_| is NULL, SysFreeString does nothing.
+    SysFreeString(bstr_);
+    bstr_ = bstr;
+  }
+}
+
+BSTR ScopedBstr::Release() {
+  BSTR bstr = bstr_;
+  bstr_ = NULL;
+  return bstr;
+}
+
+void ScopedBstr::Swap(ScopedBstr& bstr2) {
+  BSTR tmp = bstr_;
+  bstr_ = bstr2.bstr_;
+  bstr2.bstr_ = tmp;
+}
+
+BSTR* ScopedBstr::Receive() {
+  DCHECK(bstr_ == NULL) << "BSTR leak.";
+  return &bstr_;
+}
+
+BSTR ScopedBstr::Allocate(const wchar_t* wide_str) {
+  Reset(SysAllocString(wide_str));
+  return bstr_;
+}
+
+BSTR ScopedBstr::AllocateBytes(int bytes) {
+  Reset(SysAllocStringByteLen(NULL, bytes));

+  return bstr_;
+}
+
+void ScopedBstr::SetByteLen(uint32 bytes) {
+  DCHECK(bstr_ != NULL) << "attempting to modify a NULL bstr";
+  uint32* data = reinterpret_cast<uint32*>(bstr_);
+  data[-1] = bytes;
+}
+
+uint32 ScopedBstr::Length() const {
+  return SysStringLen(bstr_);
+}
+
+uint32 ScopedBstr::ByteLength() const {
+  return SysStringByteLen(bstr_);
+}