Robert Shearman : OLE: Add const to several typelib functions.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Dec 12 06:44:28 CST 2005


Module: wine
Branch: refs/heads/master
Commit: 69aa9f9d2e5347c4fe81959bcee3891d0ca5c5d6
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=69aa9f9d2e5347c4fe81959bcee3891d0ca5c5d6

Author: Robert Shearman <rob at codeweavers.com>
Date:   Mon Dec 12 11:52:23 2005 +0100

OLE: Add const to several typelib functions.
Add const attributes to parameters for several functions and fix up
some formatting.

---

 dlls/oleaut32/typelib.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index a6e2495..29585a3 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -85,7 +85,7 @@ WINE_DECLARE_DEBUG_CHANNEL(typelib);
 /* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
 const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } };
 
-static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt);
+static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt);
 static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr);
 
 /****************************************************************************
@@ -5054,7 +5054,7 @@ _copy_arg(	ITypeInfo2 *tinfo, TYPEDESC *
     return E_FAIL;
 }
 
-static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt)
+static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt)
 {
     HRESULT hr = S_OK;
     ITypeInfo *tinfo2 = NULL;
@@ -5088,11 +5088,11 @@ static HRESULT userdefined_to_variantvt(
         break;
 
     case TKIND_INTERFACE:
-      	if (IsEqualIID(&IID_IDispatch, &tattr->guid))
-      	   *vt |= VT_DISPATCH;
-       	else
-       	   *vt |= VT_UNKNOWN;
-       	break;
+        if (IsEqualIID(&IID_IDispatch, &tattr->guid))
+           *vt |= VT_DISPATCH;
+        else
+           *vt |= VT_UNKNOWN;
+        break;
 
     case TKIND_DISPATCH:
         *vt |= VT_DISPATCH;
@@ -5118,7 +5118,7 @@ static HRESULT userdefined_to_variantvt(
     return hr;
 }
 
-static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt)
+static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt)
 {
     HRESULT hr = S_OK;
 
@@ -5134,7 +5134,7 @@ static HRESULT typedescvt_to_variantvt(I
             ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_USERDEFINED)))
         {
             VARTYPE vt_userdefined = 0;
-            TYPEDESC *tdesc_userdefined = tdesc;
+            const TYPEDESC *tdesc_userdefined = tdesc;
             if (tdesc->vt == VT_PTR)
             {
                 vt_userdefined = VT_BYREF;




More information about the wine-cvs mailing list