Andrew Talbot : oleaut32: Remove unneeded casts.
Alexandre Julliard
julliard at winehq.org
Wed Jan 16 07:09:32 CST 2008
Module: wine
Branch: master
Commit: 5ea25c62b89bbb5cb1fa9f87e511c93a1bbe2ed2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea25c62b89bbb5cb1fa9f87e511c93a1bbe2ed2
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Tue Jan 15 21:49:14 2008 +0000
oleaut32: Remove unneeded casts.
---
dlls/oleaut32/oleaut.c | 2 +-
dlls/oleaut32/olepicture.c | 2 +-
dlls/oleaut32/safearray.c | 2 +-
dlls/oleaut32/typelib.c | 4 ++--
dlls/oleaut32/typelib16.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index a677408..9fdac76 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -837,7 +837,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDll);
- OLEAUT32_hModule = (HMODULE)hInstDll;
+ OLEAUT32_hModule = hInstDll;
break;
case DLL_PROCESS_DETACH:
break;
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 8a1c99b..d0c5f63 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -1277,7 +1277,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x
jd.err = pjpeg_std_error(&jerr);
/* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h
* jpeg_create_decompress(&jd); */
- pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct));
+ pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct));
jd.src = &xjsm;
ret=pjpeg_read_header(&jd,TRUE);
jd.out_color_space = JCS_RGB;
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 8b8072c..5a16716 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -805,7 +805,7 @@ HRESULT WINAPI SafeArrayUnlock(SAFEARRAY *psa)
if (!psa)
return E_INVALIDARG;
- if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0)
+ if (InterlockedDecrement( (LONG*) &psa->cLocks) < 0)
{
WARN("Unlocked but no lock held!\n");
InterlockedIncrement( (LONG*) &psa->cLocks);
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index ae4df69..df886a3 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -2587,7 +2587,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
ITypeInfoImpl **ppTI = &(pTypeLibImpl->pTypeInfo);
int i;
- for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++)
+ for(i = 0; i < tlbHeader.nrtypeinfos; i++)
{
*ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl);
@@ -6249,7 +6249,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
if(ref_type->pImpTLInfo->pImpTypeLib) {
TRACE("typeinfo in imported typelib that is already loaded\n");
pTLib = (ITypeLib*)ref_type->pImpTLInfo->pImpTypeLib;
- ITypeLib2_AddRef((ITypeLib*) pTLib);
+ ITypeLib2_AddRef(pTLib);
result = S_OK;
} else {
TRACE("typeinfo in imported typelib that isn't already loaded\n");
diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c
index 31bbf93..a7b2639 100644
--- a/dlls/oleaut32/typelib16.c
+++ b/dlls/oleaut32/typelib16.c
@@ -91,7 +91,7 @@ QueryPathOfRegTypeLib16(
wMaj,wMin,lcid);
} else {
sprintf(xguid,"<guid 0x%08x>",(DWORD)guid);
- FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path);
+ FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path);
return E_FAIL;
}
plen = sizeof(pathname);
More information about the wine-cvs
mailing list