diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-24 00:43:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-25 12:25:51 +0100 |
| commit | fd7cb4b05c1ac336f2430e05864bf98afe3030da (patch) | |
| tree | 687df5f1bd2bfc2290bfbb0f1b14b13f248941f9 /winaccessibility | |
| parent | 930b8f4d51010ddf748225ff445e0d1d19b8768e (diff) | |
winaccessibility: fix some error handling in CAccTable
Change-Id: I3c8bc6a476a6254a4ddc3a7cb0585544f3f78431
(cherry picked from commit d04c970e8f33109a1ef5c52f922a48a0ff62adb0)
Diffstat (limited to 'winaccessibility')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccTable.cxx | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index e7935b2f2cf0..f3a1558e9f15 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -213,22 +213,23 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR * } *startingRowIndex = 0 ; - IAccessible* m_pIMacc = NULL; + IMAccessible* pIMacc = NULL; ActivateActContext(); HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL , IID_IMAccessible, - (void **)&m_pIMacc + (void **)&pIMacc ); DeactivateActContext(); - ((CMAccessible*)m_pIMacc)->SetXAccessible( - reinterpret_cast<hyper>(pRXColumnHeader.get())); - m_pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); - if( SUCCEEDED(hr) ) + + if (!SUCCEEDED(hr)) { - return S_OK; + return E_FAIL; } + pIMacc->SetXAccessible( + reinterpret_cast<hyper>(pRXColumnHeader.get())); + pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); - return E_FAIL; + return S_OK; LEAVE_PROTECTED_BLOCK } @@ -446,22 +447,23 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc } *startingColumnIndex = 0 ; - IAccessible* m_pIMacc = NULL; + IMAccessible* pIMacc = NULL; ActivateActContext(); HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL , IID_IMAccessible, - (void **)&m_pIMacc + (void **)&pIMacc ); DeactivateActContext(); - ((CMAccessible*)m_pIMacc)->SetXAccessible( - reinterpret_cast<hyper>(pRXRowHeader.get())); - m_pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); - if( SUCCEEDED(hr) ) + + if (!SUCCEEDED(hr)) { - return S_OK; + return E_FAIL; } + pIMacc->SetXAccessible( + reinterpret_cast<hyper>(pRXRowHeader.get())); + pIMacc->QueryInterface(IID_IAccessibleTable,(void **)accessibleTable); - return E_FAIL; + return S_OK; LEAVE_PROTECTED_BLOCK } |