wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798205 - move ia2 files under ia2 directory, r=tbsaunde

Browse Source 
--HG--
rename : accessible/src/msaa/ia2AccessibleAction.cpp => accessible/src/windows/ia2/ia2AccessibleAction.cpp
rename : accessible/src/msaa/ia2AccessibleAction.h => accessible/src/windows/ia2/ia2AccessibleAction.h
rename : accessible/src/msaa/ia2AccessibleComponent.cpp => accessible/src/windows/ia2/ia2AccessibleComponent.cpp
rename : accessible/src/msaa/ia2AccessibleComponent.h => accessible/src/windows/ia2/ia2AccessibleComponent.h
rename : accessible/src/msaa/ia2AccessibleEditableText.cpp => accessible/src/windows/ia2/ia2AccessibleEditableText.cpp
rename : accessible/src/msaa/ia2AccessibleEditableText.h => accessible/src/windows/ia2/ia2AccessibleEditableText.h
rename : accessible/src/msaa/ia2AccessibleHyperlink.cpp => accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp
rename : accessible/src/msaa/ia2AccessibleHyperlink.h => accessible/src/windows/ia2/ia2AccessibleHyperlink.h
rename : accessible/src/msaa/ia2AccessibleHypertext.cpp => accessible/src/windows/ia2/ia2AccessibleHypertext.cpp
rename : accessible/src/msaa/ia2AccessibleHypertext.h => accessible/src/windows/ia2/ia2AccessibleHypertext.h
rename : accessible/src/msaa/ia2AccessibleImage.cpp => accessible/src/windows/ia2/ia2AccessibleImage.cpp
rename : accessible/src/msaa/ia2AccessibleImage.h => accessible/src/windows/ia2/ia2AccessibleImage.h
rename : accessible/src/msaa/ia2AccessibleRelation.cpp => accessible/src/windows/ia2/ia2AccessibleRelation.cpp
rename : accessible/src/msaa/ia2AccessibleRelation.h => accessible/src/windows/ia2/ia2AccessibleRelation.h
rename : accessible/src/msaa/CAccessibleTable.cpp => accessible/src/windows/ia2/ia2AccessibleTable.cpp
rename : accessible/src/msaa/CAccessibleTable.h => accessible/src/windows/ia2/ia2AccessibleTable.h
rename : accessible/src/msaa/CAccessibleTableCell.cpp => accessible/src/windows/ia2/ia2AccessibleTableCell.cpp
rename : accessible/src/msaa/CAccessibleTableCell.h => accessible/src/windows/ia2/ia2AccessibleTableCell.h
rename : accessible/src/msaa/ia2AccessibleText.cpp => accessible/src/windows/ia2/ia2AccessibleText.cpp
rename : accessible/src/msaa/ia2AccessibleText.h => accessible/src/windows/ia2/ia2AccessibleText.h
rename : accessible/src/msaa/CAccessibleValue.cpp => accessible/src/windows/ia2/ia2AccessibleValue.cpp
rename : accessible/src/msaa/CAccessibleValue.h => accessible/src/windows/ia2/ia2AccessibleValue.h
This commit is contained in:
Alexander Surkov 2012-10-05 22:04:59 +09:00
parent 9b29da90ae
commit 490a3fb046
39 changed files with 227 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accessible/build/Makefile.in
View File

@ -33,7 +33,10 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
SHARED_LIBRARY_LIBS += ../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS += \
../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \
../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \
$(NULL)
endif
ifdef MOZ_XUL

1
accessible/src/base/Makefile.in
View File

@ -93,6 +93,7 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
LOCAL_INCLUDES += \
-I$(srcdir)/../msaa \
-I$(srcdir)/../windows/ia2 \
$(NULL)
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

1
accessible/src/html/Makefile.in
View File

@ -50,6 +50,7 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
LOCAL_INCLUDES += \
-I$(srcdir)/../msaa \
-I$(srcdir)/../windows/ia2 \
$(NULL)
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

4
accessible/src/msaa/ARIAGridAccessibleWrap.cpp
View File

@ -19,7 +19,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(ARIAGridAccessibleWrap,
AccessibleWrap,
CAccessibleTable)
ia2AccessibleTable)
////////////////////////////////////////////////////////////////////////////////
@ -31,5 +31,5 @@ NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(ARIAGridCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)
ia2AccessibleTableCell)

8
accessible/src/msaa/ARIAGridAccessibleWrap.h
View File

@ -9,8 +9,8 @@
#define MOZILLA_A11Y_ARIAGRIDACCESSIBLEWRAP_H
#include "ARIAGridAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
#include "ia2AccessibleTable.h"
#include "ia2AccessibleTableCell.h"
namespace mozilla {
namespace a11y {
@ -20,7 +20,7 @@ namespace a11y {
* IAccessibleTable2 interfaces.
*/
class ARIAGridAccessibleWrap : public ARIAGridAccessible,
public CAccessibleTable
public ia2AccessibleTable
{
public:
ARIAGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
@ -38,7 +38,7 @@ public:
* IAccessibleTableCell interface.
*/
class ARIAGridCellAccessibleWrap : public ARIAGridCellAccessible,
public CAccessibleTableCell
public ia2AccessibleTableCell
{
public:
ARIAGridCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :

2
accessible/src/msaa/AccessibleWrap.cpp
View File

@ -107,7 +107,7 @@ __try {
}
if (NULL == *ppv) {
HRESULT hr = CAccessibleValue::QueryInterface(iid, ppv);
HRESULT hr = ia2AccessibleValue::QueryInterface(iid, ppv);
if (SUCCEEDED(hr))
return hr;
}

4
accessible/src/msaa/AccessibleWrap.h
View File

@ -15,7 +15,7 @@
#include "Accessible2.h"
#include "ia2AccessibleComponent.h"
#include "ia2AccessibleHyperlink.h"
#include "CAccessibleValue.h"
#include "ia2AccessibleValue.h"
#define DECL_IUNKNOWN \
public: \
@ -119,7 +119,7 @@ __try { \
class AccessibleWrap : public Accessible,
public ia2AccessibleComponent,
public ia2AccessibleHyperlink,
public CAccessibleValue,
public ia2AccessibleValue,
public IAccessible2
{
public: // construction, destruction

6
accessible/src/msaa/HTMLTableAccessibleWrap.cpp
View File

@ -18,7 +18,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableAccessibleWrap,
AccessibleWrap,
CAccessibleTable)
ia2AccessibleTable)
////////////////////////////////////////////////////////////////////////////////
@ -30,7 +30,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)
ia2AccessibleTableCell)
////////////////////////////////////////////////////////////////////////////////
@ -42,4 +42,4 @@ NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableHeaderCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableHeaderCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)
ia2AccessibleTableCell)

10
accessible/src/msaa/HTMLTableAccessibleWrap.h
View File

@ -10,8 +10,8 @@
#include "HTMLTableAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
#include "ia2AccessibleTable.h"
#include "ia2AccessibleTableCell.h"
namespace mozilla {
namespace a11y {
@ -21,7 +21,7 @@ namespace a11y {
* and IAccessibleTable2 interfaces.
*/
class HTMLTableAccessibleWrap : public HTMLTableAccessible,
public CAccessibleTable
public ia2AccessibleTable
{
public:
HTMLTableAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
@ -40,7 +40,7 @@ public:
* IAccessibleTableCell interface.
*/
class HTMLTableCellAccessibleWrap : public HTMLTableCellAccessible,
public CAccessibleTableCell
public ia2AccessibleTableCell
{
public:
HTMLTableCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
@ -59,7 +59,7 @@ public:
* IAccessibleTableCell interface.
*/
class HTMLTableHeaderCellAccessibleWrap : public HTMLTableHeaderCellAccessible,
public CAccessibleTableCell
public ia2AccessibleTableCell
{
public:
HTMLTableHeaderCellAccessibleWrap(nsIContent* aContent,

19
accessible/src/msaa/Makefile.in
View File

@ -26,19 +26,8 @@ CPPSRCS = \
nsAccessNodeWrap.cpp \
nsHTMLWin32ObjectAccessible.cpp \
nsWinUtils.cpp \
CAccessibleTable.cpp \
CAccessibleTableCell.cpp \
CAccessibleValue.cpp \
Compatibility.cpp \
EnumVariant.cpp \
ia2AccessibleAction.cpp \
ia2AccessibleComponent.cpp \
ia2AccessibleEditableText.cpp \
ia2AccessibleImage.cpp \
ia2AccessibleHyperlink.cpp \
ia2AccessibleHypertext.cpp \
ia2AccessibleRelation.cpp \
ia2AccessibleText.cpp \
RootAccessibleWrap.cpp \
TextLeafAccessibleWrap.cpp \
$(NULL)
@ -52,13 +41,6 @@ CPPSRCS += \
endif
EXPORTS = \
CAccessibleValue.h \
ia2AccessibleAction.h \
ia2AccessibleComponent.h \
ia2AccessibleEditableText.h \
ia2AccessibleHyperlink.h \
ia2AccessibleHypertext.h \
ia2AccessibleText.h \
nsAccessNodeWrap.h \
$(NULL)
@ -84,6 +66,7 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../html \
-I$(srcdir)/../xpcom \
-I$(srcdir)/../xul \
-I$(srcdir)/../windows/ia2 \
-I$(srcdir)/../windows/uia \
-I$(srcdir)/../../../content/base/src \
-I$(srcdir)/../../../content/events/src \

4
accessible/src/msaa/XULListboxAccessibleWrap.cpp
View File

@ -21,7 +21,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(XULListboxAccessibleWrap,
XULListboxAccessible)
IMPL_IUNKNOWN_QUERY_HEAD(XULListboxAccessibleWrap)
IMPL_IUNKNOWN_QUERY_CLASS_COND(CAccessibleTable, IsMulticolumn());
IMPL_IUNKNOWN_QUERY_CLASS_COND(ia2AccessibleTable, IsMulticolumn());
IMPL_IUNKNOWN_QUERY_CLASS(AccessibleWrap)
IMPL_IUNKNOWN_QUERY_TAIL
@ -41,4 +41,4 @@ NS_IMPL_ISUPPORTS_INHERITED0(XULListCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(XULListCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)
ia2AccessibleTableCell)

8
accessible/src/msaa/XULListboxAccessibleWrap.h
View File

@ -8,8 +8,8 @@
#include "XULListboxAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
#include "ia2AccessibleTable.h"
#include "ia2AccessibleTableCell.h"
namespace mozilla {
namespace a11y {
@ -19,7 +19,7 @@ namespace a11y {
* IAccessibleTable and IAccessibleTable2 interfaces.
*/
class XULListboxAccessibleWrap : public XULListboxAccessible,
public CAccessibleTable
public ia2AccessibleTable
{
public:
XULListboxAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);
@ -36,7 +36,7 @@ public:
* IAccessibleTableCell interface.
*/
class XULListCellAccessibleWrap : public XULListCellAccessible,
public CAccessibleTableCell
public ia2AccessibleTableCell
{
public:
XULListCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);

4
accessible/src/msaa/XULTreeGridAccessibleWrap.cpp
View File

@ -22,7 +22,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(XULTreeGridAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(XULTreeGridAccessibleWrap,
AccessibleWrap,
CAccessibleTable)
ia2AccessibleTable)
////////////////////////////////////////////////////////////////////////////////
@ -46,4 +46,4 @@ NS_IMPL_ISUPPORTS_INHERITED0(XULTreeGridCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(XULTreeGridCellAccessibleWrap,
AccessibleWrap,
CAccessibleTableCell)
ia2AccessibleTableCell)

8
accessible/src/msaa/XULTreeGridAccessibleWrap.h
View File

@ -8,8 +8,8 @@
#include "XULTreeGridAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
#include "ia2AccessibleTable.h"
#include "ia2AccessibleTableCell.h"
namespace mozilla {
namespace a11y {
@ -19,7 +19,7 @@ namespace a11y {
* IAccessibleTable and IAccessibleTable2 interfaces.
*/
class XULTreeGridAccessibleWrap : public XULTreeGridAccessible,
public CAccessibleTable
public ia2AccessibleTable
{
public:
XULTreeGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);
@ -36,7 +36,7 @@ public:
* IAccessibleTableCell interface.
*/
class XULTreeGridCellAccessibleWrap : public XULTreeGridCellAccessible,
public CAccessibleTableCell
public ia2AccessibleTableCell
{
public:
XULTreeGridCellAccessibleWrap(nsIContent* aContent,

4
accessible/src/windows/Makefile.in
View File

@ -10,7 +10,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS += uia \
DIRS += \
ia2 \
uia \
$(null)
include $(topsrcdir)/config/rules.mk

60
accessible/src/windows/ia2/Makefile.in Normal file
View File

@ -0,0 +1,60 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = accessibility
LIBRARY_NAME = accessibility_toolkit_ia2_s
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
CPPSRCS += \
ia2AccessibleAction.cpp \
ia2AccessibleComponent.cpp \
ia2AccessibleEditableText.cpp \
ia2AccessibleHyperlink.cpp \
ia2AccessibleHypertext.cpp \
ia2AccessibleImage.cpp \
ia2AccessibleRelation.cpp \
ia2AccessibleTable.cpp \
ia2AccessibleTableCell.cpp \
ia2AccessibleText.cpp \
ia2AccessibleValue.cpp \
$(NULL)
EXPORTS = \
ia2AccessibleValue.h \
ia2AccessibleAction.h \
ia2AccessibleComponent.h \
ia2AccessibleEditableText.h \
ia2AccessibleHyperlink.h \
ia2AccessibleHypertext.h \
ia2AccessibleText.h \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../../base \
-I$(srcdir)/../../generic \
-I$(srcdir)/../../html \
-I$(srcdir)/../../msaa \
-I$(srcdir)/../../xpcom \
-I$(srcdir)/../../xul \
$(NULL)
ifdef A11Y_LOG
DEFINES += -DA11Y_LOG
endif

0
accessible/src/msaa/ia2AccessibleAction.cpp → accessible/src/windows/ia2/ia2AccessibleAction.cpp
View File

0
accessible/src/msaa/ia2AccessibleAction.h → accessible/src/windows/ia2/ia2AccessibleAction.h
View File

0
accessible/src/msaa/ia2AccessibleComponent.cpp → accessible/src/windows/ia2/ia2AccessibleComponent.cpp
View File

0
accessible/src/msaa/ia2AccessibleComponent.h → accessible/src/windows/ia2/ia2AccessibleComponent.h
View File

0
accessible/src/msaa/ia2AccessibleEditableText.cpp → accessible/src/windows/ia2/ia2AccessibleEditableText.cpp
View File

3
accessible/src/msaa/ia2AccessibleEditableText.h → accessible/src/windows/ia2/ia2AccessibleEditableText.h
View File

@ -46,9 +46,6 @@ public:
/* [in] */ long startOffset,
/* [in] */ long endOffset,
/* [in] */ BSTR *attributes);
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
};
#endif

0
accessible/src/msaa/ia2AccessibleHyperlink.cpp → accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp
View File

4
accessible/src/msaa/ia2AccessibleHyperlink.h → accessible/src/windows/ia2/ia2AccessibleHyperlink.h
View File

@ -40,10 +40,6 @@ public:
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_valid(
/* [retval][out] */ boolean *valid);
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
};
#endif

0
accessible/src/msaa/ia2AccessibleHypertext.cpp → accessible/src/windows/ia2/ia2AccessibleHypertext.cpp
View File

3
accessible/src/msaa/ia2AccessibleHypertext.h → accessible/src/windows/ia2/ia2AccessibleHypertext.h
View File

@ -32,9 +32,6 @@ public:
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_hyperlinkIndex(
/* [in] */ long charIndex,
/* [retval][out] */ long* hyperlinkIndex);
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
};
#endif

0
accessible/src/msaa/ia2AccessibleImage.cpp → accessible/src/windows/ia2/ia2AccessibleImage.cpp
View File

0
accessible/src/msaa/ia2AccessibleImage.h → accessible/src/windows/ia2/ia2AccessibleImage.h
View File

0
accessible/src/msaa/ia2AccessibleRelation.cpp → accessible/src/windows/ia2/ia2AccessibleRelation.cpp
View File

0
accessible/src/msaa/ia2AccessibleRelation.h → accessible/src/windows/ia2/ia2AccessibleRelation.h
View File

108
accessible/src/msaa/CAccessibleTable.cpp → accessible/src/windows/ia2/ia2AccessibleTable.cpp
View File

@ -5,7 +5,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "CAccessibleTable.h"
#include "ia2AccessibleTable.h"
#include "Accessible2.h"
#include "AccessibleTable_i.c"
@ -24,12 +24,12 @@
using namespace mozilla::a11y;
#define CANT_QUERY_ASSERTION_MSG \
"Subclass of CAccessibleTable doesn't implement nsIAccessibleTable"\
"Subclass of ia2AccessibleTable doesn't implement nsIAccessibleTable"\
// IUnknown
STDMETHODIMP
CAccessibleTable::QueryInterface(REFIID iid, void** ppv)
ia2AccessibleTable::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
@ -53,7 +53,7 @@ CAccessibleTable::QueryInterface(REFIID iid, void** ppv)
// IAccessibleTable
STDMETHODIMP
CAccessibleTable::get_accessibleAt(long aRow, long aColumn,
ia2AccessibleTable::get_accessibleAt(long aRow, long aColumn,
IUnknown **aAccessible)
{
__try {
@ -86,7 +86,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_caption(IUnknown **aAccessible)
ia2AccessibleTable::get_caption(IUnknown** aAccessible)
{
__try {
*aAccessible = NULL;
@ -121,8 +121,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_childIndex(long aRowIndex, long aColumnIndex,
long *aChildIndex)
ia2AccessibleTable::get_childIndex(long aRowIndex, long aColumnIndex,
long* aChildIndex)
{
__try {
*aChildIndex = 0;
@ -146,7 +146,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_columnDescription(long aColumn, BSTR *aDescription)
ia2AccessibleTable::get_columnDescription(long aColumn, BSTR* aDescription)
{
__try {
*aDescription = NULL;
@ -172,8 +172,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_columnExtentAt(long aRow, long aColumn,
long *nColumnsSpanned)
ia2AccessibleTable::get_columnExtentAt(long aRow, long aColumn,
long* nColumnsSpanned)
{
__try {
*nColumnsSpanned = 0;
@ -196,8 +196,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_columnHeader(IAccessibleTable **aAccessibleTable,
long *aStartingRowIndex)
ia2AccessibleTable::get_columnHeader(IAccessibleTable** aAccessibleTable,
long* aStartingRowIndex)
{
__try {
*aAccessibleTable = NULL;
@ -209,7 +209,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_columnIndex(long aChildIndex, long *aColumnIndex)
ia2AccessibleTable::get_columnIndex(long aChildIndex, long* aColumnIndex)
{
__try {
*aColumnIndex = 0;
@ -233,7 +233,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_nColumns(long *aColumnCount)
ia2AccessibleTable::get_nColumns(long* aColumnCount)
{
__try {
*aColumnCount = 0;
@ -257,7 +257,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_nRows(long *aRowCount)
ia2AccessibleTable::get_nRows(long* aRowCount)
{
__try {
*aRowCount = 0;
@ -281,7 +281,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_nSelectedChildren(long *aChildCount)
ia2AccessibleTable::get_nSelectedChildren(long* aChildCount)
{
__try {
*aChildCount = 0;
@ -304,7 +304,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_nSelectedColumns(long *aColumnCount)
ia2AccessibleTable::get_nSelectedColumns(long* aColumnCount)
{
__try {
*aColumnCount = 0;
@ -327,7 +327,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_nSelectedRows(long *aRowCount)
ia2AccessibleTable::get_nSelectedRows(long* aRowCount)
{
__try {
*aRowCount = 0;
@ -350,7 +350,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_rowDescription(long aRow, BSTR *aDescription)
ia2AccessibleTable::get_rowDescription(long aRow, BSTR* aDescription)
{
__try {
*aDescription = NULL;
@ -376,7 +376,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_rowExtentAt(long aRow, long aColumn, long *aNRowsSpanned)
ia2AccessibleTable::get_rowExtentAt(long aRow, long aColumn,
long* aNRowsSpanned)
{
__try {
*aNRowsSpanned = 0;
@ -399,8 +400,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_rowHeader(IAccessibleTable **aAccessibleTable,
long *aStartingColumnIndex)
ia2AccessibleTable::get_rowHeader(IAccessibleTable** aAccessibleTable,
long* aStartingColumnIndex)
{
__try {
*aAccessibleTable = NULL;
@ -412,7 +413,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_rowIndex(long aChildIndex, long *aRowIndex)
ia2AccessibleTable::get_rowIndex(long aChildIndex, long* aRowIndex)
{
__try {
*aRowIndex = 0;
@ -436,8 +437,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_selectedChildren(long aMaxChildren, long **aChildren,
long *aNChildren)
ia2AccessibleTable::get_selectedChildren(long aMaxChildren, long** aChildren,
long* aNChildren)
{
__try {
return GetSelectedItems(aChildren, aNChildren, ITEMSTYPE_CELLS);
@ -448,8 +449,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_selectedColumns(long aMaxColumns, long **aColumns,
long *aNColumns)
ia2AccessibleTable::get_selectedColumns(long aMaxColumns, long** aColumns,
long* aNColumns)
{
__try {
return GetSelectedItems(aColumns, aNColumns, ITEMSTYPE_COLUMNS);
@ -460,7 +461,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_selectedRows(long aMaxRows, long **aRows, long *aNRows)
ia2AccessibleTable::get_selectedRows(long aMaxRows, long** aRows, long* aNRows)
{
__try {
return GetSelectedItems(aRows, aNRows, ITEMSTYPE_ROWS);
@ -471,7 +472,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_summary(IUnknown **aAccessible)
ia2AccessibleTable::get_summary(IUnknown** aAccessible)
{
__try {
*aAccessible = NULL;
@ -486,7 +487,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_isColumnSelected(long aColumn, boolean *aIsSelected)
ia2AccessibleTable::get_isColumnSelected(long aColumn, boolean* aIsSelected)
{
__try {
*aIsSelected = false;
@ -509,7 +510,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_isRowSelected(long aRow, boolean *aIsSelected)
ia2AccessibleTable::get_isRowSelected(long aRow, boolean* aIsSelected)
{
__try {
*aIsSelected = false;
@ -532,7 +533,8 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_isSelected(long aRow, long aColumn, boolean *aIsSelected)
ia2AccessibleTable::get_isSelected(long aRow, long aColumn,
boolean* aIsSelected)
{
__try {
*aIsSelected = false;
@ -555,7 +557,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::selectRow(long aRow)
ia2AccessibleTable::selectRow(long aRow)
{
__try {
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
@ -571,7 +573,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::selectColumn(long aColumn)
ia2AccessibleTable::selectColumn(long aColumn)
{
__try {
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
@ -587,7 +589,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::unselectRow(long aRow)
ia2AccessibleTable::unselectRow(long aRow)
{
__try {
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
@ -603,7 +605,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::unselectColumn(long aColumn)
ia2AccessibleTable::unselectColumn(long aColumn)
{
__try {
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
@ -619,11 +621,11 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_rowColumnExtentsAtIndex(long aIndex, long *aRow,
long *aColumn,
long *aRowExtents,
long *aColumnExtents,
boolean *aIsSelected)
ia2AccessibleTable::get_rowColumnExtentsAtIndex(long aIndex, long* aRow,
long* aColumn,
long* aRowExtents,
long* aColumnExtents,
boolean* aIsSelected)
{
__try {
*aRow = 0;
@ -669,7 +671,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_modelChange(IA2TableModelChange *aModelChange)
ia2AccessibleTable::get_modelChange(IA2TableModelChange* aModelChange)
{
__try {
@ -681,19 +683,19 @@ __try {
// IAccessibleTable2
STDMETHODIMP
CAccessibleTable::get_cellAt(long row, long column, IUnknown **cell)
ia2AccessibleTable::get_cellAt(long aRow, long aColumn, IUnknown** aCell)
{
return get_accessibleAt(row, column, cell);
return get_accessibleAt(aRow, aColumn, aCell);
}
STDMETHODIMP
CAccessibleTable::get_nSelectedCells(long *cellCount)
ia2AccessibleTable::get_nSelectedCells(long* aCellCount)
{
return get_nSelectedChildren(cellCount);
return get_nSelectedChildren(aCellCount);
}
STDMETHODIMP
CAccessibleTable::get_selectedCells(IUnknown ***cells, long *nSelectedCells)
ia2AccessibleTable::get_selectedCells(IUnknown*** aCells, long* aNSelectedCells)
{
__try {
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
@ -706,7 +708,7 @@ __try {
if (NS_FAILED(rv))
return GetHRESULT(rv);
return nsWinUtils::ConvertToIA2Array(geckoCells, cells, nSelectedCells);
return nsWinUtils::ConvertToIA2Array(geckoCells, aCells, aNSelectedCells);
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(),
GetExceptionInformation())) {}
@ -715,7 +717,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_selectedColumns(long **aColumns, long *aNColumns)
ia2AccessibleTable::get_selectedColumns(long** aColumns, long* aNColumns)
{
__try {
return GetSelectedItems(aColumns, aNColumns, ITEMSTYPE_COLUMNS);
@ -726,7 +728,7 @@ __try {
}
STDMETHODIMP
CAccessibleTable::get_selectedRows(long **aRows, long *aNRows)
ia2AccessibleTable::get_selectedRows(long** aRows, long* aNRows)
{
__try {
return GetSelectedItems(aRows, aNRows, ITEMSTYPE_ROWS);
@ -737,11 +739,11 @@ __try {
}
////////////////////////////////////////////////////////////////////////////////
// CAccessibleTable public
// ia2AccessibleTable public
HRESULT
CAccessibleTable::GetSelectedItems(long **aItems, long *aItemsCount,
eItemsType aType)
ia2AccessibleTable::GetSelectedItems(long** aItems, long* aItemsCount,
eItemsType aType)
{
*aItemsCount = 0;

4
accessible/src/msaa/CAccessibleTable.h → accessible/src/windows/ia2/ia2AccessibleTable.h
View File

@ -13,8 +13,8 @@
#include "AccessibleTable.h"
#include "AccessibleTable2.h"
class CAccessibleTable: public IAccessibleTable,
public IAccessibleTable2
class ia2AccessibleTable : public IAccessibleTable,
public IAccessibleTable2
{
public:

84
accessible/src/msaa/CAccessibleTableCell.cpp → accessible/src/windows/ia2/ia2AccessibleTableCell.cpp
View File

@ -5,7 +5,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "CAccessibleTableCell.h"
#include "ia2AccessibleTableCell.h"
#include "Accessible2.h"
#include "AccessibleTable2_i.c"
@ -21,12 +21,12 @@
#include "nsString.h"
#define TABLECELL_INTERFACE_UNSUPPORTED_MSG \
"Subclass of CAccessibleTableCell doesn't implement nsIAccessibleTableCell"\
"Subclass of ia2AccessibleTableCell doesn't implement nsIAccessibleTableCell"\
// IUnknown
STDMETHODIMP
CAccessibleTableCell::QueryInterface(REFIID iid, void** ppv)
ia2AccessibleTableCell::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
@ -43,7 +43,7 @@ CAccessibleTableCell::QueryInterface(REFIID iid, void** ppv)
// IAccessibleTableCell
STDMETHODIMP
CAccessibleTableCell::get_table(IUnknown **table)
ia2AccessibleTableCell::get_table(IUnknown** aTable)
{
__try {
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
@ -65,7 +65,7 @@ __try {
if (NS_FAILED(rv))
return GetHRESULT(rv);
*table = static_cast<IUnknown*>(instancePtr);
*aTable = static_cast<IUnknown*>(instancePtr);
return S_OK;
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(),
@ -75,10 +75,10 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_columnExtent(long *nColumnsSpanned)
ia2AccessibleTableCell::get_columnExtent(long* aNColumnsSpanned)
{
__try {
*nColumnsSpanned = 0;
*aNColumnsSpanned = 0;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -88,7 +88,7 @@ __try {
int32_t columnsSpanned = 0;
nsresult rv = tableCell->GetColumnExtent(&columnsSpanned);
if (NS_SUCCEEDED(rv)) {
*nColumnsSpanned = columnsSpanned;
*aNColumnsSpanned = columnsSpanned;
return S_OK;
}
@ -101,8 +101,8 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_columnHeaderCells(IUnknown ***cellAccessibles,
long *nColumnHeaderCells)
ia2AccessibleTableCell::get_columnHeaderCells(IUnknown*** aCellAccessibles,
long* aNColumnHeaderCells)
{
__try {
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
@ -115,8 +115,8 @@ __try {
if (NS_FAILED(rv))
return GetHRESULT(rv);
return nsWinUtils::ConvertToIA2Array(headerCells, cellAccessibles,
nColumnHeaderCells);
return nsWinUtils::ConvertToIA2Array(headerCells, aCellAccessibles,
aNColumnHeaderCells);
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(),
GetExceptionInformation())) {}
@ -125,10 +125,10 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_columnIndex(long *columnIndex)
ia2AccessibleTableCell::get_columnIndex(long* aColumnIndex)
{
__try {
*columnIndex = -1;
*aColumnIndex = -1;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -138,7 +138,7 @@ __try {
int32_t colIdx = -1;
nsresult rv = tableCell->GetColumnIndex(&colIdx);
if (NS_SUCCEEDED(rv)) {
*columnIndex = colIdx;
*aColumnIndex = colIdx;
return S_OK;
}
@ -151,10 +151,10 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_rowExtent(long *nRowsSpanned)
ia2AccessibleTableCell::get_rowExtent(long* aNRowsSpanned)
{
__try {
*nRowsSpanned = 0;
*aNRowsSpanned = 0;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -164,7 +164,7 @@ __try {
int32_t rowsSpanned = 0;
nsresult rv = tableCell->GetRowExtent(&rowsSpanned);
if (NS_SUCCEEDED(rv)) {
*nRowsSpanned = rowsSpanned;
*aNRowsSpanned = rowsSpanned;
return S_OK;
}
@ -177,8 +177,8 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_rowHeaderCells(IUnknown ***cellAccessibles,
long *nRowHeaderCells)
ia2AccessibleTableCell::get_rowHeaderCells(IUnknown*** aCellAccessibles,
long* aNRowHeaderCells)
{
__try {
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
@ -191,8 +191,8 @@ __try {
if (NS_FAILED(rv))
return GetHRESULT(rv);
return nsWinUtils::ConvertToIA2Array(headerCells, cellAccessibles,
nRowHeaderCells);
return nsWinUtils::ConvertToIA2Array(headerCells, aCellAccessibles,
aNRowHeaderCells);
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(),
GetExceptionInformation())) {}
@ -201,10 +201,10 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_rowIndex(long *rowIndex)
ia2AccessibleTableCell::get_rowIndex(long* aRowIndex)
{
__try {
*rowIndex = -1;
*aRowIndex = -1;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -214,7 +214,7 @@ __try {
int32_t rowIdx = -1;
nsresult rv = tableCell->GetRowIndex(&rowIdx);
if (NS_SUCCEEDED(rv)) {
*rowIndex = rowIdx;
*aRowIndex = rowIdx;
return S_OK;
}
@ -227,17 +227,17 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_rowColumnExtents(long *row, long *column,
long *rowExtents,
long *columnExtents,
boolean *isSelected)
ia2AccessibleTableCell::get_rowColumnExtents(long* aRow, long* aColumn,
long* aRowExtents,
long* aColumnExtents,
boolean* aIsSelected)
{
__try {
*row = 0;
*column = 0;
*rowExtents = 0;
*columnExtents = 0;
*isSelected = false;
*aRow = 0;
*aRow = 0;
*aRow = 0;
*aColumnExtents = 0;
*aIsSelected = false;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -269,11 +269,11 @@ __try {
if (NS_FAILED(rv))
return GetHRESULT(rv);
*row = rowIdx;
*column = columnIdx;
*rowExtents = spannedRows;
*columnExtents = spannedColumns;
*isSelected = isSel;
*aRow = rowIdx;
*aColumn = columnIdx;
*aRowExtents = spannedRows;
*aColumnExtents = spannedColumns;
*aIsSelected = isSel;
return S_OK;
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(),
@ -282,10 +282,10 @@ __try {
}
STDMETHODIMP
CAccessibleTableCell::get_isSelected(boolean *isSelected)
ia2AccessibleTableCell::get_isSelected(boolean* aIsSelected)
{
__try {
*isSelected = false;
*aIsSelected = false;
nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
@ -295,7 +295,7 @@ __try {
bool isSel = false;
nsresult rv = tableCell->IsSelected(&isSel);
if (NS_SUCCEEDED(rv)) {
*isSelected = isSel;
*aIsSelected = isSel;
return S_OK;
}

2
accessible/src/msaa/CAccessibleTableCell.h → accessible/src/windows/ia2/ia2AccessibleTableCell.h
View File

@ -12,7 +12,7 @@
#include "AccessibleTableCell.h"
class CAccessibleTableCell: public IAccessibleTableCell
class ia2AccessibleTableCell : public IAccessibleTableCell
{
public:

0
accessible/src/msaa/ia2AccessibleText.cpp → accessible/src/windows/ia2/ia2AccessibleText.cpp
View File

3
accessible/src/msaa/ia2AccessibleText.h → accessible/src/windows/ia2/ia2AccessibleText.h
View File

@ -111,9 +111,6 @@ public:
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_oldText(
/* [retval][out] */ IA2TextSegment *oldText);
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
protected:
virtual nsresult GetModifiedText(bool aGetInsertedText, nsAString& aText,
uint32_t *aStartOffset,

55
accessible/src/msaa/CAccessibleValue.cpp → accessible/src/windows/ia2/ia2AccessibleValue.cpp
View File

@ -5,31 +5,28 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "CAccessibleValue.h"
#include "ia2AccessibleValue.h"
#include "AccessibleValue_i.c"
#include "nsIAccessibleValue.h"
#include "nsCOMPtr.h"
#include "nsAccessNodeWrap.h"
#include "AccessibleWrap.h"
// IUnknown
STDMETHODIMP
CAccessibleValue::QueryInterface(REFIID iid, void** ppv)
ia2AccessibleValue::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
if (IID_IAccessibleValue == iid) {
nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
if (!valueAcc)
return E_NOINTERFACE;
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
if (valueAcc->HasNumericValue()) {
*ppv = static_cast<IAccessibleValue*>(this);
valueAcc->AddRef();
return S_OK;
}
*ppv = static_cast<IAccessibleValue*>(this);
(reinterpret_cast<IUnknown*>(*ppv))->AddRef();
return S_OK;
return E_NOINTERFACE;
}
return E_NOINTERFACE;
@ -38,14 +35,14 @@ CAccessibleValue::QueryInterface(REFIID iid, void** ppv)
// IAccessibleValue
STDMETHODIMP
CAccessibleValue::get_currentValue(VARIANT *aCurrentValue)
ia2AccessibleValue::get_currentValue(VARIANT* aCurrentValue)
{
__try {
VariantInit(aCurrentValue);
nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
if (!valueAcc)
return E_FAIL;
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
if (valueAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED;
double currentValue = 0;
nsresult rv = valueAcc->GetCurrentValue(&currentValue);
@ -61,12 +58,12 @@ __try {
}
STDMETHODIMP
CAccessibleValue::setCurrentValue(VARIANT aValue)
ia2AccessibleValue::setCurrentValue(VARIANT aValue)
{
__try {
nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
if (!valueAcc)
return E_FAIL;
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
if (valueAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED;
if (aValue.vt != VT_R8)
return E_INVALIDARG;
@ -79,14 +76,14 @@ __try {
}
STDMETHODIMP
CAccessibleValue::get_maximumValue(VARIANT *aMaximumValue)
ia2AccessibleValue::get_maximumValue(VARIANT* aMaximumValue)
{
__try {
VariantInit(aMaximumValue);
nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
if (!valueAcc)
return E_FAIL;
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
if (valueAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED;
double maximumValue = 0;
nsresult rv = valueAcc->GetMaximumValue(&maximumValue);
@ -102,14 +99,14 @@ __try {
}
STDMETHODIMP
CAccessibleValue::get_minimumValue(VARIANT *aMinimumValue)
ia2AccessibleValue::get_minimumValue(VARIANT* aMinimumValue)
{
__try {
VariantInit(aMinimumValue);
nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
if (!valueAcc)
return E_FAIL;
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);
if (valueAcc->IsDefunct())
return CO_E_OBJNOTCONNECTED;
double minimumValue = 0;
nsresult rv = valueAcc->GetMinimumValue(&minimumValue);

7
accessible/src/msaa/CAccessibleValue.h → accessible/src/windows/ia2/ia2AccessibleValue.h
View File

@ -8,11 +8,9 @@
#ifndef _ACCESSIBLE_VALUE_H
#define _ACCESSIBLE_VALUE_H
#include "nsISupports.h"
#include "AccessibleValue.h"
class CAccessibleValue: public IAccessibleValue
class ia2AccessibleValue: public IAccessibleValue
{
public:
@ -32,9 +30,6 @@ public:
virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_minimumValue(
/* [retval][out] */ VARIANT *minimumValue);
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
};
#endif

1
accessible/src/xul/Makefile.in
View File

@ -54,6 +54,7 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
LOCAL_INCLUDES += \
-I$(srcdir)/../msaa \
-I$(srcdir)/../windows/ia2 \
$(NULL)
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)