oleaut32: Remove superfluous pointer casts.
Michael Stefaniuc
mstefani at redhat.de
Mon Feb 9 02:45:52 CST 2009
---
dlls/oleaut32/connpt.c | 8 ++++----
dlls/oleaut32/dispatch.c | 2 +-
dlls/oleaut32/oleaut.c | 4 ++--
dlls/oleaut32/olefont.c | 18 +++++++++---------
dlls/oleaut32/olepicture.c | 16 ++++++++--------
dlls/oleaut32/recinfo.c | 2 +-
dlls/oleaut32/safearray.c | 36 ++++++++++++++++++------------------
dlls/oleaut32/tests/safearray.c | 2 +-
dlls/oleaut32/tmarshal.c | 12 ++++++------
dlls/oleaut32/typelib.c | 9 ++++-----
dlls/oleaut32/ungif.c | 16 ++++++++--------
dlls/oleaut32/usrmarshal.c | 12 ++++++------
dlls/oleaut32/varformat.c | 2 +-
13 files changed, 69 insertions(+), 70 deletions(-)
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 63e3b2c..94e8e7c 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -161,9 +161,9 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
* Compare the riid with the interface IDs implemented by this object.
*/
if (IsEqualIID(&IID_IUnknown, riid))
- *ppvObject = (IConnectionPoint*)This;
+ *ppvObject = This;
else if (IsEqualIID(&IID_IConnectionPoint, riid))
- *ppvObject = (IConnectionPoint*)This;
+ *ppvObject = This;
/*
* Check that we obtained an interface.
@@ -430,9 +430,9 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
* Compare the riid with the interface IDs implemented by this object.
*/
if (IsEqualIID(&IID_IUnknown, riid))
- *ppvObject = (IEnumConnections*)This;
+ *ppvObject = This;
else if (IsEqualIID(&IID_IEnumConnections, riid))
- *ppvObject = (IEnumConnections*)This;
+ *ppvObject = This;
/*
* Check that we obtained an interface.
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index 4dfc470..2fd8bb4 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -233,7 +233,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface(
if (IsEqualIID(riid, &IID_IDispatch) ||
IsEqualIID(riid, &IID_IUnknown))
{
- *ppvObject = (LPVOID)This;
+ *ppvObject = This;
IUnknown_AddRef((LPUNKNOWN)*ppvObject);
return S_OK;
}
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 40cfae3..0eaddb1 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -266,7 +266,7 @@ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len)
stringBuffer = (WCHAR*)newBuffer;
stringBuffer[len] = '\0';
- return (LPWSTR)stringBuffer;
+ return stringBuffer;
}
/******************************************************************************
@@ -706,7 +706,7 @@ static HRESULT WINAPI PSDispatchFacBuf_QueryInterface(IPSFactoryBuffer *iface, R
IsEqualIID(riid, &IID_IPSFactoryBuffer))
{
IUnknown_AddRef(iface);
- *ppv = (void *)iface;
+ *ppv = iface;
return S_OK;
}
return E_NOINTERFACE;
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index da622a1..3e00844 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -351,21 +351,21 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface(
* Compare the riid with the interface IDs implemented by this object.
*/
if (IsEqualGUID(&IID_IUnknown, riid))
- *ppvObject = (IFont*)this;
+ *ppvObject = this;
if (IsEqualGUID(&IID_IFont, riid))
- *ppvObject = (IFont*)this;
+ *ppvObject = this;
if (IsEqualGUID(&IID_IDispatch, riid))
- *ppvObject = (IDispatch*)&(this->lpvtblIDispatch);
+ *ppvObject = &this->lpvtblIDispatch;
if (IsEqualGUID(&IID_IFontDisp, riid))
- *ppvObject = (IDispatch*)&(this->lpvtblIDispatch);
+ *ppvObject = &this->lpvtblIDispatch;
if (IsEqualIID(&IID_IPersist, riid) || IsEqualGUID(&IID_IPersistStream, riid))
- *ppvObject = (IPersistStream*)&(this->lpvtblIPersistStream);
+ *ppvObject = &this->lpvtblIPersistStream;
if (IsEqualGUID(&IID_IConnectionPointContainer, riid))
- *ppvObject = (IConnectionPointContainer*)&(this->lpvtblIConnectionPointContainer);
+ *ppvObject = &this->lpvtblIConnectionPointContainer;
if (IsEqualGUID(&IID_IPersistPropertyBag, riid))
- *ppvObject = (IPersistPropertyBag*)&(this->lpvtblIPersistPropertyBag);
+ *ppvObject = &this->lpvtblIPersistPropertyBag;
if (IsEqualGUID(&IID_IPersistStreamInit, riid))
- *ppvObject = (IPersistStreamInit*)&(this->lpvtblIPersistStreamInit);
+ *ppvObject = &this->lpvtblIPersistStreamInit;
/*
* Check that we obtained an interface.
@@ -2343,4 +2343,4 @@ static const IClassFactoryVtbl SFCF_Vtbl = {
};
static IClassFactoryImpl STDFONT_CF = {&SFCF_Vtbl, 1 };
-void _get_STDFONT_CF(LPVOID *ppv) { *ppv = (LPVOID)&STDFONT_CF; }
+void _get_STDFONT_CF(LPVOID *ppv) { *ppv = &STDFONT_CF; }
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index f05501d..03119f2 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -459,15 +459,15 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
* Compare the riid with the interface IDs implemented by this object.
*/
if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid))
- *ppvObject = (IPicture*)This;
+ *ppvObject = This;
else if (IsEqualIID(&IID_IDispatch, riid))
- *ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
+ *ppvObject = &This->lpvtblIDispatch;
else if (IsEqualIID(&IID_IPictureDisp, riid))
- *ppvObject = (IDispatch*)&(This->lpvtblIDispatch);
+ *ppvObject = &This->lpvtblIDispatch;
else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid))
- *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream);
+ *ppvObject = &This->lpvtblIPersistStream;
else if (IsEqualIID(&IID_IConnectionPointContainer, riid))
- *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer);
+ *ppvObject = &This->lpvtblIConnectionPointContainer;
/*
* Check that we obtained an interface.
@@ -1064,7 +1064,7 @@ struct gifdata {
};
static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) {
- struct gifdata *gd = (struct gifdata*)gif->UserData;
+ struct gifdata *gd = gif->UserData;
if (len+gd->curoff > gd->len) {
ERR("Trying to read %d bytes, but only %d available.\n",len, gd->len-gd->curoff);
@@ -2011,7 +2011,7 @@ static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLengt
*ppBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pLength);
/* Fill the BITMAPFILEHEADER */
- pFileHeader = (BITMAPFILEHEADER *)(*ppBuffer);
+ pFileHeader = *ppBuffer;
pFileHeader->bfType = BITMAP_FORMAT_BMP;
pFileHeader->bfSize = *pLength;
pFileHeader->bfOffBits =
@@ -2886,4 +2886,4 @@ static const IClassFactoryVtbl SPCF_Vtbl = {
};
static IClassFactoryImpl STDPIC_CF = {&SPCF_Vtbl, 1 };
-void _get_STDPIC_CF(LPVOID *ppv) { *ppv = (LPVOID)&STDPIC_CF; }
+void _get_STDPIC_CF(LPVOID *ppv) { *ppv = &STDPIC_CF; }
diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c
index 19ae217..c23aad7 100644
--- a/dlls/oleaut32/recinfo.c
+++ b/dlls/oleaut32/recinfo.c
@@ -237,7 +237,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx
*(void**)var = NULL;
break;
case VT_SAFEARRAY:
- SafeArrayDestroy((SAFEARRAY*)var);
+ SafeArrayDestroy(var);
break;
default:
FIXME("Not supported vt = %d\n", This->fields[i].vt);
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index c717ac6..f8f87eb 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -299,7 +299,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell)
if (SUCCEEDED(SafeArrayGetRecordInfo(psa, &lpRecInfo)))
{
- PBYTE pRecordData = (PBYTE)psa->pvData;
+ PBYTE pRecordData = psa->pvData;
while(ulCellCount--)
{
IRecordInfo_RecordClear(lpRecInfo, pRecordData);
@@ -350,8 +350,8 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest)
if (psa->fFeatures & FADF_VARIANT)
{
- VARIANT* lpVariant = (VARIANT*)psa->pvData;
- VARIANT* lpDest = (VARIANT*)dest->pvData;
+ VARIANT* lpVariant = psa->pvData;
+ VARIANT* lpDest = dest->pvData;
while(ulCellCount--)
{
@@ -365,8 +365,8 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest)
}
else if (psa->fFeatures & FADF_BSTR)
{
- BSTR* lpBstr = (BSTR*)psa->pvData;
- BSTR* lpDest = (BSTR*)dest->pvData;
+ BSTR* lpBstr = psa->pvData;
+ BSTR* lpDest = dest->pvData;
while(ulCellCount--)
{
@@ -389,7 +389,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest)
if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH))
{
- LPUNKNOWN *lpUnknown = (LPUNKNOWN *)dest->pvData;
+ LPUNKNOWN *lpUnknown = dest->pvData;
while(ulCellCount--)
{
@@ -596,7 +596,7 @@ SAFEARRAY* WINAPI SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabo
SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound, LPVOID pvExtra)
{
ULONG ulSize = 0;
- IRecordInfo* iRecInfo = (IRecordInfo*)pvExtra;
+ IRecordInfo* iRecInfo = pvExtra;
SAFEARRAY* psa;
TRACE("(%d->%s,%d,%p,%p)\n", vt, debugstr_vt(vt), cDims, rgsabound, pvExtra);
@@ -673,7 +673,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElement
SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cElements, LPVOID pvExtra)
{
ULONG ulSize;
- IRecordInfo* iRecInfo = (IRecordInfo*)pvExtra;
+ IRecordInfo* iRecInfo = pvExtra;
SAFEARRAY* psa;
TRACE("(%d->%s,%d,%d,%p\n", vt, debugstr_vt(vt), lLbound, cElements, pvExtra);
@@ -851,8 +851,8 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
{
if (psa->fFeatures & FADF_VARIANT)
{
- VARIANT* lpVariant = (VARIANT*)pvData;
- VARIANT* lpDest = (VARIANT*)lpvDest;
+ VARIANT* lpVariant = pvData;
+ VARIANT* lpDest = lpvDest;
hRet = VariantClear(lpDest);
if (FAILED(hRet)) FIXME("VariantClear failed with 0x%x\n", hRet);
@@ -862,7 +862,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
else if (psa->fFeatures & FADF_BSTR)
{
BSTR lpBstr = (BSTR)pvData;
- BSTR* lpDest = (BSTR*)lpvDest;
+ BSTR* lpDest = lpvDest;
SysFreeString(*lpDest);
@@ -874,8 +874,8 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
{
if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH))
{
- LPUNKNOWN lpUnknown = (LPUNKNOWN)pvData;
- LPUNKNOWN *lpDest = (LPUNKNOWN *)lpvDest;
+ LPUNKNOWN lpUnknown = pvData;
+ LPUNKNOWN *lpDest = lpvDest;
if (lpUnknown)
IUnknown_AddRef(lpUnknown);
@@ -932,8 +932,8 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
{
if (psa->fFeatures & FADF_VARIANT)
{
- VARIANT* lpVariant = (VARIANT*)lpvSrc;
- VARIANT* lpDest = (VARIANT*)pvData;
+ VARIANT* lpVariant = lpvSrc;
+ VARIANT* lpDest = pvData;
/* The original content of pvData is ignored. */
V_VT(lpDest) = VT_EMPTY;
@@ -942,8 +942,8 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
}
else if (psa->fFeatures & FADF_BSTR)
{
- BSTR* lpBstr = (BSTR*)lpvSrc;
- BSTR* lpDest = (BSTR*)pvData;
+ BSTR* lpBstr = lpvSrc;
+ BSTR* lpDest = pvData;
if (*lpBstr)
{
@@ -958,7 +958,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData
{
if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH))
{
- LPUNKNOWN *lpUnknown = (LPUNKNOWN *)lpvSrc;
+ LPUNKNOWN *lpUnknown = lpvSrc;
if (*lpUnknown)
IUnknown_AddRef(*lpUnknown);
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index a34f095..d539056 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -146,7 +146,7 @@ static const IRecordInfoVtbl IRecordInfoImpl_VTable =
(PVOID)IRecordInfoImpl_Dummy,
(PVOID)IRecordInfoImpl_Dummy,
(PVOID)IRecordInfoImpl_Dummy,
- (PVOID)IRecordInfoImpl_GetSize,
+ IRecordInfoImpl_GetSize,
(PVOID)IRecordInfoImpl_Dummy,
(PVOID)IRecordInfoImpl_Dummy,
(PVOID)IRecordInfoImpl_Dummy,
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 10149f2..5e863b4 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -254,7 +254,7 @@ fail:
static HRESULT WINAPI
PSFacBuf_QueryInterface(LPPSFACTORYBUFFER iface, REFIID iid, LPVOID *ppv) {
if (IsEqualIID(iid,&IID_IPSFactoryBuffer)||IsEqualIID(iid,&IID_IUnknown)) {
- *ppv = (LPVOID)iface;
+ *ppv = iface;
/* No ref counting, static class */
return S_OK;
}
@@ -410,7 +410,7 @@ TMProxyImpl_QueryInterface(LPRPCPROXYBUFFER iface, REFIID riid, LPVOID *ppv)
{
TRACE("()\n");
if (IsEqualIID(riid,&IID_IUnknown)||IsEqualIID(riid,&IID_IRpcProxyBuffer)) {
- *ppv = (LPVOID)iface;
+ *ppv = iface;
IRpcProxyBuffer_AddRef(iface);
return S_OK;
}
@@ -1646,7 +1646,7 @@ static HRESULT WINAPI TMarshalDispatchChannel_QueryInterface(LPRPCCHANNELBUFFER
*ppv = NULL;
if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown))
{
- *ppv = (LPVOID)iface;
+ *ppv = iface;
IUnknown_AddRef(iface);
return S_OK;
}
@@ -1937,8 +1937,8 @@ PSFacBuf_CreateProxy(
if (hres == S_OK)
{
- *ppv = (LPVOID)proxy;
- *ppProxy = (IRpcProxyBuffer *)&(proxy->lpvtbl2);
+ *ppv = proxy;
+ *ppProxy = (IRpcProxyBuffer *)&(proxy->lpvtbl2);
IUnknown_AddRef((IUnknown *)*ppv);
return S_OK;
}
@@ -1962,7 +1962,7 @@ static HRESULT WINAPI
TMStubImpl_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv)
{
if (IsEqualIID(riid,&IID_IRpcStubBuffer)||IsEqualIID(riid,&IID_IUnknown)){
- *ppv = (LPVOID)iface;
+ *ppv = iface;
IRpcStubBuffer_AddRef(iface);
return S_OK;
}
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index d3168ec..d1a719b 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -396,7 +396,7 @@ HRESULT WINAPI LoadTypeLibEx(
/* else fall-through */
case REGKIND_REGISTER:
- if (FAILED(res = RegisterTypeLib(*pptLib, (LPOLESTR)szPath, NULL)))
+ if (FAILED(res = RegisterTypeLib(*pptLib, szPath, NULL)))
{
IUnknown_Release(*pptLib);
*pptLib = 0;
@@ -3748,7 +3748,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
pPad9 = (SLTG_Pad9*)(pIndex + pTypeLibImpl->TypeInfoCount);
- pFirstBlk = (LPVOID)(pPad9 + 1);
+ pFirstBlk = pPad9 + 1;
/* We'll set up a ptr to the main library block, which is the last one. */
@@ -4978,7 +4978,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface,
if (This->TypeAttr.typekind == TKIND_ALIAS)
TLB_CopyTypeDesc(&(*ppTypeAttr)->tdescAlias,
- &This->TypeAttr.tdescAlias, (void *)(*ppTypeAttr + 1));
+ &This->TypeAttr.tdescAlias, *ppTypeAttr + 1);
if((*ppTypeAttr)->typekind == TKIND_DISPATCH) {
/* This should include all the inherited funcs */
@@ -5945,8 +5945,7 @@ DispCallFunc(
#define INVBUF_ELEMENT_SIZE \
(sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *) + sizeof(VARTYPE))
-#define INVBUF_GET_ARG_ARRAY(buffer, params) \
- ((VARIANTARG *)(buffer))
+#define INVBUF_GET_ARG_ARRAY(buffer, params) (buffer)
#define INVBUF_GET_MISSING_ARG_ARRAY(buffer, params) \
((VARIANTARG *)((char *)(buffer) + sizeof(VARIANTARG) * (params)))
#define INVBUF_GET_ARG_PTR_ARRAY(buffer, params) \
diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c
index 79bad60..c24f387 100644
--- a/dlls/oleaut32/ungif.c
+++ b/dlls/oleaut32/ungif.c
@@ -350,7 +350,7 @@ DGifGetImageDesc(GifFileType * GifFile) {
int i, BitsPerPixel;
GifByteType Buf[3];
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
SavedImage *sp;
if (DGifGetWord(GifFile, &GifFile->Image.Left) == GIF_ERROR ||
@@ -436,7 +436,7 @@ DGifGetLine(GifFileType * GifFile,
int LineLen) {
GifByteType *Dummy;
- GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
if (!LineLen)
LineLen = GifFile->Image.Width;
@@ -492,7 +492,7 @@ DGifGetExtensionNext(GifFileType * GifFile,
GifByteType ** Extension) {
GifByteType Buf;
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
if (READ(GifFile, &Buf, 1) != 1) {
return GIF_ERROR;
@@ -536,7 +536,7 @@ DGifGetCodeNext(GifFileType * GifFile,
GifByteType ** CodeBlock) {
GifByteType Buf;
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
if (READ(GifFile, &Buf, 1) != 1) {
return GIF_ERROR;
@@ -566,7 +566,7 @@ DGifSetupDecompress(GifFileType * GifFile) {
int i, BitsPerPixel;
GifByteType CodeSize;
GifPrefixType *Prefix;
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
READ(GifFile, &CodeSize, 1); /* Read Code size from file. */
BitsPerPixel = CodeSize;
@@ -605,7 +605,7 @@ DGifDecompressLine(GifFileType * GifFile,
int j, CrntCode, EOFCode, ClearCode, CrntPrefix, LastCode, StackPtr;
GifByteType *Stack, *Suffix;
GifPrefixType *Prefix;
- GifFilePrivateType *Private = (GifFilePrivateType *) GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
StackPtr = Private->StackPtr;
Prefix = Private->Prefix;
@@ -744,7 +744,7 @@ static int
DGifDecompressInput(GifFileType * GifFile,
int *Code) {
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private = GifFile->Private;
GifByteType NextByte;
static const unsigned short CodeMasks[] = {
@@ -973,7 +973,7 @@ DGifCloseFile(GifFileType * GifFile) {
if (GifFile == NULL)
return GIF_ERROR;
- Private = (GifFilePrivateType *) GifFile->Private;
+ Private = GifFile->Private;
if (GifFile->Image.ColorMap) {
FreeMapObject(GifFile->Image.ColorMap);
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index 2811fcf..a119c28 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -784,7 +784,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY
{
BSTR* lpBstr;
- for (lpBstr = (BSTR*)psa->pvData; ulCellCount; ulCellCount--, lpBstr++)
+ for (lpBstr = psa->pvData; ulCellCount; ulCellCount--, lpBstr++)
size = BSTR_UserSize(pFlags, size, lpBstr);
break;
@@ -798,7 +798,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY
{
VARIANT* lpVariant;
- for (lpVariant = (VARIANT*)psa->pvData; ulCellCount; ulCellCount--, lpVariant++)
+ for (lpVariant = psa->pvData; ulCellCount; ulCellCount--, lpVariant++)
size = VARIANT_UserSize(pFlags, size, lpVariant);
break;
@@ -897,7 +897,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf
{
BSTR* lpBstr;
- for (lpBstr = (BSTR*)psa->pvData; ulCellCount; ulCellCount--, lpBstr++)
+ for (lpBstr = psa->pvData; ulCellCount; ulCellCount--, lpBstr++)
Buffer = BSTR_UserMarshal(pFlags, Buffer, lpBstr);
break;
@@ -911,7 +911,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf
{
VARIANT* lpVariant;
- for (lpVariant = (VARIANT*)psa->pvData; ulCellCount; ulCellCount--, lpVariant++)
+ for (lpVariant = psa->pvData; ulCellCount; ulCellCount--, lpVariant++)
Buffer = VARIANT_UserMarshal(pFlags, Buffer, lpVariant);
break;
@@ -1052,7 +1052,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B
{
BSTR* lpBstr;
- for (lpBstr = (BSTR*)(*ppsa)->pvData; cell_count; cell_count--, lpBstr++)
+ for (lpBstr = (*ppsa)->pvData; cell_count; cell_count--, lpBstr++)
Buffer = BSTR_UserUnmarshal(pFlags, Buffer, lpBstr);
break;
@@ -1066,7 +1066,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B
{
VARIANT* lpVariant;
- for (lpVariant = (VARIANT*)(*ppsa)->pvData; cell_count; cell_count--, lpVariant++)
+ for (lpVariant = (*ppsa)->pvData; cell_count; cell_count--, lpVariant++)
Buffer = VARIANT_UserUnmarshal(pFlags, Buffer, lpVariant);
break;
diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c
index d76ceb5..06bab0f 100644
--- a/dlls/oleaut32/varformat.c
+++ b/dlls/oleaut32/varformat.c
@@ -462,7 +462,7 @@ static inline const BYTE *VARIANT_GetNamedFormat(LPCWSTR lpszFormat)
LPCNAMED_FORMAT fmt;
key.name = lpszFormat;
- fmt = (LPCNAMED_FORMAT)bsearch(&key, VARIANT_NamedFormats,
+ fmt = bsearch(&key, VARIANT_NamedFormats,
sizeof(VARIANT_NamedFormats)/sizeof(NAMED_FORMAT),
sizeof(NAMED_FORMAT), FormatCompareFn);
return fmt ? fmt->format : NULL;
--
1.6.0.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090209/c649395f/attachment.pgp
More information about the wine-patches
mailing list