ole32: Constify some variables

Andrew Talbot Andrew.Talbot at talbotville.com
Thu Jun 28 15:32:45 CDT 2007


Changelog:
    ole32: Constify some variables.

diff -urN a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
--- a/dlls/ole32/compobj.c	2007-05-25 23:23:58.000000000 +0100
+++ b/dlls/ole32/compobj.c	2007-06-28 20:47:27.000000000 +0100
@@ -76,8 +76,9 @@
  * TODO: Most of these things will have to be made thread-safe.
  */
 
-static HRESULT COM_GetRegisteredClassObject(struct apartment *apt, REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN*  ppUnk);
-static void COM_RevokeAllClasses(struct apartment *apt);
+static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid,
+                                            DWORD dwClsContext, LPUNKNOWN*  ppUnk);
+static void COM_RevokeAllClasses(const struct apartment *apt);
 static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv);
 
 static APARTMENT *MTA; /* protected by csApartment */
@@ -327,7 +328,7 @@
     return apt;
 }
 
-static inline BOOL apartment_is_model(APARTMENT *apt, DWORD model)
+static inline BOOL apartment_is_model(const APARTMENT *apt, DWORD model)
 {
     return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED));
 }
@@ -728,7 +729,7 @@
     return S_OK;
 }
 
-HWND apartment_getwindow(struct apartment *apt)
+HWND apartment_getwindow(const struct apartment *apt)
 {
     assert(!apt->multi_threaded);
     return apt->win;
@@ -1754,11 +1755,8 @@
  *                 to normal COM usage, this method will increase the
  *                 reference count on this object.
  */
-static HRESULT COM_GetRegisteredClassObject(
-        struct apartment *apt,
-	REFCLSID    rclsid,
-	DWORD       dwClsContext,
-	LPUNKNOWN*  ppUnk)
+static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid,
+                                            DWORD dwClsContext, LPUNKNOWN* ppUnk)
 {
   HRESULT hr = S_FALSE;
   RegisteredClass *curClass;
@@ -1951,7 +1949,7 @@
     HeapFree(GetProcessHeap(), 0, curClass);
 }
 
-static void COM_RevokeAllClasses(struct apartment *apt)
+static void COM_RevokeAllClasses(const struct apartment *apt)
 {
   RegisteredClass *curClass, *cursor;
 
diff -urN a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
--- a/dlls/ole32/compobj_private.h	2007-05-18 17:43:55.000000000 +0100
+++ b/dlls/ole32/compobj_private.h	2007-06-28 20:48:18.000000000 +0100
@@ -255,13 +255,13 @@
 DWORD apartment_release(struct apartment *apt);
 HRESULT apartment_disconnectproxies(struct apartment *apt);
 void apartment_disconnectobject(struct apartment *apt, void *object);
-static inline HRESULT apartment_getoxid(struct apartment *apt, OXID *oxid)
+static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid)
 {
     *oxid = apt->oxid;
     return S_OK;
 }
 HRESULT apartment_createwindowifneeded(struct apartment *apt);
-HWND apartment_getwindow(struct apartment *apt);
+HWND apartment_getwindow(const struct apartment *apt);
 void apartment_joinmta(void);
 
 



More information about the wine-patches mailing list