Module: wine Branch: master Commit: 66b05dde026f0cd368f5ad2bc964dd5465fe7034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b05dde026f0cd368f5ad2bc9...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Jun 28 21:32:45 2007 +0100
ole32: Constify some variables.
---
dlls/ole32/compobj.c | 18 ++++++++---------- dlls/ole32/compobj_private.h | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 832770e..11b08fe 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -76,8 +76,9 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ * 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 @@ static APARTMENT *apartment_get_or_create(DWORD model) 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 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) 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 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) * 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 @@ static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) HeapFree(GetProcessHeap(), 0, curClass); }
-static void COM_RevokeAllClasses(struct apartment *apt) +static void COM_RevokeAllClasses(const struct apartment *apt) { RegisteredClass *curClass, *cursor;
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a5d8378..c12150a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -255,13 +255,13 @@ DWORD apartment_addref(struct apartment *apt); 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);