November 2008 - Wine-Commits

Stefan Dösinger : d3d9: WINED3DSURFACE_DESC:: MultiSampleType is not a DWORD.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 123a3f44d9dbeef61290cd33e3bf3f8bb950b0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123a3f44d9dbeef61290cd33e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 3 00:37:27 2008 +0100 d3d9: WINED3DSURFACE_DESC::MultiSampleType is not a DWORD. --- dlls/d3d9/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5323eac..db58689 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -266,6 +266,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data WINED3DINDEXBUFFER_DESC index_desc; WINED3DVERTEXBUFFER_DESC vertex_desc; WINED3DFORMAT dummy_format; + WINED3DMULTISAMPLE_TYPE dummy_multisampletype; DWORD dummy_dword; WINED3DPOOL pool = WINED3DPOOL_SCRATCH; /* a harmless pool */ IUnknown *parent; @@ -278,7 +279,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data surface_desc.Usage = &dummy_dword; surface_desc.Pool = &pool; surface_desc.Size = &dummy_dword; - surface_desc.MultiSampleType = &dummy_dword; + surface_desc.MultiSampleType = &dummy_multisampletype; surface_desc.MultiSampleQuality = &dummy_dword; surface_desc.Width = &dummy_dword; surface_desc.Height = &dummy_dword;

1 0

Stefan Dösinger : d3d9: Use the correct AddRef and Release macros.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 3d96f97ee14507cef9afd4627172d95cd23d6364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d96f97ee14507cef9afd4627… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 2 23:49:40 2008 +0100 d3d9: Use the correct AddRef and Release macros. --- dlls/d3d9/basetexture.c | 2 +- dlls/d3d9/cubetexture.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/directx.c | 8 ++++---- dlls/d3d9/indexbuffer.c | 6 +++--- dlls/d3d9/pixelshader.c | 6 +++--- dlls/d3d9/query.c | 6 +++--- dlls/d3d9/resource.c | 2 +- dlls/d3d9/stateblock.c | 10 +++++----- dlls/d3d9/surface.c | 6 +++--- dlls/d3d9/swapchain.c | 8 ++++---- dlls/d3d9/texture.c | 6 +++--- dlls/d3d9/vertexbuffer.c | 6 +++--- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/d3d9/vertexshader.c | 6 +++--- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 6 +++--- 17 files changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d96f97ee14507cef9afd…

1 0

Stefan Dösinger : wined3d: Fix the num blend values -> type match.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: a8497a5545f45667e7959316e4ee17404e073b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8497a5545f45667e7959316e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 3 00:38:14 2008 +0100 wined3d: Fix the num blend values -> type match. --- dlls/d3d9/vertexdeclaration.c | 12 ++++++++++-- dlls/wined3d/device.c | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 42b46ce..4631248 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -106,8 +106,16 @@ HRESULT vdecl_convert_fvf( if (has_blend && (num_blends > 0)) { if (((fvf & D3DFVF_XYZB5) == D3DFVF_XYZB2) && (fvf & D3DFVF_LASTBETA_D3DCOLOR)) elements[idx].Type = D3DDECLTYPE_D3DCOLOR; - else - elements[idx].Type = D3DDECLTYPE_FLOAT1 + num_blends - 1; + else { + switch(num_blends) { + case 1: elements[idx].Type = D3DDECLTYPE_FLOAT1; break; + case 2: elements[idx].Type = D3DDECLTYPE_FLOAT2; break; + case 3: elements[idx].Type = D3DDECLTYPE_FLOAT3; break; + case 4: elements[idx].Type = D3DDECLTYPE_FLOAT4; break; + default: + ERR("Unexpected amount of blend values: %u\n", num_blends); + } + } elements[idx].Usage = D3DDECLUSAGE_BLENDWEIGHT; elements[idx].UsageIndex = 0; idx++; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6307950..83bc436 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1792,8 +1792,16 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the if (has_blend && (num_blends > 0)) { if (((fvf & WINED3DFVF_XYZB5) == WINED3DFVF_XYZB2) && (fvf & WINED3DFVF_LASTBETA_D3DCOLOR)) elements[idx].Type = WINED3DDECLTYPE_D3DCOLOR; - else - elements[idx].Type = WINED3DDECLTYPE_FLOAT1 + num_blends - 1; + else { + switch(num_blends) { + case 1: elements[idx].Type = WINED3DDECLTYPE_FLOAT1; break; + case 2: elements[idx].Type = WINED3DDECLTYPE_FLOAT2; break; + case 3: elements[idx].Type = WINED3DDECLTYPE_FLOAT3; break; + case 4: elements[idx].Type = WINED3DDECLTYPE_FLOAT4; break; + default: + ERR("Unexpected amount of blend values: %u\n", num_blends); + } + } elements[idx].Usage = WINED3DDECLUSAGE_BLENDWEIGHT; elements[idx].UsageIndex = 0; idx++;

1 0

Paul Bryan Roberts : ntdll: Avoid potential infinite loop.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 01eb926987e8c2fd461bf6881137eb4a3f8d621a URL: http://source.winehq.org/git/wine.git/?a=commit;h=01eb926987e8c2fd461bf6881… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Mon Nov 3 22:42:42 2008 +0000 ntdll: Avoid potential infinite loop. --- dlls/ntdll/om.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index bc2ee97..aba2301 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -174,7 +174,7 @@ NtQuerySecurityObject( PISECURITY_DESCRIPTOR_RELATIVE psd = pSecurityDescriptor; NTSTATUS status; unsigned int buffer_size = 512; - BOOLEAN need_more_memory = FALSE; + BOOLEAN need_more_memory; TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", Object, RequestedInformation, pSecurityDescriptor, Length, ResultLength); @@ -185,6 +185,8 @@ NtQuerySecurityObject( if (!buffer) return STATUS_NO_MEMORY; + need_more_memory = FALSE; + SERVER_START_REQ( get_security_object ) { req->handle = Object;

1 0

Andrew Talbot : oledlg: Sign-compare warnings fix.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: ac9e832722232eaaad504aab62c290c9b4636d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9e832722232eaaad504aab6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 3 22:42:02 2008 +0000 oledlg: Sign-compare warnings fix. --- dlls/oledlg/pastespl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 68bad06..ae5e2f2 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -648,7 +648,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) if(psA->cPasteEntries > 0) { DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); - UINT i; + INT i; ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); @@ -665,7 +665,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) if(psA->cPasteEntries > 0) { - UINT i; + INT i; for(i = 0; i < psA->cPasteEntries; i++) { HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName);

1 0

Andrew Talbot : quartz: Sign-compare warnings fix.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 9988ae3524ddf2393a06e310f558f074f42cd60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9988ae3524ddf2393a06e310f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 3 22:45:48 2008 +0000 quartz: Sign-compare warnings fix. --- dlls/quartz/avisplit.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index b688717..513bd88 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -403,7 +403,7 @@ static HRESULT AVISplitter_first_request(LPVOID iface) { AVISplitterImpl *This = (AVISplitterImpl *)iface; HRESULT hr = S_OK; - int x; + DWORD x; IMediaSample *sample = NULL; BOOL have_sample = FALSE; @@ -519,7 +519,8 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **index, LONGLONG qwOffset, DWORD cb) { AVISTDINDEX *pIndex; - int x, rest; + DWORD x; + int rest; *index = NULL; if (cb < sizeof(AVISTDINDEX)) @@ -575,7 +576,7 @@ static HRESULT AVISplitter_ProcessOldIndex(AVISplitterImpl *This) ULONGLONG mov_pos = BYTES_FROM_MEDIATIME(This->CurrentChunkOffset) - sizeof(DWORD); AVIOLDINDEX *pAviOldIndex = This->oldindex; int relative = -1; - int x; + DWORD x; for (x = 0; x < pAviOldIndex->cb / sizeof(pAviOldIndex->aIndex[0]); ++x) { @@ -771,7 +772,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE case ckidAVISUPERINDEX: { const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; - int x; + DWORD x; long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) @@ -886,7 +887,7 @@ static HRESULT AVISplitter_ProcessODML(AVISplitterImpl * This, const BYTE * pDat static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) { - int x; + unsigned int x; if (This->oldindex) { @@ -910,7 +911,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) FIXME("Stream id %s ignored\n", debugstr_an((char*)&This->oldindex->aIndex[n].dwChunkId, 4)); continue; } - if (This->streams[streamId].pos == ~0) + if (This->streams[streamId].pos == ~0U) This->streams[streamId].pos = n; if (This->streams[streamId].streamheader.dwSampleSize) @@ -943,7 +944,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) for (x = 0; x < This->Parser.cStreams; ++x) { StreamData *stream = This->streams + x; - int y; + DWORD y; DWORD64 frames = 0; stream->seek = 1; @@ -956,7 +957,7 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) { if (stream->streamheader.dwSampleSize) { - int z; + DWORD z; for (z = 0; z < stream->stdindex[y]->nEntriesInUse; ++z) { @@ -999,7 +1000,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, BYTE * pBuffer; RIFFCHUNK * pCurrentChunk; LONGLONG total, avail; - int x; + ULONG x; DWORD indexes; AVISplitterImpl * pAviSplit = (AVISplitterImpl *)This->pin.pinInfo.pFilter; @@ -1213,7 +1214,7 @@ static HRESULT AVISplitter_Flush(LPVOID iface) static HRESULT AVISplitter_Disconnect(LPVOID iface) { AVISplitterImpl *This = iface; - int x; + ULONG x; /* TODO: Remove other memory that's allocated during connect */ CoTaskMemFree(This->oldindex); @@ -1221,7 +1222,7 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface) for (x = 0; x < This->Parser.cStreams; ++x) { - int i; + DWORD i; StreamData *stream = &This->streams[x];

1 0

Michael Stefaniuc : iphlpapi: Do not cast zero.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 3f1a63ec77e39908b1461e6480913570fb78f3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1a63ec77e39908b1461e648… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 22:34:55 2008 +0100 iphlpapi: Do not cast zero. --- dlls/iphlpapi/iphlpapi_main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a2ec4b2..c7a4a3f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -422,7 +422,7 @@ DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute) { FIXME("(pRoute %p): stub\n", pRoute); /* could use SIOCADDRT, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -445,7 +445,7 @@ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry) { FIXME("(pArpEntry %p)\n", pArpEntry); /* could use SIOCSARP on systems that support it, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -515,7 +515,7 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute) { FIXME("(pRoute %p): stub\n", pRoute); /* could use SIOCDELRT, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -538,7 +538,7 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry) { FIXME("(pArpEntry %p): stub\n", pArpEntry); /* could use SIOCDARP on systems that support it, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -1933,7 +1933,7 @@ DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute) /* this is to add a route entry, how's it distinguishable from CreateIpForwardEntry? could use SIOCADDRT, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -1956,7 +1956,7 @@ DWORD WINAPI SetIpNetEntry(PMIB_IPNETROW pArpEntry) { FIXME("(pArpEntry %p): stub\n", pArpEntry); /* same as CreateIpNetEntry here, could use SIOCSARP, not sure I want to */ - return (DWORD) 0; + return 0; } @@ -1978,7 +1978,7 @@ DWORD WINAPI SetIpNetEntry(PMIB_IPNETROW pArpEntry) DWORD WINAPI SetIpStatistics(PMIB_IPSTATS pIpStats) { FIXME("(pIpStats %p): stub\n", pIpStats); - return (DWORD) 0; + return 0; } @@ -2002,7 +2002,7 @@ DWORD WINAPI SetIpTTL(UINT nTTL) FIXME("(nTTL %d): stub\n", nTTL); /* could echo nTTL > /proc/net/sys/net/ipv4/ip_default_ttl, not sure I want to. Could map EACCESS to ERROR_ACCESS_DENIED, I suppose */ - return (DWORD) 0; + return 0; } @@ -2024,7 +2024,7 @@ DWORD WINAPI SetIpTTL(UINT nTTL) DWORD WINAPI SetTcpEntry(PMIB_TCPROW pTcpRow) { FIXME("(pTcpRow %p): stub\n", pTcpRow); - return (DWORD) 0; + return 0; }

1 0

Michael Stefaniuc : crypt32: Remove superfluous casts of void pointers.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 7589715c8718dc31925ebbb5f5587a051aa59126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7589715c8718dc31925ebbb5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 22:35:50 2008 +0100 crypt32: Remove superfluous casts of void pointers. --- dlls/crypt32/cert.c | 7 +++---- dlls/crypt32/context.c | 2 +- dlls/crypt32/crl.c | 2 +- dlls/crypt32/ctl.c | 3 +-- dlls/crypt32/store.c | 6 +++--- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 75d26a4..9cef6f8 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -88,7 +88,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, { BYTE *data = NULL; - cert = (PCERT_CONTEXT)Context_CreateDataContext(sizeof(CERT_CONTEXT)); + cert = Context_CreateDataContext(sizeof(CERT_CONTEXT)); if (!cert) goto end; data = CryptMemAlloc(cbCertEncoded); @@ -601,7 +601,7 @@ static BOOL CRYPT_AcquirePrivateKeyFromProvInfo(PCCERT_CONTEXT pCert, CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = (PCRYPT_KEY_PROV_INFO)HeapAlloc(GetProcessHeap(), 0, size); + info = HeapAlloc(GetProcessHeap(), 0, size); if (info) { ret = CertGetCertificateContextProperty(pCert, @@ -661,8 +661,7 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, CERT_KEY_PROV_INFO_PROP_ID, 0, &size); if (ret) { - info = (PCRYPT_KEY_PROV_INFO)HeapAlloc( - GetProcessHeap(), 0, size); + info = HeapAlloc(GetProcessHeap(), 0, size); ret = CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); if (ret) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 959d0c9..fa08581 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -207,7 +207,7 @@ static inline struct list *ContextList_ContextToEntry(struct ContextList *list, struct list *ret; if (context) - ret = (struct list *)Context_GetExtra(context, list->contextSize); + ret = Context_GetExtra(context, list->contextSize); else ret = NULL; return ret; diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 23c623f..9ae0d5d 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -50,7 +50,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, { BYTE *data = NULL; - crl = (PCRL_CONTEXT)Context_CreateDataContext(sizeof(CRL_CONTEXT)); + crl = Context_CreateDataContext(sizeof(CRL_CONTEXT)); if (!crl) goto end; data = CryptMemAlloc(cbCrlEncoded); diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 9b6d2e0..ffac667 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -382,8 +382,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, (BYTE *)&ctlInfo, &size); if (ret) { - ctl = (PCTL_CONTEXT)Context_CreateDataContext( - sizeof(CTL_CONTEXT)); + ctl = Context_CreateDataContext(sizeof(CTL_CONTEXT)); if (ctl) { BYTE *data = CryptMemAlloc(cbCtlEncoded); diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 834cc1d..1519c96 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -156,7 +156,7 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert, TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = (PCERT_CONTEXT)ContextList_Add(ms->certs, cert, toReplace); + context = ContextList_Add(ms->certs, cert, toReplace); if (context) { context->hCertStore = store; @@ -197,7 +197,7 @@ static BOOL CRYPT_MemAddCrl(PWINECRYPT_CERTSTORE store, void *crl, TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = (PCRL_CONTEXT)ContextList_Add(ms->crls, crl, toReplace); + context = ContextList_Add(ms->crls, crl, toReplace); if (context) { context->hCertStore = store; @@ -238,7 +238,7 @@ static BOOL CRYPT_MemAddCtl(PWINECRYPT_CERTSTORE store, void *ctl, TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = (PCTL_CONTEXT)ContextList_Add(ms->ctls, ctl, toReplace); + context = ContextList_Add(ms->ctls, ctl, toReplace); if (context) { context->hCertStore = store;

1 0

Michael Stefaniuc : user32: Do not cast zero.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 3d6e19d48a8613da777788b061567e6e8ca0dea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6e19d48a8613da777788b06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 22:35:31 2008 +0100 user32: Do not cast zero. --- dlls/user32/cursoricon.c | 2 +- dlls/user32/driver16.c | 2 +- dlls/user32/resource.c | 4 ++-- dlls/user32/scroll.c | 18 +++++++----------- dlls/user32/tests/listbox.c | 4 ++-- dlls/user32/win.c | 2 +- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2af3798..7dfcffb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1667,7 +1667,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule { FIXME_(cursor)("(%04x,%04x,%04x): old 2.x resources are not supported!\n", hResource, hModule, hRsrc); - return (HGLOBAL16)0; + return 0; } /********************************************************************** diff --git a/dlls/user32/driver16.c b/dlls/user32/driver16.c index 227742d..439fd3c 100644 --- a/dlls/user32/driver16.c +++ b/dlls/user32/driver16.c @@ -434,7 +434,7 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) } } - hRetDrv = (lpDrv) ? lpDrv->hDriver16 : (HDRVR16)0; + hRetDrv = (lpDrv) ? lpDrv->hDriver16 : 0; TRACE("return %04x !\n", hRetDrv); return hRetDrv; } diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index ffcc35a..4662514 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -396,10 +396,10 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, i = min(buflen - 1, *p); if (i > 0) { memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = (WCHAR) 0; + buffer[i] = 0; } else { if (buflen > 1) { - buffer[0] = (WCHAR) 0; + buffer[0] = 0; return 0; } } diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 7b7818b..b27eb12 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -918,8 +918,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC)0 ); + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); } else KillSystemTimer( hwnd, SCROLL_TIMER ); break; @@ -936,8 +935,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SB_PAGEUP, (LPARAM)hwndCtl ); } SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC)0 ); + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); } else KillSystemTimer( hwnd, SCROLL_TIMER ); break; @@ -1005,8 +1003,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SB_PAGEDOWN, (LPARAM)hwndCtl ); } SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC)0 ); + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); } else KillSystemTimer( hwnd, SCROLL_TIMER ); break; @@ -1023,8 +1020,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ? - SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, - (TIMERPROC)0 ); + SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY, NULL ); } else KillSystemTimer( hwnd, SCROLL_TIMER ); break; @@ -1791,7 +1787,7 @@ BOOL WINAPI GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) /* Refer SB_CTL requests to the window */ if (nBar == SB_CTL) { - SendMessageW(hwnd, SBM_GETSCROLLINFO, (WPARAM)0, (LPARAM)info); + SendMessageW(hwnd, SBM_GETSCROLLINFO, 0, (LPARAM)info); return TRUE; } return SCROLL_GetScrollInfo(hwnd, nBar, info); @@ -1818,7 +1814,7 @@ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) /* Refer OBJID_CLIENT requests to the window */ if (idObject == OBJID_CLIENT) - return SendMessageW(hwnd, SBM_GETSCROLLBARINFO, (WPARAM)0, (LPARAM)info); + return SendMessageW(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)info); else return SCROLL_GetScrollBarInfo(hwnd, idObject, info); } @@ -1882,7 +1878,7 @@ INT WINAPI GetScrollPos(HWND hwnd, INT nBar) /* Refer SB_CTL requests to the window */ if (nBar == SB_CTL) - return SendMessageW(hwnd, SBM_GETPOS, (WPARAM)0, (LPARAM)0); + return SendMessageW(hwnd, SBM_GETPOS, 0, 0); else return SCROLL_GetScrollPos(hwnd, nBar); } diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 6d4050f..06cb44a 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -103,8 +103,8 @@ buttonpress (HWND handle, WORD x, WORD y) LPARAM lp=x+(y<<16); WAIT; - SendMessage (handle, WM_LBUTTONDOWN, (WPARAM) MK_LBUTTON, lp); - SendMessage (handle, WM_LBUTTONUP , (WPARAM) 0 , lp); + SendMessage (handle, WM_LBUTTONDOWN, MK_LBUTTON, lp); + SendMessage (handle, WM_LBUTTONUP, 0, lp); REDRAW; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 833e07d..2fc00c4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3144,7 +3144,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) else wparam = (hWnd == GetForegroundWindow()); WIN_ReleasePtr( wndPtr ); - SendMessageW( hWnd, WM_NCACTIVATE, wparam, (LPARAM)0 ); + SendMessageW( hWnd, WM_NCACTIVATE, wparam, 0 ); return wparam; } }

1 0

Michael Stefaniuc : comctl32: Do not cast zero.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 62e17fa8c4fae888a14663a282681369965e941b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e17fa8c4fae888a14663a28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 3 22:43:40 2008 +0100 comctl32: Do not cast zero. --- dlls/comctl32/comboex.c | 5 ++--- dlls/comctl32/monthcal.c | 8 ++++---- dlls/comctl32/propsheet.c | 3 +-- dlls/comctl32/tests/header.c | 22 +++++++++++----------- dlls/comctl32/tests/status.c | 4 ++-- dlls/comctl32/tests/toolbar.c | 4 ++-- dlls/comctl32/toolbar.c | 2 +- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a5dfc01..f576eee 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -431,10 +431,9 @@ static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr) cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy); TRACE("upgraded height due to image: height=%d\n", cy); } - SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, (WPARAM)-1, (LPARAM)cy); + SendMessageW (infoPtr->hwndSelf, CB_SETITEMHEIGHT, -1, cy); if (infoPtr->hwndCombo) { - SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, - (WPARAM) 0, (LPARAM) cy); + SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, 0, cy); if ( !(infoPtr->flags & CBES_EX_NOSIZELIMIT)) { RECT comboRect; if (GetWindowRect(infoPtr->hwndCombo, &comboRect)) { diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e3e4d2a..8cae0db 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1393,7 +1393,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) if (infoPtr->hWndYearUpDown) { - infoPtr->currentYear=SendMessageW( infoPtr->hWndYearUpDown, UDM_SETPOS, (WPARAM) 0,(LPARAM)0); + infoPtr->currentYear=SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, 0); if(!DestroyWindow(infoPtr->hWndYearUpDown)) { FIXME("Can't destroy Updown Control\n"); @@ -1474,9 +1474,9 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) NULL, NULL, NULL); - SendMessageW( infoPtr->hWndYearUpDown, UDM_SETRANGE, (WPARAM) 0, MAKELONG (9999, 1753)); - SendMessageW( infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, (LPARAM)0 ); - SendMessageW( infoPtr->hWndYearUpDown, UDM_SETPOS, (WPARAM) 0,(LPARAM)infoPtr->currentYear ); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG (9999, 1753)); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, 0); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->currentYear); return 0; } diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8b60a3c..7c2f26a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3479,8 +3479,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (psInfo->useCallback) - (*(psInfo->ppshheader.pfnCallback))(hwnd, - PSCB_INITIALIZED, (LPARAM)0); + (*(psInfo->ppshheader.pfnCallback))(hwnd, PSCB_INITIALIZED, 0); idx = psInfo->active_page; psInfo->active_page = -1; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index fd0c4c4..dc61a75 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -304,11 +304,11 @@ static LONG getItem(HWND hdex, int idx, LPSTR textBuffer) static void addReadDelItem(HWND hdex, HDITEMA *phdiCreate, int maskRead, HDITEMA *phdiRead) { - ok(SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)0, (LPARAM)phdiCreate)!=-1, "Adding item failed\n"); + ok(SendMessage(hdex, HDM_INSERTITEMA, 0, (LPARAM)phdiCreate)!=-1, "Adding item failed\n"); ZeroMemory(phdiRead, sizeof(HDITEMA)); phdiRead->mask = maskRead; - ok(SendMessage(hdex, HDM_GETITEMA, (WPARAM)0, (LPARAM)phdiRead)!=0, "Getting item data failed\n"); - ok(SendMessage(hdex, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0)!=0, "Deleting item failed\n"); + ok(SendMessage(hdex, HDM_GETITEMA, 0, (LPARAM)phdiRead)!=0, "Getting item data failed\n"); + ok(SendMessage(hdex, HDM_DELETEITEM, 0, 0)!=0, "Deleting item failed\n"); } static HWND create_header_control (void) @@ -661,24 +661,24 @@ static void check_mask(void) hdi.iOrder = 0; hdi.lParam = 17; hdi.cchTextMax = 260; - ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ret = SendMessage(hWndHeader, HDM_INSERTITEM, 0, (LPARAM)&hdi); ok(ret == -1, "Creating an item with a zero mask should have failed\n"); - if (ret != -1) SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + if (ret != -1) SendMessage(hWndHeader, HDM_DELETEITEM, 0, 0); /* with a non-zero mask creation will succeed */ ZeroMemory(&hdi, sizeof(hdi)); hdi.mask = HDI_LPARAM; - ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ret = SendMessage(hWndHeader, HDM_INSERTITEM, 0, (LPARAM)&hdi); ok(ret != -1, "Adding item with non-zero mask failed\n"); if (ret != -1) - SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + SendMessage(hWndHeader, HDM_DELETEITEM, 0, 0); /* in SETITEM if the mask contains a unknown bit, it is ignored */ ZeroMemory(&hdi, sizeof(hdi)); hdi.mask = 0x08000000 | HDI_LPARAM | HDI_IMAGE; hdi.lParam = 133; hdi.iImage = 17; - ret = SendMessage(hWndHeader, HDM_INSERTITEM, (WPARAM)0, (LPARAM)&hdi); + ret = SendMessage(hWndHeader, HDM_INSERTITEM, 0, (LPARAM)&hdi); ok(ret != -1, "Adding item failed\n"); if (ret != -1) @@ -686,18 +686,18 @@ static void check_mask(void) /* check result */ ZeroMemory(&hdi, sizeof(hdi)); hdi.mask = HDI_LPARAM | HDI_IMAGE; - SendMessage(hWndHeader, HDM_GETITEM, (WPARAM)0, (LPARAM)&hdi); + SendMessage(hWndHeader, HDM_GETITEM, 0, (LPARAM)&hdi); ok(hdi.lParam == 133, "comctl32 4.0 field not set\n"); ok(hdi.iImage == 17, "comctl32 >4.0 field not set\n"); /* but in GETITEM if an unknown bit is set, comctl32 uses only version 4.0 fields */ ZeroMemory(&hdi, sizeof(hdi)); hdi.mask = 0x08000000 | HDI_LPARAM | HDI_IMAGE; - SendMessage(hWndHeader, HDM_GETITEM, (WPARAM)0, (LPARAM)&hdi); + SendMessage(hWndHeader, HDM_GETITEM, 0, (LPARAM)&hdi); ok(hdi.lParam == 133, "comctl32 4.0 field not read\n"); ok(hdi.iImage == 0, "comctl32 >4.0 field shouldn't be read\n"); - SendMessage(hWndHeader, HDM_DELETEITEM, (WPARAM)0, (LPARAM)0); + SendMessage(hWndHeader, HDM_DELETEITEM, 0, 0); } } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index a7c80c6..e5b9155 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -347,8 +347,8 @@ static void test_status_control(void) expect(TRUE,r); /* Set the minimum height and get rectangle information again */ - SendMessage(hWndStatus, SB_SETMINHEIGHT, 50, (LPARAM) 0); - r = SendMessage(hWndStatus, WM_SIZE, 0, (LPARAM) 0); + SendMessage(hWndStatus, SB_SETMINHEIGHT, 50, 0); + r = SendMessage(hWndStatus, WM_SIZE, 0, 0); expect(0,r); r = SendMessage(hWndStatus, SB_GETRECT, 0, (LPARAM)&rc); expect(TRUE,r); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 8e54a76..e648ed8 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -114,7 +114,7 @@ static void basic_test(void) WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | WS_CHILD | TBSTYLE_LIST, 100, - 0, NULL, (UINT)0, + 0, NULL, 0, buttons, sizeof(buttons)/sizeof(buttons[0]), 0, 0, 20, 16, sizeof(TBBUTTON)); ok(hToolbar != NULL, "Toolbar creation\n"); @@ -1084,7 +1084,7 @@ static void test_setrows(void) WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NOMOVEY | CCS_TOP, 0, - 0, NULL, (UINT)0, + 0, NULL, 0, buttons, sizeof(buttons)/sizeof(buttons[0]), 20, 20, 0, 0, sizeof(TBBUTTON)); ok(hToolbar != NULL, "Toolbar creation\n"); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6a6eeb4..c2f602f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5177,7 +5177,7 @@ TOOLBAR_SetVersion (HWND hwnd, INT iVersion) infoPtr->iVersion = iVersion; if (infoPtr->iVersion >= 5) - TOOLBAR_SetUnicodeFormat(hwnd, (WPARAM)TRUE, (LPARAM)0); + TOOLBAR_SetUnicodeFormat(hwnd, TRUE, 0); return iOldVersion; }

1 0