variant.c patch

Ove Kaaven ovehk at ping.uio.no
Sat Jan 4 09:10:10 CST 2003


The ICOM_CALL stuff has been moved objbase.h so it can't be used without
including it first, and it's not included from oleauto.h. But not using
ICOM_CALL at all is better than adding an #include "objbase.h".

Log:
Ove Kaaven <ovek at transgaming.com>
Avoid direct ICOM_CALL usage.

Index: dlls/oleaut32/variant.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/variant.c,v
retrieving revision 1.51
diff -u -r1.51 variant.c
--- dlls/oleaut32/variant.c	2 Jan 2003 23:11:56 -0000	1.51
+++ dlls/oleaut32/variant.c	4 Jan 2003 15:03:36 -0000
@@ -1882,14 +1882,14 @@
 	    break;
 	  case( VT_DISPATCH ):
 	    if(V_UNION(pvarg,pdispVal)!=NULL)
-	      ICOM_CALL(Release,V_UNION(pvarg,pdispVal));
+	      IDispatch_Release(V_UNION(pvarg,pdispVal));
 	    break;
 	  case( VT_VARIANT ):
 	    VariantClear(V_UNION(pvarg,pvarVal));
 	    break;
 	  case( VT_UNKNOWN ):
 	    if(V_UNION(pvarg,punkVal)!=NULL)
-	      ICOM_CALL(Release,V_UNION(pvarg,punkVal));
+	      IUnknown_Release(V_UNION(pvarg,punkVal));
 	    break;
 	  case( VT_SAFEARRAY ):
 	    SafeArrayDestroy(V_UNION(pvarg,parray));
@@ -1963,7 +1963,7 @@
 	  case( VT_DISPATCH ):
 	    V_UNION(pvargDest,pdispVal) = V_UNION(pvargSrc,pdispVal);
 	    if (V_UNION(pvargDest,pdispVal)!=NULL)
-	      ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
+	      IDispatch_AddRef(V_UNION(pvargDest,pdispVal));
 	    break;
 	  case( VT_VARIANT ):
 	    VariantCopy(V_UNION(pvargDest,pvarVal),V_UNION(pvargSrc,pvarVal));
@@ -1971,7 +1971,7 @@
 	  case( VT_UNKNOWN ):
 	    V_UNION(pvargDest,punkVal) = V_UNION(pvargSrc,punkVal);
 	    if (V_UNION(pvargDest,pdispVal)!=NULL)
-	      ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
+	      IUnknown_AddRef(V_UNION(pvargDest,punkVal));
 	    break;
 	  case( VT_SAFEARRAY ):
 	    SafeArrayCopy(V_UNION(pvargSrc,parray), &V_UNION(pvargDest,parray));
@@ -2051,7 +2051,7 @@
 	    case( VT_DISPATCH ):
 	      V_UNION(pvargDest,pdispVal) = *V_UNION(pvargSrc,ppdispVal);
 	      if (V_UNION(pvargDest,pdispVal)!=NULL)
-		ICOM_CALL(AddRef,V_UNION(pvargDest,pdispVal));
+		IDispatch_AddRef(V_UNION(pvargDest,pdispVal));
 	      break;
 	    case( VT_VARIANT ):
 	      {
@@ -2090,7 +2090,7 @@
 	    case( VT_UNKNOWN ):
 	      V_UNION(pvargDest,punkVal) = *V_UNION(pvargSrc,ppunkVal);
 	      if (V_UNION(pvargDest,pdispVal)!=NULL)
-		ICOM_CALL(AddRef,V_UNION(pvargDest,punkVal));
+		IUnknown_AddRef(V_UNION(pvargDest,punkVal));
 	      break;
 	    case( VT_SAFEARRAY ):
 	      SafeArrayCopy(*V_UNION(pvargSrc,pparray), &V_UNION(pvargDest,parray));




More information about the wine-patches mailing list