Improve support for multiselect list box accessibility on Windows.

base/win/enum_variant.cc

+// Copyright (c) 2011 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/win/enum_variant.h"
+
+#include "base/logging.h"
+
+namespace base {
+namespace win {
+
+EnumVariant::EnumVariant(unsigned long count)
+    : count_(count) {
+  items_.reset(new VARIANT[count_]);

[M-A Ruel, 2011/11/29 20:28:32]

Why not do it in the member constructor?

[dmazzoni, 2011/11/29 21:55:00]

You're right, done.

+  current_index_ = 0;
+}
+
+EnumVariant::~EnumVariant() {
+}
+
+VARIANT* EnumVariant::ItemAt(unsigned long index) {
+  DCHECK(index < count_);
+  return &items_[index];
+}
+
+ULONG STDMETHODCALLTYPE EnumVariant::AddRef() {
+  return IUnknownImpl::AddRef();
+}
+
+ULONG STDMETHODCALLTYPE EnumVariant::Release() {
+  return IUnknownImpl::Release();
+}
+
+STDMETHODIMP EnumVariant::QueryInterface(REFIID riid, void** ppv) {
+  if (riid == IID_IEnumVARIANT) {
+    *ppv = this;

[M-A Ruel, 2011/11/29 20:28:32]

In theory, you need to static_cast<IEnumVariant*>(this)

[dmazzoni, 2011/11/29 21:55:00]

Done.

+    AddRef();
+    return S_OK;
+  }
+
+  return IUnknownImpl::QueryInterface(riid, ppv);
+}
+
+STDMETHODIMP EnumVariant::Next(ULONG requested_count,
+                               VARIANT* out_elements,
+                               ULONG* out_elements_received) {
+  unsigned long count = requested_count;

[M-A Ruel, 2011/11/29 20:28:32]

unsigned long count = min(requested_count, count_ - current_index_);

[dmazzoni, 2011/11/29 21:55:00]

Done.

+  if (current_index_ + count > count_)
+    count = count_ - current_index_;
+
+  for (unsigned long i = 0; i < count; ++i)
+    out_elements[i] = items_[current_index_ + i];
+  current_index_ += count;
+  *out_elements_received = count;
+
+  return (count == requested_count ? S_OK : S_FALSE);
+}
+
+STDMETHODIMP EnumVariant::Skip(ULONG skip_count) {
+  unsigned long count = skip_count;
+  if (current_index_ + count > count_)
+    count = count_ - current_index_;
+
+  current_index_ += count;
+  return (count == skip_count ? S_OK : S_FALSE);
+}
+
+STDMETHODIMP EnumVariant::Reset() {
+  current_index_ = 0;
+  return S_OK;
+}
+
+STDMETHODIMP EnumVariant::Clone(IEnumVARIANT** out_cloned_object) {
+  EnumVariant* other = new EnumVariant(count_);
+  for (unsigned long i = 0; i < count_; ++i)
+    *other->ItemAt(i) = items_[i];

[M-A Ruel, 2011/11/29 20:28:32]

Why is this better than a memcpy or just implementing a private copy
constructor?

[dmazzoni, 2011/11/29 21:55:00]

Switched to memcpy.

+  other->Skip(current_index_);
+  *out_cloned_object = other;
+  return S_OK;
+}
+
+}  // namespace win
+}  // namespace base