January 2009 - Wine-Commits

Rob Shearman : rpcrt4: Fix a cstub test failure on older versions of Windows.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: ff8bd24ec2e0434d56b76367bfade78c676c9471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8bd24ec2e0434d56b76367b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 29 12:30:18 2009 +0000 rpcrt4: Fix a cstub test failure on older versions of Windows. --- dlls/rpcrt4/tests/cstub.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index f101a6f..c2531ee 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -625,7 +625,9 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); /* 0xdeadbeef returned from create_stub_test_QI */ ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); - ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory); + ok(cstd_stub->pPSFactory == ppsf || + broken(cstd_stub->pPSFactory == (void *)0x00001000) /* Win9x & NT4 */, + "pPSFactory was %p instead of %p\n", cstd_stub->pPSFactory, ppsf); vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE);

1 0

Rob Shearman : oleaut32: Fix the typelib tests on 64-bit platforms.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 522662faa977be272173b3e264faf908b9cd8691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522662faa977be272173b3e26… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 29 12:30:05 2009 +0000 oleaut32: Fix the typelib tests on 64-bit platforms. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++-------------- dlls/oleaut32/typelib.c | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d8a6675..7c0e2c5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -399,7 +399,7 @@ static void test_CreateDispTypeInfo(void) ok(pFuncDesc->invkind == methdata[1].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[1].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[1].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 4, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); @@ -410,7 +410,7 @@ static void test_CreateDispTypeInfo(void) ok(pFuncDesc->invkind == methdata[2].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[2].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[2].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 12, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == 3 * sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_HRESULT, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ok(pFuncDesc->lprgelemdescParam[0].tdesc.vt == VT_I4, "parm 0 vt %x\n", pFuncDesc->lprgelemdescParam[0].tdesc.vt); @@ -423,7 +423,7 @@ static void test_CreateDispTypeInfo(void) ok(pFuncDesc->invkind == methdata[3].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[3].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[3].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 16, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == 4 * sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); @@ -703,7 +703,7 @@ static void test_inheritance(void) hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 6, "cfuncs %d\n", pTA->cFuncs); @@ -725,7 +725,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetFuncDesc(pTI, 5, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 20, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -738,7 +738,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -768,7 +768,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); if(use_midl_tlb) { ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); } @@ -799,7 +799,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -827,7 +827,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); @@ -851,7 +851,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetFuncDesc(pTI, 2, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60010000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 8, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 2 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -863,7 +863,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); @@ -885,7 +885,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetFuncDesc(pTI, 9, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x1236, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 36, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 9 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -898,7 +898,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 24, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 6 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == 0, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); @@ -911,7 +911,7 @@ if(use_midl_tlb) { hr = ITypeInfo_GetFuncDesc(pTI, 0, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 20, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0f35fc1..503aaf7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1887,7 +1887,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; (*pptfd)->funcdesc.cParams = pFuncRec->nrargs ; (*pptfd)->funcdesc.cParamsOpt = pFuncRec->nroargs ; - (*pptfd)->funcdesc.oVft = pFuncRec->VtableOffset ; + (*pptfd)->funcdesc.oVft = (pFuncRec->VtableOffset * sizeof(void *))/4; (*pptfd)->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; MSFT_GetTdesc(pcx, @@ -2146,7 +2146,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->TypeAttr.wMajorVerNum=LOWORD(tiBase.version); ptiRet->TypeAttr.wMinorVerNum=HIWORD(tiBase.version); ptiRet->TypeAttr.cImplTypes=tiBase.cImplTypes; - ptiRet->TypeAttr.cbSizeVft=tiBase.cbSizeVft; /* FIXME: this is only the non inherited part */ + ptiRet->TypeAttr.cbSizeVft=(tiBase.cbSizeVft * sizeof(void *))/4; /* FIXME: this is only the non inherited part */ if(ptiRet->TypeAttr.typekind == TKIND_ALIAS) MSFT_GetTdesc(pcx, tiBase.datatype1, &ptiRet->TypeAttr.tdescAlias, ptiRet); @@ -3908,7 +3908,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) (*ppTypeInfoImpl)->TypeAttr.cbAlignment = pTITail->cbAlignment; (*ppTypeInfoImpl)->TypeAttr.cbSizeInstance = pTITail->cbSizeInstance; - (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = pTITail->cbSizeVft; + (*ppTypeInfoImpl)->TypeAttr.cbSizeVft = (pTITail->cbSizeVft * sizeof(void *))/4; switch(pTIHeader->typekind) { case TKIND_ENUM: @@ -4981,9 +4981,9 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, &This->TypeAttr.tdescAlias, (void *)(*ppTypeAttr + 1)); if((*ppTypeAttr)->typekind == TKIND_DISPATCH) { - (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / 4; /* This should include all the inherited - funcs */ - (*ppTypeAttr)->cbSizeVft = 28; /* This is always the size of IDispatch's vtbl */ + /* This should include all the inherited funcs */ + (*ppTypeAttr)->cFuncs = (*ppTypeAttr)->cbSizeVft / sizeof(void *); + (*ppTypeAttr)->cbSizeVft = 7 * sizeof(void *); /* This is always the size of IDispatch's vtbl */ (*ppTypeAttr)->wTypeFlags &= ~TYPEFLAG_FOLEAUTOMATION; } return S_OK;

1 0

Huw Davies : oleaut32: Print an LCID in hexadecimal.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 5d64f825b6cb5643ed7462866fa0642feaf5543f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d64f825b6cb5643ed7462866… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 29 11:33:04 2009 +0000 oleaut32: Print an LCID in hexadecimal. --- dlls/oleaut32/hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index 12c9389..6f6eebb 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -510,7 +510,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ULONG nHiWord, nLoWord = 0x0deadbee; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; - TRACE("(%d, %d, %s) %s\n", skind, lcid, debugstr_a(lpStr), + TRACE("(%d, 0x%x, %s) %s\n", skind, lcid, debugstr_a(lpStr), (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); if (!str)

1 0

Michael Stefaniuc : msvcrt: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 9d4c9a0cdddb805fcd0806221a13ced2026e376f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4c9a0cdddb805fcd0806221… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:54 2009 +0100 msvcrt: Remove superfluous pointer casts. --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/time.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 30f83e6..6082cb9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2109,7 +2109,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) unsigned int i, j, nr_lf; char *p = NULL; const char *q; - const char *s = (const char *)buf, *buf_start = (const char *)buf; + const char *s = buf, *buf_start = buf; /* find number of \n ( without preceding \r ) */ for ( nr_lf=0,i = 0; i <count; i++) { @@ -2123,7 +2123,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { if ((q = p = MSVCRT_malloc(count + nr_lf))) { - for (s = (const char *)buf, i = 0, j = 0; i < count; i++) + for (s = buf, i = 0, j = 0; i < count; i++) { if (s[i]== '\n') { diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e0ddb94..f524c8d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -265,7 +265,7 @@ static void msvcrt_set_ctype(unsigned int codepage, LCID lcid) { int i; char str[3]; - unsigned char *traverse = (unsigned char *)cp.LeadByte; + unsigned char *traverse = cp.LeadByte; memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype)); MSVCRT___lc_codepage = codepage; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f95b8b6..a929120 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -173,7 +173,7 @@ MSVCRT_wchar_t* CDECL _wstrdate(MSVCRT_wchar_t* date) { static const WCHAR format[] = { 'M','M','\'','/','\'','d','d','\'','/','\'','y','y',0 }; - GetDateFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)date, 9); + GetDateFormatW(LOCALE_NEUTRAL, 0, NULL, format, date, 9); return date; } @@ -197,7 +197,7 @@ MSVCRT_wchar_t* CDECL _wstrtime(MSVCRT_wchar_t* time) { static const WCHAR format[] = { 'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0 }; - GetTimeFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)time, 9); + GetTimeFormatW(LOCALE_NEUTRAL, 0, NULL, format, time, 9); return time; }

1 0

Michael Stefaniuc : d3d9: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: bca813a5a6e2ae9b3ab42bce75506251c14df81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca813a5a6e2ae9b3ab42bce7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:39 2009 +0100 d3d9: Remove superfluous pointer casts. --- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/tests/stateblock.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9c5290d..b68caab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -617,7 +617,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(LPDIRECT3DDEVICE9EX ifa TRACE("(%p)->(%p,%p,%p,%p,%d)\n" , This, src, pSourceRect, dst, pDestRect, Filter); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DSurface_Blt(dst->wineD3DSurface, (RECT *) pDestRect, src->wineD3DSurface, (RECT *) pSourceRect, 0, NULL, Filter); + hr = IWineD3DSurface_Blt(dst->wineD3DSurface, pDestRect, src->wineD3DSurface, pSourceRect, 0, NULL, Filter); LeaveCriticalSection(&d3d9_cs); return hr; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 36db33b..bd9ba59 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -37,7 +37,7 @@ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9EX iface, REFIID return S_OK; } else if(IsEqualGUID(riid, &IID_IDirect3D9Ex)) { if(This->extended) { - *ppobj = (IDirect3D9Ex *) This; + *ppobj = This; TRACE("Returning IDirect3D9Ex interface at %p\n", *ppobj); IDirect3D9Ex_AddRef((IDirect3D9Ex *)*ppobj); } else { diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index a10ac5b..d85c292 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -269,7 +269,7 @@ static int switch_render_target( HRESULT hret; D3DPRESENT_PARAMETERS present_parameters; - event_data* edata = (event_data*) data; + event_data* edata = data; IDirect3DSwapChain9* swapchain = NULL; IDirect3DSurface9* backbuffer = NULL; @@ -313,8 +313,8 @@ static int revert_render_target( void* data) { HRESULT hret; - event_data* edata = (event_data*) data; - + event_data* edata = data; + /* Reset the old render target */ hret = IDirect3DDevice9_SetRenderTarget(device, 0, edata->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); @@ -347,7 +347,7 @@ static int end_stateblock( void* data) { HRESULT hret; - event_data* edata = (event_data*) data; + event_data* edata = data; hret = IDirect3DDevice9_EndStateBlock(device, &edata->stateblock); ok(hret == D3D_OK, "EndStateBlock returned %#x.\n", hret); @@ -359,7 +359,7 @@ static int abort_stateblock( IDirect3DDevice9* device, void* data) { - event_data* edata = (event_data*) data; + event_data* edata = data; IUnknown_Release(edata->stateblock); return EVENT_OK; @@ -369,7 +369,7 @@ static int apply_stateblock( IDirect3DDevice9* device, void* data) { - event_data* edata = (event_data*) data; + event_data* edata = data; HRESULT hret; hret = IDirect3DStateBlock9_Apply(edata->stateblock); @@ -388,7 +388,7 @@ static int capture_stateblock( void* data) { HRESULT hret; - event_data* edata = (event_data*) data; + event_data* edata = data; hret = IDirect3DStateBlock9_Capture(edata->stateblock); ok(hret == D3D_OK, "Capture returned %#x.\n", hret); @@ -548,7 +548,7 @@ static void shader_constant_get_handler( IDirect3DDevice9* device, const state_test* test, void* data) { HRESULT hret; - shader_constant_data* scdata = (shader_constant_data*) data; + shader_constant_data* scdata = data; const shader_constant_arg* scarg = test->test_arg; unsigned int index = scarg->idx; @@ -848,7 +848,7 @@ static void transform_get_handler( IDirect3DDevice9* device, const state_test* test, void* data) { HRESULT hret; - transform_data* tdata = (transform_data*) data; + transform_data* tdata = data; hret = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &tdata->view); ok(hret == D3D_OK, "GetTransform returned %#x.\n", hret); @@ -1100,7 +1100,7 @@ static void render_state_get_handler( IDirect3DDevice9* device, const state_test* test, void* data) { HRESULT hret; - render_state_data* rsdata = (render_state_data*) data; + render_state_data* rsdata = data; unsigned int i = 0; for (i = 0; i < D3D9_RENDER_STATES; i++) {

1 0

Michael Stefaniuc : winspool.drv: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 6c2aeaece79c02136ab94f3365f0bdaeaff19dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2aeaece79c02136ab94f336… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:18 2009 +0100 winspool.drv: Remove superfluous pointer casts. --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0343a9b..6212cc8 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2805,9 +2805,9 @@ static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment, BOOL unicode) { /* pEnvironment was an ANSI-String: convert to unicode first */ LPWSTR buffer; - INT len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, NULL, 0); + INT len = MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, NULL, 0); buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (buffer) MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pEnvironment, -1, buffer, len); + if (buffer) MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, buffer, len); env = validate_envW(buffer); HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Michael Stefaniuc : services: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 24c4f1de95c3fd8dbc579fb90985544c40441c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c4f1de95c3fd8dbc579fb90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:03 2009 +0100 services: Remove superfluous pointer casts. --- programs/services/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9fd66a2..99180bb 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -87,7 +87,7 @@ struct sc_lock /* Check if the given handle is of the required type and allows the requested access. */ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD needed_access, struct sc_handle **out_hdr) { - struct sc_handle *hdr = (struct sc_handle *)handle; + struct sc_handle *hdr = handle; if (type != SC_HTYPE_DONT_CARE && hdr->type != type) { @@ -158,7 +158,7 @@ DWORD svcctl_OpenSCManagerW( static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) { - struct sc_handle *hdr = (struct sc_handle *)handle; + struct sc_handle *hdr = handle; switch (hdr->type) { case SC_HTYPE_MANAGER:

1 0

Michael Stefaniuc : wintrust: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 0087064c2f7fc79e8fcb2f1452fd079520a9dc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0087064c2f7fc79e8fcb2f145… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:29 2009 +0100 wintrust: Remove superfluous pointer casts. --- dlls/wintrust/asn.c | 67 +++++++++++++++++----------------------- dlls/wintrust/softpub.c | 4 +- dlls/wintrust/wintrust_main.c | 19 +++++------ 3 files changed, 40 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0087064c2f7fc79e8fcb2…

1 0

Michael Stefaniuc : d3dxof: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: fa6e7c262e6e3fc67dbaad9c12747de7d66687f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6e7c262e6e3fc67dbaad9c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:15:46 2009 +0100 d3dxof: Remove superfluous pointer casts. --- dlls/d3dxof/d3dxof.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8cf953b..6aa0032 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -143,7 +143,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { TRACE("Open source file '%s'\n", (char*)pvSource); - hFile = CreateFileA((char*)pvSource, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileA(pvSource, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { TRACE("File '%s' not found\n", (char*)pvSource); @@ -164,11 +164,11 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV } else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) { - lpdxflm = (LPDXFILELOADMEMORY)pvSource; + lpdxflm = pvSource; TRACE("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); - memcpy(header, (char*)lpdxflm->lpMemory, 16); + memcpy(header, lpdxflm->lpMemory, 16); } else { @@ -311,7 +311,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP DWORD token_header; parse_buffer buf; - buf.buffer = (LPBYTE)pvData; + buf.buffer = pvData; buf.rem_bytes = cbSize; buf.txt = FALSE; buf.token_present = FALSE;

1 0

Michael Stefaniuc : oleaut32/tests: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 330e6d86f9da8c6f08a0a8402116837104919ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330e6d86f9da8c6f08a0a8402… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 29 11:14:36 2009 +0100 oleaut32/tests: Remove superfluous pointer casts. --- dlls/oleaut32/tests/olepicture.c | 4 ++-- dlls/oleaut32/tests/safearray.c | 6 +++--- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- dlls/oleaut32/tests/vartype.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ee13227..f2997d6 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -760,11 +760,11 @@ static HRESULT WINAPI NoStatStreamImpl_QueryInterface( *ppvObject = 0; if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } if ((*ppvObject)==0) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 4fc615e..a34f095 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1274,7 +1274,7 @@ static void test_SafeArrayCopyData(void) /* Fill the source array with some data; it doesn't matter what */ for (dimension = 0; dimension < size; dimension++) { - int* data = (int*)sa->pvData; + int* data = sa->pvData; data[dimension] = dimension; } @@ -1420,7 +1420,7 @@ static void test_SafeArrayCreateEx(void) /* Win32 doesn't care if GetSize fails */ fail_GetSize = TRUE; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Fail Size) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); @@ -1437,7 +1437,7 @@ static void test_SafeArrayCreateEx(void) iRec->ref = START_REF_COUNT; iRec->sizeCalled = 0; iRec->clearCalled = 0; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Rec) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 713c366..adc5d9f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -135,7 +135,7 @@ struct host_object_data static DWORD CALLBACK host_object_proc(LPVOID p) { - struct host_object_data *data = (struct host_object_data *)p; + struct host_object_data *data = p; HRESULT hr; MSG msg; diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index dcf1150..9b12b2e 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -154,7 +154,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) { GUID guid; SafeArrayGetIID(lpsa, &guid); - ok(IsEqualGUID(&guid, (GUID*)wiresa), "guid mismatch\n"); + ok(IsEqualGUID(&guid, wiresa), "guid mismatch\n"); wiresa += sizeof(GUID); } ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); @@ -444,7 +444,7 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v if (IsEqualIID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *ppv = (LPVOID)iface; + *ppv = iface; return S_OK; } *ppv = NULL; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6e3136d..4f28234 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -554,7 +554,7 @@ static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, } if (*ppvObject) { - DummyDispatch_AddRef((IDispatch*)*ppvObject); + DummyDispatch_AddRef(*ppvObject); return S_OK; } } @@ -5452,12 +5452,12 @@ static void test_IUnknownChangeTypeEx(void) /* =>IDispatch */ u.ref = 1; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN); /* Note vSrc is not cleared, as final refcount is 2 */ ok(hres == S_OK && u.ref == 2 && - V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == (IUnknown*)pu, + V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == pu, "change unk(src,dst): expected 0x%08x,%d,%d,%p, got 0x%08x,%d,%d,%p\n", S_OK, 2, VT_UNKNOWN, pu, hres, u.ref, V_VT(&vDst), V_UNKNOWN(&vDst)); @@ -5467,7 +5467,7 @@ static void test_IUnknownChangeTypeEx(void) HRESULT hExpected = DISP_E_BADVARTYPE; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); if (vt == VT_UNKNOWN || vt == VT_DISPATCH || vt == VT_EMPTY || vt == VT_NULL)

1 0