Kaydet (Commit) cbda6da0 authored tarafından Michael Stahl's avatar Michael Stahl

winaccessibility: InlineIsEqualGUID is defined by guiddef.h

Change-Id: Ia469076ec6f815133e77a14940e8afa05e177231
üst a5c7ed21
......@@ -2614,19 +2614,21 @@ static AggMapEntry g_CMAccessible_AggMap[] = {
HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject)
{
ENTER_PROTECTED_BLOCK
ISDESTROY()
if( ImplIsEqualGUID(iid,IID_IAccIdentity) ||
ImplIsEqualGUID(iid,IID_IStdMarshalInfo) ||
ImplIsEqualGUID(iid,IID_IMarshal) ||
ImplIsEqualGUID(iid,IID_IExternalConnection)||
ImplIsEqualGUID(iid,IID_IOleWindow))
return E_FAIL;
ISDESTROY()
if (InlineIsEqualGUID(iid,IID_IAccIdentity) ||
InlineIsEqualGUID(iid,IID_IStdMarshalInfo) ||
InlineIsEqualGUID(iid,IID_IMarshal) ||
InlineIsEqualGUID(iid,IID_IExternalConnection)||
InlineIsEqualGUID(iid,IID_IOleWindow))
{
return E_FAIL;
}
AggMapEntry * pMap = &g_CMAccessible_AggMap[0];
while(pMap && pMap->piid)
{
if(ImplIsEqualGUID(iid, *pMap->piid))
if (InlineIsEqualGUID(iid, *pMap->piid))
{
XInterface* pXI = NULL;
BOOL bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(),
......
......@@ -52,17 +52,6 @@ enum DM_NIR {
DM_PREVCHILD = 0x03
};
inline BOOL ImplIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
{
return (
((PLONG) &rguid1)[0] == ((PLONG) &rguid2)[0] &&
((PLONG) &rguid1)[1] == ((PLONG) &rguid2)[1] &&
((PLONG) &rguid1)[2] == ((PLONG) &rguid2)[2] &&
((PLONG) &rguid1)[3] == ((PLONG) &rguid2)[3]);
}
#define InlineIsEqualGUID ImplIsEqualGUID
//End
#define SELECT L"Select"
#define PRESS L"Press"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment