oleaut32: Constify some variables
Andrew Talbot
Andrew.Talbot at talbotville.com
Mon Jul 30 15:27:45 CDT 2007
Changelog:
oleaut32: Constify some variables.
diff -urN a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
--- a/dlls/oleaut32/typelib.c 2007-07-30 17:23:19.000000000 +0100
+++ b/dlls/oleaut32/typelib.c 2007-07-30 21:23:13.000000000 +0100
@@ -147,7 +147,7 @@
/*
* Find a typelib key which matches a requested maj.min version.
*/
-static BOOL find_typelib_key( REFGUID guid, WORD wMaj, WORD *wMin )
+static BOOL find_typelib_key( REFGUID guid, const WORD *wMaj, WORD *wMin )
{
static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0};
WCHAR buffer[60];
@@ -172,7 +172,7 @@
{
TRACE("found %s: %x.%x\n", debugstr_w(buffer), v_maj, v_min);
- if (wMaj == v_maj)
+ if (*wMaj == v_maj)
{
if (*wMin == v_min)
{
@@ -274,7 +274,7 @@
TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path);
- if (!find_typelib_key( guid, wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED;
+ if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED;
get_typelib_key( guid, wMaj, wMin, buffer );
res = RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey );
@@ -2711,7 +2711,8 @@
HREFTYPE refs[1];
} sltg_ref_lookup_t;
-static HRESULT sltg_get_typelib_ref(sltg_ref_lookup_t *table, DWORD typeinfo_ref, HREFTYPE *typelib_ref)
+static HRESULT sltg_get_typelib_ref(const sltg_ref_lookup_t *table, DWORD typeinfo_ref,
+ HREFTYPE *typelib_ref)
{
if(typeinfo_ref < table->num)
{
@@ -2724,7 +2725,8 @@
return E_FAIL;
}
-static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD, sltg_ref_lookup_t *ref_lookup)
+static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD,
+ const sltg_ref_lookup_t *ref_lookup)
{
BOOL done = FALSE;
@@ -2790,7 +2792,8 @@
return pType;
}
-static WORD *SLTG_DoElem(WORD *pType, char *pBlk, ELEMDESC *pElem, sltg_ref_lookup_t *ref_lookup)
+static WORD *SLTG_DoElem(WORD *pType, char *pBlk,
+ ELEMDESC *pElem, const sltg_ref_lookup_t *ref_lookup)
{
/* Handle [in/out] first */
if((*pType & 0xc000) == 0xc000)
@@ -2899,7 +2902,7 @@
}
static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI,
- BOOL OneOnly, sltg_ref_lookup_t *ref_lookup)
+ BOOL OneOnly, const sltg_ref_lookup_t *ref_lookup)
{
SLTG_ImplInfo *info;
TLBImplType **ppImplType = &pTI->impltypelist;
@@ -2929,7 +2932,8 @@
return (char*)info;
}
-static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cVars, char *pNameTable, sltg_ref_lookup_t *ref_lookup)
+static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cVars,
+ const char *pNameTable, const sltg_ref_lookup_t *ref_lookup)
{
TLBVarDesc **ppVarDesc = &pTI->varlist;
BSTR bstrPrevName = NULL;
@@ -3003,7 +3007,8 @@
pTI->TypeAttr.cVars = cVars;
}
-static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cFuncs, char *pNameTable, sltg_ref_lookup_t *ref_lookup)
+static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI,
+ unsigned short cFuncs, char *pNameTable, const sltg_ref_lookup_t *ref_lookup)
{
SLTG_Function *pFunc;
unsigned short i;
@@ -3138,7 +3143,7 @@
static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const SLTG_TypeInfoTail *pTITail)
{
char *pFirstItem, *pNextItem;
sltg_ref_lookup_t *ref_lookup = NULL;
@@ -3164,15 +3169,15 @@
}
static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI,
- char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
+ const SLTG_TypeInfoTail *pTITail)
{
SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, NULL);
}
static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const SLTG_TypeInfoTail *pTITail)
{
WORD *pType;
sltg_ref_lookup_t *ref_lookup = NULL;
@@ -3198,7 +3203,7 @@
static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const SLTG_TypeInfoTail *pTITail)
{
sltg_ref_lookup_t *ref_lookup = NULL;
if (pTIHeader->href_table != 0xffffffff)
@@ -3222,15 +3227,15 @@
}
static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,
- char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
+ const SLTG_TypeInfoTail *pTITail)
{
SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, NULL);
}
static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI,
char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
- SLTG_TypeInfoTail *pTITail)
+ const SLTG_TypeInfoTail *pTITail)
{
sltg_ref_lookup_t *ref_lookup = NULL;
if (pTIHeader->href_table != 0xffffffff)
More information about the wine-patches
mailing list