ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc 4.0 warning fixes.

This commit is contained in:
Mike McCormack 2005-08-08 18:38:29 +00:00 committed by Alexandre Julliard
parent 90c75bdd5b
commit a04b77ddc2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/oleaut32/safearray.c
View File

@ -789,12 +789,12 @@ HRESULT WINAPI SafeArrayLock(SAFEARRAY *psa)
if (!psa) if (!psa)
return E_INVALIDARG; return E_INVALIDARG;
ulLocks = InterlockedIncrement(&psa->cLocks); ulLocks = InterlockedIncrement( (LONG*) &psa->cLocks);
if (ulLocks > 0xffff) /* Maximum of 16384 locks at a time */ if (ulLocks > 0xffff) /* Maximum of 16384 locks at a time */
{ {
WARN("Out of locks!\n"); WARN("Out of locks!\n");
InterlockedDecrement(&psa->cLocks); InterlockedDecrement( (LONG*) &psa->cLocks);
return E_UNEXPECTED; return E_UNEXPECTED;
} }
return S_OK; return S_OK;
@ -823,10 +823,10 @@ HRESULT WINAPI SafeArrayUnlock(SAFEARRAY *psa)
if (!psa) if (!psa)
return E_INVALIDARG; return E_INVALIDARG;
if ((LONG)InterlockedDecrement(&psa->cLocks) < 0) if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0)
{ {
WARN("Unlocked but no lock held!\n"); WARN("Unlocked but no lock held!\n");
InterlockedIncrement(&psa->cLocks); InterlockedIncrement( (LONG*) &psa->cLocks);
return E_UNEXPECTED; return E_UNEXPECTED;
} }
return S_OK; return S_OK;

8
dlls/oleaut32/tmarshal.c
View File

@ -556,7 +556,7 @@ serialize_param(
if (hres) return hres; if (hres) return hres;
} }
/* need to recurse since we need to free the stuff */ /* need to recurse since we need to free the stuff */
hres = serialize_param(tinfo,writeit,debugout,dealloc,&tdesc2,&(V_I4(vt)),buf); hres = serialize_param(tinfo,writeit,debugout,dealloc,&tdesc2,(DWORD*)&(V_I4(vt)),buf);
if (debugout) TRACE_(olerelay)(")"); if (debugout) TRACE_(olerelay)(")");
return hres; return hres;
} }
@ -1077,7 +1077,7 @@ deserialize_param(
tdesc2.vt = vttype; tdesc2.vt = vttype;
V_VT(vt) = vttype; V_VT(vt) = vttype;
if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype); if (debugout) TRACE_(olerelay)("Vt(%ld)(",vttype);
hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, &(V_I4(vt)), buf); hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, (DWORD*)&(V_I4(vt)), buf);
TRACE_(olerelay)(")"); TRACE_(olerelay)(")");
return hres; return hres;
} else { } else {
@ -1526,7 +1526,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
ULONG status; ULONG status;
BSTR fname,iname; BSTR fname,iname;
BSTR names[10]; BSTR names[10];
int nrofnames; UINT nrofnames;
int is_idispatch_getidsofnames = 0; int is_idispatch_getidsofnames = 0;
DWORD remoteresult = 0; DWORD remoteresult = 0;
ITypeInfo *tinfo; ITypeInfo *tinfo;
@ -2016,7 +2016,7 @@ TMStubImpl_Invoke(
HRESULT hres; HRESULT hres;
DWORD *args, res, *xargs, nrofargs; DWORD *args, res, *xargs, nrofargs;
marshal_state buf; marshal_state buf;
int nrofnames; UINT nrofnames;
BSTR names[10]; BSTR names[10];
BSTR fname = NULL,iname = NULL; BSTR fname = NULL,iname = NULL;
BOOL is_idispatch_getidsofnames = 0; BOOL is_idispatch_getidsofnames = 0;

4
dlls/oleaut32/typelib.c
View File

@ -247,7 +247,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib(
while (hr != S_OK) while (hr != S_OK)
{ {
DWORD dwPathLen = sizeof(Path); LONG dwPathLen = sizeof(Path);
get_lcid_subkey( myLCID, SYS_WIN32, buffer ); get_lcid_subkey( myLCID, SYS_WIN32, buffer );
@ -5215,7 +5215,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
ITypeLib *pTLib = NULL; ITypeLib *pTLib = NULL;
if(pRefType->pImpTLInfo == TLB_REF_INTERNAL) { if(pRefType->pImpTLInfo == TLB_REF_INTERNAL) {
int Index; UINT Index;
result = ITypeInfo_GetContainingTypeLib(iface, &pTLib, &Index); result = ITypeInfo_GetContainingTypeLib(iface, &pTLib, &Index);
} else { } else {
if(pRefType->pImpTLInfo->pImpTypeLib) { if(pRefType->pImpTLInfo->pImpTypeLib) {

2
dlls/oleaut32/typelib2.c
View File

@ -1332,7 +1332,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(
ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface;
ITypeLib *container; ITypeLib *container;
int index; UINT index;
HRESULT res; HRESULT res;
TRACE("(%p,%p,%p)\n", iface, pTInfo, phRefType); TRACE("(%p,%p,%p)\n", iface, pTInfo, phRefType);