Skip to content

Commit

Permalink
Reintroduce typo in ICorDebug public API names
Browse files Browse the repository at this point in the history
Fixes #76960
  • Loading branch information
jkotas authored and github-actions committed Oct 12, 2022
1 parent eeabb53 commit c460d15
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions src/coreclr/debug/di/divalue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3707,25 +3707,25 @@ HRESULT CordbArrayValue::GetDimensions(ULONG32 cdim, ULONG32 dims[])
//
// indicates whether the array has base indices
// Arguments:
// output: pbHasBaseIndices - true iff the array has more than one dimension and pbHasBaseIndices is not null
// Return Value: S_OK on success or E_INVALIDARG if pbHasBaseIndices is null
HRESULT CordbArrayValue::HasBaseIndices(BOOL *pbHasBaseIndices)
// output: pbHasBaseIndicies - true iff the array has more than one dimension and pbHasBaseIndicies is not null
// Return Value: S_OK on success or E_INVALIDARG if pbHasBaseIndicies is null
HRESULT CordbArrayValue::HasBaseIndicies(BOOL *pbHasBaseIndicies)
{
PUBLIC_REENTRANT_API_ENTRY(this);
FAIL_IF_NEUTERED(this);
VALIDATE_POINTER_TO_OBJECT(pbHasBaseIndices, BOOL *);
VALIDATE_POINTER_TO_OBJECT(pbHasBaseIndicies, BOOL *);

*pbHasBaseIndices = m_info.arrayInfo.offsetToLowerBounds != 0;
*pbHasBaseIndicies = m_info.arrayInfo.offsetToLowerBounds != 0;
return S_OK;
} // CordbArrayValue::HasBaseIndices
} // CordbArrayValue::HasBaseIndicies

// gets the base indices for a multidimensional array
// Arguments:
// input: cdim - the number of dimensions (this must be the same as the actual rank of the array)
// indices - an array to hold the base indices for the array dimensions (allocated and managed
// by the caller, it must have space for cdim elements)
// Return Value: S_OK on success or E_INVALIDARG if cdim is not equal to the array rank or indices is null
HRESULT CordbArrayValue::GetBaseIndices(ULONG32 cdim, ULONG32 indices[])
HRESULT CordbArrayValue::GetBaseIndicies(ULONG32 cdim, ULONG32 indices[])
{
PUBLIC_REENTRANT_API_ENTRY(this);
FAIL_IF_NEUTERED(this);
Expand All @@ -3743,7 +3743,7 @@ HRESULT CordbArrayValue::GetBaseIndices(ULONG32 cdim, ULONG32 indices[])
indices[i] = m_arrayLowerBase[i];

return S_OK;
} // CordbArrayValue::GetBaseIndices
} // CordbArrayValue::GetBaseIndicies

// Get an element at the position indicated by the values in indices (one index for each dimension)
// Arguments:
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/debug/di/rspriv.h
Original file line number Diff line number Diff line change
Expand Up @@ -9722,8 +9722,8 @@ class CordbArrayValue : public CordbValue,
COM_METHOD GetRank(ULONG32 * pnRank);
COM_METHOD GetCount(ULONG32 * pnCount);
COM_METHOD GetDimensions(ULONG32 cdim, ULONG32 dims[]);
COM_METHOD HasBaseIndices(BOOL * pbHasBaseIndices);
COM_METHOD GetBaseIndices(ULONG32 cdim, ULONG32 indices[]);
COM_METHOD HasBaseIndicies(BOOL * pbHasBaseIndicies);
COM_METHOD GetBaseIndicies(ULONG32 cdim, ULONG32 indices[]);
COM_METHOD GetElement(ULONG32 cdim, ULONG32 indices[], ICorDebugValue ** ppValue);
COM_METHOD GetElementAtPosition(ULONG32 nIndex, ICorDebugValue ** ppValue);

Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/inc/cordebug.idl
Original file line number Diff line number Diff line change
Expand Up @@ -6805,18 +6805,18 @@ interface ICorDebugArrayValue : ICorDebugHeapValue
length_is(cdim)] ULONG32 dims[]);

/*
* HasBaseIndices returns whether or not the array has base indices.
* HasBaseIndicies returns whether or not the array has base indices.
* If the answer is no, then all dimensions have a base index of 0.
*/

HRESULT HasBaseIndices([out] BOOL *pbHasBaseIndices);
HRESULT HasBaseIndicies([out] BOOL *pbHasBaseIndicies);

/*
* GetBaseIndices returns the base index of each dimension in
* GetBaseIndicies returns the base index of each dimension in
* the array
*/

HRESULT GetBaseIndices([in] ULONG32 cdim,
HRESULT GetBaseIndicies([in] ULONG32 cdim,
[out, size_is(cdim),
length_is(cdim)] ULONG32 indices[]);

Expand Down
20 changes: 10 additions & 10 deletions src/coreclr/pal/prebuilt/inc/cordebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -15644,10 +15644,10 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
/* [in] */ ULONG32 cdim,
/* [length_is][size_is][out] */ ULONG32 dims[ ]) = 0;

virtual HRESULT STDMETHODCALLTYPE HasBaseIndices(
/* [out] */ BOOL *pbHasBaseIndices) = 0;
virtual HRESULT STDMETHODCALLTYPE HasBaseIndicies(
/* [out] */ BOOL *pbHasBaseIndicies) = 0;

virtual HRESULT STDMETHODCALLTYPE GetBaseIndices(
virtual HRESULT STDMETHODCALLTYPE GetBaseIndicies(
/* [in] */ ULONG32 cdim,
/* [length_is][size_is][out] */ ULONG32 indices[ ]) = 0;

Expand Down Expand Up @@ -15722,11 +15722,11 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
/* [in] */ ULONG32 cdim,
/* [length_is][size_is][out] */ ULONG32 dims[ ]);

HRESULT ( STDMETHODCALLTYPE *HasBaseIndices )(
HRESULT ( STDMETHODCALLTYPE *HasBaseIndicies )(
ICorDebugArrayValue * This,
/* [out] */ BOOL *pbHasBaseIndices);
/* [out] */ BOOL *pbHasBaseIndicies);

HRESULT ( STDMETHODCALLTYPE *GetBaseIndices )(
HRESULT ( STDMETHODCALLTYPE *GetBaseIndicies )(
ICorDebugArrayValue * This,
/* [in] */ ULONG32 cdim,
/* [length_is][size_is][out] */ ULONG32 indices[ ]);
Expand Down Expand Up @@ -15797,11 +15797,11 @@ EXTERN_C const IID IID_ICorDebugArrayValue;
#define ICorDebugArrayValue_GetDimensions(This,cdim,dims) \
( (This)->lpVtbl -> GetDimensions(This,cdim,dims) )

#define ICorDebugArrayValue_HasBaseIndices(This,pbHasBaseIndices) \
( (This)->lpVtbl -> HasBaseIndices(This,pbHasBaseIndices) )
#define ICorDebugArrayValue_HasBaseIndicies(This,pbHasBaseIndicies) \
( (This)->lpVtbl -> HasBaseIndicies(This,pbHasBaseIndicies) )

#define ICorDebugArrayValue_GetBaseIndices(This,cdim,indices) \
( (This)->lpVtbl -> GetBaseIndices(This,cdim,indices) )
#define ICorDebugArrayValue_GetBaseIndicies(This,cdim,indices) \
( (This)->lpVtbl -> GetBaseIndicies(This,cdim,indices) )

#define ICorDebugArrayValue_GetElement(This,cdim,indices,ppValue) \
( (This)->lpVtbl -> GetElement(This,cdim,indices,ppValue) )
Expand Down

0 comments on commit c460d15

Please sign in to comment.