Fix for bug 380021 - implement IAccessibleValue, r=aaronlev, sr=neil

accessible/src/msaa/CAccessibleValue.cpp

@@ -0,0 +1,144 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "CAccessibleValue.h"
+
+#include "AccessibleValue_i.c"
+
+#include "nsIAccessibleValue.h"
+
+#include "nsCOMPtr.h"
+
+// IUnknown
+
+STDMETHODIMP
+CAccessibleValue::QueryInterface(REFIID iid, void** ppv)
+{
+  *ppv = NULL;
+
+  if (IID_IAccessibleValue == iid) {
+    nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+    if (!valueAcc)
+      return E_NOINTERFACE;
+
+    *ppv = NS_STATIC_CAST(IAccessibleValue*, this);
+    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    return S_OK;
+  }
+
+  return E_NOINTERFACE;
+}
+
+// IAccessibleValue
+
+STDMETHODIMP
+CAccessibleValue::get_currentValue(VARIANT *aCurrentValue)
+{
+  VariantInit(aCurrentValue);
+
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  if (!valueAcc)
+    return E_FAIL;
+
+  double currentValue = 0;
+  nsresult rv = valueAcc->GetCurrentValue(&currentValue);
+  if (NS_FAILED(rv))
+    return E_FAIL;
+
+  aCurrentValue->vt = VT_R8;
+  aCurrentValue->dblVal = currentValue;
+
+  return NS_OK;
+}
+
+STDMETHODIMP
+CAccessibleValue::setCurrentValue(VARIANT aValue)
+{
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  if (!valueAcc)
+    return E_FAIL;
+
+  if (aValue.vt != VT_R8)
+    return E_INVALIDARG;
+
+  nsresult rv = valueAcc->SetCurrentValue(aValue.dblVal);
+  return NS_FAILED(rv) ? E_FAIL : S_OK;
+}
+
+STDMETHODIMP
+CAccessibleValue::get_maximumValue(VARIANT *aMaximumValue)
+{
+  VariantInit(aMaximumValue);
+
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  if (!valueAcc)
+    return E_FAIL;
+
+  double maximumValue = 0;
+  nsresult rv = valueAcc->GetMaximumValue(&maximumValue);
+  if (NS_FAILED(rv))
+    return E_FAIL;
+
+  aMaximumValue->vt = VT_R8;
+  aMaximumValue->dblVal = maximumValue;
+
+  return NS_OK;
+}
+
+STDMETHODIMP
+CAccessibleValue::get_minimumValue(VARIANT *aMinimumValue)
+{
+  VariantInit(aMinimumValue);
+
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  if (!valueAcc)
+    return E_FAIL;
+
+  double minimumValue = 0;
+  nsresult rv = valueAcc->GetMinimumValue(&minimumValue);
+  if (NS_FAILED(rv))
+    return E_FAIL;
+
+  aMinimumValue->vt = VT_R8;
+  aMinimumValue->dblVal = minimumValue;
+
+  return NS_OK;
+}
+

accessible/src/msaa/CAccessibleValue.h

@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Alexander Surkov <surkov.alexander@gmail.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _ACCESSIBLE_VALUE_H
+#define _ACCESSIBLE_VALUE_H
+
+#include "nsISupports.h"
+
+#include "AccessibleValue.h"
+
+class CAccessibleValue: public nsISupports,
+                        public IAccessibleValue
+{
+public:
+
+  // IUnknown
+  STDMETHODIMP QueryInterface(REFIID, void**);
+
+  // IAccessibleValue
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_currentValue(
+      /* [retval][out] */ VARIANT *currentValue);
+
+  virtual HRESULT STDMETHODCALLTYPE setCurrentValue(
+      /* [in] */ VARIANT value);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_maximumValue(
+      /* [retval][out] */ VARIANT *maximumValue);
+
+  virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_minimumValue(
+      /* [retval][out] */ VARIANT *minimumValue);
+
+};
+
+#endif
+

accessible/src/msaa/Makefile.in

@@ -80,6 +80,7 @@ CPPSRCS = \
   CAccessibleText.cpp \
   CAccessibleEditableText.cpp \
   CAccessibleTable.cpp \
+  CAccessibleValue.cpp \
   $(NULL)
 
 EXPORTS = \
@@ -96,6 +97,7 @@ EXPORTS = \
   CAccessibleText.h \
   CAccessibleEditableText.h \
   CAccessibleTable.h \
+  CAccessibleValue.h \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

accessible/src/msaa/nsAccessibleWrap.cpp

@@ -120,6 +120,12 @@ STDMETHODIMP nsAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   else if (IID_IAccessibleAction == iid)
     *ppv = NS_STATIC_CAST(IAccessibleAction*, this);
 
+  if (NULL == *ppv) {
+    HRESULT hr = CAccessibleValue::QueryInterface(iid, ppv);
+    if (SUCCEEDED(hr))
+      return hr;
+  }
+
   if (NULL == *ppv)
     return nsAccessNodeWrap::QueryInterface(iid, ppv);
 

accessible/src/msaa/nsAccessibleWrap.h

@@ -47,6 +47,7 @@
 #include "nsAccessible.h"
 #include "Accessible2.h"
 #include "AccessibleAction.h"
+#include "CAccessibleValue.h"
 
 #define DECL_IUNKNOWN_INHERITED                                               \
 public:                                                                       \
@@ -88,6 +89,7 @@ Class::QueryInterface(REFIID iid, void** ppv)                                 \
 
 
 class nsAccessibleWrap : public nsAccessible,
+                         public CAccessibleValue,
                          public IAccessible2,
                          public IAccessibleAction,
                          public IEnumVARIANT,