mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 18:35:39 +00:00
Avoid direct ICOM_CALL usage.
This commit is contained in:
parent
008f4ce91a
commit
40b94e5347
|
@ -1882,14 +1882,14 @@ HRESULT WINAPI VariantClear(VARIANTARG* pvarg)
|
||||||
break;
|
break;
|
||||||
case( VT_DISPATCH ):
|
case( VT_DISPATCH ):
|
||||||
if(V_UNION(pvarg,pdispVal)!=NULL)
|
if(V_UNION(pvarg,pdispVal)!=NULL)
|
||||||
ICOM_CALL(Release,V_UNION(pvarg,pdispVal));
|
IDispatch_Release(V_UNION(pvarg,pdispVal));
|
||||||
break;
|
break;
|
||||||
case( VT_VARIANT ):
|
case( VT_VARIANT ):
|
||||||
VariantClear(V_UNION(pvarg,pvarVal));
|
VariantClear(V_UNION(pvarg,pvarVal));
|
||||||
break;
|
break;
|
||||||
case( VT_UNKNOWN ):
|
case( VT_UNKNOWN ):
|
||||||
if(V_UNION(pvarg,punkVal)!=NULL)
|
if(V_UNION(pvarg,punkVal)!=NULL)
|
||||||
ICOM_CALL(Release,V_UNION(pvarg,punkVal));
|
IUnknown_Release(V_UNION(pvarg,punkVal));
|
||||||
break;
|
break;
|
||||||
case( VT_SAFEARRAY ):
|
case( VT_SAFEARRAY ):
|
||||||
SafeArrayDestroy(V_UNION(pvarg,parray));
|
SafeArrayDestroy(V_UNION(pvarg,parray));
|
||||||
|
@ -1963,7 +1963,7 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
|
||||||
case( VT_DISPATCH ):
|
case( VT_DISPATCH ):
|
||||||
V_UNION(pvargDest,pdispVal) = V_UNION(pvargSrc,pdispVal);
|
V_UNION(pvargDest,pdispVal) = V_UNION(pvargSrc,pdispVal);
|
||||||
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
||||||
ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
|
IDispatch_AddRef(V_UNION(pvargDest,pdispVal));
|
||||||
break;
|
break;
|
||||||
case( VT_VARIANT ):
|
case( VT_VARIANT ):
|
||||||
VariantCopy(V_UNION(pvargDest,pvarVal),V_UNION(pvargSrc,pvarVal));
|
VariantCopy(V_UNION(pvargDest,pvarVal),V_UNION(pvargSrc,pvarVal));
|
||||||
|
@ -1971,7 +1971,7 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
|
||||||
case( VT_UNKNOWN ):
|
case( VT_UNKNOWN ):
|
||||||
V_UNION(pvargDest,punkVal) = V_UNION(pvargSrc,punkVal);
|
V_UNION(pvargDest,punkVal) = V_UNION(pvargSrc,punkVal);
|
||||||
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
||||||
ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
|
IUnknown_AddRef(V_UNION(pvargDest,punkVal));
|
||||||
break;
|
break;
|
||||||
case( VT_SAFEARRAY ):
|
case( VT_SAFEARRAY ):
|
||||||
SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
|
SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
|
||||||
|
@ -2051,7 +2051,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc)
|
||||||
case( VT_DISPATCH ):
|
case( VT_DISPATCH ):
|
||||||
V_UNION(pvargDest,pdispVal) = *V_UNION(pvargSrc,ppdispVal);
|
V_UNION(pvargDest,pdispVal) = *V_UNION(pvargSrc,ppdispVal);
|
||||||
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
||||||
ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
|
IDispatch_AddRef(V_UNION(pvargDest,pdispVal));
|
||||||
break;
|
break;
|
||||||
case( VT_VARIANT ):
|
case( VT_VARIANT ):
|
||||||
{
|
{
|
||||||
|
@ -2090,7 +2090,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc)
|
||||||
case( VT_UNKNOWN ):
|
case( VT_UNKNOWN ):
|
||||||
V_UNION(pvargDest,punkVal) = *V_UNION(pvargSrc,ppunkVal);
|
V_UNION(pvargDest,punkVal) = *V_UNION(pvargSrc,ppunkVal);
|
||||||
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
if (V_UNION(pvargDest,pdispVal)!=NULL)
|
||||||
ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
|
IUnknown_AddRef(V_UNION(pvargDest,punkVal));
|
||||||
break;
|
break;
|
||||||
case( VT_SAFEARRAY ):
|
case( VT_SAFEARRAY ):
|
||||||
SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
|
SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));
|
||||||
|
|
Loading…
Reference in a new issue