January 2009 - Wine-commits

Michael Stefaniuc : shlwapi: Remove superfluous pointer casts.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 08e3742f379c1dd380ce8a3758ca8d9ac8118178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e3742f379c1dd380ce8a375… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 09:52:44 2009 +0100 shlwapi: Remove superfluous pointer casts. --- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/msgbox.c | 2 +- dlls/shlwapi/ordinal.c | 16 +++++++--------- dlls/shlwapi/reg.c | 14 +++++++------- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/tests/clist.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 5ef5ba6..d13f0aa 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -455,7 +455,7 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IQueryAssociations)) { - *ppvObj = (IQueryAssociations*)This; + *ppvObj = This; IQueryAssociations_AddRef((IQueryAssociations*)*ppvObj); TRACE("Returning IQueryAssociations (%p)\n", *ppvObj); diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index 3e14860..0936e0b 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -173,7 +173,7 @@ INT_PTR WINAPI SHMessageBoxCheckExW(HWND hWnd, HINSTANCE hInst, LPCWSTR lpszName d.dlgProc = dlgProc; d.lParam = lParam; d.lpszId = lpszId; - return DialogBoxParamW(hInst, (LPCWSTR)lpszName, hWnd, SHDlgProcEx, (LPARAM)&d); + return DialogBoxParamW(hInst, lpszName, hWnd, SHDlgProcEx, (LPARAM)&d); } /* Data held by each shlwapi message box */ diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 932f54f..882058e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1250,12 +1250,10 @@ BOOL WINAPI SHIsSameObject(IUnknown* lpInt1, IUnknown* lpInt2) if (lpInt1 == lpInt2) return TRUE; - if (FAILED(IUnknown_QueryInterface(lpInt1, &IID_IUnknown, - (LPVOID *)&lpUnknown1))) + if (FAILED(IUnknown_QueryInterface(lpInt1, &IID_IUnknown, &lpUnknown1))) return FALSE; - if (FAILED(IUnknown_QueryInterface(lpInt2, &IID_IUnknown, - (LPVOID *)&lpUnknown2))) + if (FAILED(IUnknown_QueryInterface(lpInt2, &IID_IUnknown, &lpUnknown2))) return FALSE; if (lpUnknown1 == lpUnknown2) @@ -2236,7 +2234,7 @@ HRESULT WINAPI QISearch( if (IsEqualIID(riid, xmove->refid)) { a_vtbl = (IUnknown*)(xmove->indx + (LPBYTE)w); TRACE("matched, returning (%p)\n", a_vtbl); - *ppv = (LPVOID)a_vtbl; + *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); return S_OK; } @@ -2246,7 +2244,7 @@ HRESULT WINAPI QISearch( if (IsEqualIID(riid, &IID_IUnknown)) { a_vtbl = (IUnknown*)(x->indx + (LPBYTE)w); TRACE("returning first for IUnknown (%p)\n", a_vtbl); - *ppv = (LPVOID)a_vtbl; + *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); return S_OK; } @@ -2539,7 +2537,7 @@ DWORD WINAPI SHGetRestriction(LPCWSTR lpSubKey, LPCWSTR lpSubName, LPCWSTR lpVal if (retval != ERROR_SUCCESS) return 0; - SHGetValueW(hKey, lpSubName, lpValue, NULL, (LPBYTE)&retval, &datsize); + SHGetValueW(hKey, lpSubName, lpValue, NULL, &retval, &datsize); RegCloseKey(hKey); return retval; } @@ -2618,7 +2616,7 @@ HRESULT WINAPI SHWeakQueryInterface( *ppv = NULL; if(pUnk && pInner) { - hret = IUnknown_QueryInterface(pInner, riid, (LPVOID*)ppv); + hret = IUnknown_QueryInterface(pInner, riid, ppv); if (SUCCEEDED(hret)) IUnknown_Release(pUnk); } TRACE("-- 0x%08x\n", hret); @@ -4167,7 +4165,7 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) { IUnknown* lpUnk; - if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)szSkipBinding, &lpUnk))) + if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, szSkipBinding, &lpUnk))) { CLSID clsid; diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 70a5e14..c6fa2c7 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -190,7 +190,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK LONG WINAPI SHRegCloseUSKey( HUSKEY hUSKey) /* [I] Key to close */ { - LPSHUSKEY hKey = (LPSHUSKEY)hUSKey; + LPSHUSKEY hKey = hUSKey; LONG ret = ERROR_SUCCESS; if (hKey->HKCUkey) @@ -393,8 +393,8 @@ LONG WINAPI SHRegQueryUSValueA( if (ret != ERROR_SUCCESS) { if (pvDefaultData && (dwDefaultDataSize != 0)) { maxmove = (dwDefaultDataSize >= *pcbData) ? *pcbData : dwDefaultDataSize; - src = (CHAR*)pvDefaultData; - dst = (CHAR*)pvData; + src = pvDefaultData; + dst = pvData; for(i=0; i<maxmove; i++) *dst++ = *src++; *pcbData = maxmove; TRACE("setting default data\n"); @@ -444,8 +444,8 @@ LONG WINAPI SHRegQueryUSValueW( if (ret != ERROR_SUCCESS) { if (pvDefaultData && (dwDefaultDataSize != 0)) { maxmove = (dwDefaultDataSize >= *pcbData) ? *pcbData : dwDefaultDataSize; - src = (CHAR*)pvDefaultData; - dst = (CHAR*)pvData; + src = pvDefaultData; + dst = pvData; for(i=0; i<maxmove; i++) *dst++ = *src++; *pcbData = maxmove; TRACE("setting default data\n"); @@ -934,7 +934,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, LPVOID pvData, DWORD cbData, DWORD dwFlags) { DWORD dummy; - LPSHUSKEY hKey = (LPSHUSKEY)hUSKey; + LPSHUSKEY hKey = hUSKey; LONG ret = ERROR_SUCCESS; TRACE("(%p,%s,%d,%p,%d,%d)\n", hUSKey, debugstr_w(pszValue), @@ -2242,7 +2242,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD DWORD dwKeyCount = 0, dwValueCount = 0, dwMaxKeyLen = 0; DWORD dwMaxValueLen = 0, dwMaxDataLen = 0, i; BYTE buff[1024]; - LPVOID lpBuff = (LPVOID)buff; + LPVOID lpBuff = buff; WCHAR szName[MAX_PATH], *lpszName = szName; DWORD dwRet = S_OK; diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index bc961da..da0dee3 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1342,7 +1342,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U break; case STRRET_CSTR: - lstrcpynA((LPSTR)dest, src->u.cStr, len); + lstrcpynA(dest, src->u.cStr, len); break; case STRRET_OFFSET: @@ -1381,7 +1381,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, switch (src->uType) { case STRRET_WSTR: - lstrcpynW((LPWSTR)dest, src->u.pOleStr, len); + lstrcpynW(dest, src->u.pOleStr, len); CoTaskMemFree(src->u.pOleStr); break; diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 5f94b4f..84a05e6 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -116,7 +116,7 @@ static HRESULT WINAPI Read(_IDummyStream* This, LPVOID lpMem, ULONG ulSize, else { unsigned int i; - char* buff = (char*)lpMem; + char* buff = lpMem; /* Read item data */ if (!This->item->ulSize) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 484db0a..7865acb 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -229,7 +229,7 @@ static void test_alloc_shared(void) hmem=pSHAllocShared(&val,4,procid); ok(hmem!=NULL,"SHAllocShared(NULL...) failed: %u\n", GetLastError()); - p=(int*)pSHLockShared(hmem,procid); + p=pSHLockShared(hmem,procid); ok(p!=NULL,"SHLockShared failed: %u\n", GetLastError()); if (p!=NULL) ok(*p==val,"Wrong value in shared memory: %d instead of %d\n",*p,val);

1 0

Henri Verbeet : ddraw: Get rid of ICOM_THIS_FROM.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 8c4cc2af468ac31de56cbb0ccb7bbbc627db1bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4cc2af468ac31de56cbb0cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 22 10:33:36 2009 +0100 ddraw: Get rid of ICOM_THIS_FROM. --- dlls/ddraw/ddcomimpl.h | 3 - dlls/ddraw/ddraw.c | 60 +++++----- dlls/ddraw/ddraw_thunks.c | 44 +++++-- dlls/ddraw/device.c | 305 ++++++++++++++++++++++-------------------- dlls/ddraw/direct3d.c | 96 ++++++++------ dlls/ddraw/executebuffer.c | 18 ++-- dlls/ddraw/gamma.c | 16 ++- dlls/ddraw/light.c | 12 +- dlls/ddraw/main.c | 10 +- dlls/ddraw/material.c | 23 ++-- dlls/ddraw/palette.c | 12 +- dlls/ddraw/parent.c | 4 +- dlls/ddraw/surface.c | 92 +++++++------- dlls/ddraw/surface_thunks.c | 11 +- dlls/ddraw/texture.c | 38 ++++-- dlls/ddraw/vertexbuffer.c | 39 +++--- dlls/ddraw/viewport.c | 38 +++--- 17 files changed, 452 insertions(+), 369 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c4cc2af468ac31de56cb…

1 0

Michael Stefaniuc : wineoss.drv: Remove superfluous pointer casts.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: c0a9281c1e83a65b332f099b465680a1b90c2532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a9281c1e83a65b332f099b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 09:52:59 2009 +0100 wineoss.drv: Remove superfluous pointer casts. --- dlls/wineoss.drv/dscapture.c | 14 +++++++------- dlls/wineoss.drv/dsrender.c | 10 +++++----- dlls/wineoss.drv/midi.c | 8 ++++---- dlls/wineoss.drv/mixer.c | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c index 8849644..491d873 100644 --- a/dlls/wineoss.drv/dscapture.c +++ b/dlls/wineoss.drv/dscapture.c @@ -161,7 +161,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_QueryInterface( if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsDriverPropertySet) ) { IDsDriverPropertySet_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } @@ -395,7 +395,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface( if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsCaptureDriverBuffer) ) { IDsCaptureDriverBuffer_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } @@ -404,7 +404,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface( IDsCaptureDriverNotifyImpl_Create(This, &(This->notify)); if (This->notify) { IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; } return E_FAIL; @@ -415,7 +415,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface( IDsCaptureDriverPropertySetImpl_Create(This, &(This->property_set)); if (This->property_set) { IDsDriverPropertySet_AddRef((PIDSDRIVERPROPERTYSET)This->property_set); - *ppobj = (LPVOID)This->property_set; + *ppobj = This->property_set; return DS_OK; } return E_FAIL; @@ -721,7 +721,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_QueryInterface( if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsCaptureDriver) ) { IDsCaptureDriver_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } @@ -859,7 +859,7 @@ static void * my_memcpy(void * dst, const void * src, int length) static DWORD CALLBACK DSCDB_Thread(LPVOID lpParameter) { - IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)lpParameter; + IDsCaptureDriverBufferImpl *This = lpParameter; struct pollfd poll_list[2]; int retval; DWORD offset = 0; @@ -1212,7 +1212,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_CreateCaptureBuffer( (*ippdscdb)->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); (*ippdscdb)->hExitEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - (*ippdscdb)->hThread = CreateThread(NULL, 0, DSCDB_Thread, (LPVOID)(*ippdscdb), 0, &((*ippdscdb)->dwThreadID)); + (*ippdscdb)->hThread = CreateThread(NULL, 0, DSCDB_Thread, *ippdscdb, 0, &((*ippdscdb)->dwThreadID)); WaitForSingleObject((*ippdscdb)->hStartUpEvent, INFINITE); CloseHandle((*ippdscdb)->hStartUpEvent); (*ippdscdb)->hStartUpEvent = INVALID_HANDLE_VALUE; diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index de704d0..02849c7 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QueryInterface( if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsDriverPropertySet) ) { IDsDriverPropertySet_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } @@ -403,7 +403,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsDriverBuffer) ) { IDsDriverBuffer_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } @@ -412,7 +412,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, IDsDriverNotifyImpl_Create(This, &(This->notify)); if (This->notify) { IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; } *ppobj = 0; @@ -424,7 +424,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, IDsDriverPropertySetImpl_Create(This, &(This->property_set)); if (This->property_set) { IDsDriverPropertySet_AddRef((PIDSDRIVERPROPERTYSET)This->property_set); - *ppobj = (LPVOID)This->property_set; + *ppobj = This->property_set; return DS_OK; } *ppobj = 0; @@ -668,7 +668,7 @@ static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsDriver) ) { IDsDriver_AddRef(iface); - *ppobj = (LPVOID)This; + *ppobj = This; return DS_OK; } diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 5f24f2f..bd6e74b 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1025,7 +1025,7 @@ static int modFMLoad(int dev) sbi.channel = i; memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); - if (write(midiSeqFD, (char*)&sbi, sizeof(sbi)) == -1) { + if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -1034,7 +1034,7 @@ static int modFMLoad(int dev) sbi.channel = 128 + i; memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); - if (write(midiSeqFD, (char*)&sbi, sizeof(sbi)) == -1) { + if (write(midiSeqFD, &sbi, sizeof(sbi)) == -1) { WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); return -1; } @@ -1047,7 +1047,7 @@ static int modFMLoad(int dev) */ static void modFMReset(WORD wDevID) { - sFMextra* extra = (sFMextra*)MidiOutDev[wDevID].lpExtra; + sFMextra* extra = MidiOutDev[wDevID].lpExtra; sVoice* voice = extra->voice; sChannel* channel = extra->channel; int i; @@ -1252,7 +1252,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) * - chorus depth controller is not used */ { - sFMextra* extra = (sFMextra*)MidiOutDev[wDevID].lpExtra; + sFMextra* extra = MidiOutDev[wDevID].lpExtra; sVoice* voice = extra->voice; sChannel* channel = extra->channel; int chn = (evt & 0x0F); diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 58433e6..ac06f1a 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -1107,7 +1107,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, getControlType(mix->ctrl[c].ctrl.dwControlType), lpmcd->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails; + mcdu = lpmcd->paDetails; /* return value is 00RL (4 bytes)... */ if ((val = mix->volume[chnl]) == -1 && @@ -1155,7 +1155,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, lpmcd->cChannels); /* we mute both channels at the same time */ - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + mcdb = lpmcd->paDetails; mcdb->fValue = (mix->volume[chnl] != -1); TRACE("=> %s\n", mcdb->fValue ? "on" : "off"); } @@ -1188,7 +1188,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, int i, j; /* we mute both channels at the same time */ - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + mcdb = lpmcd->paDetails; for (i = j = 0; j < SOUND_MIXER_NRDEVICES; j++) { @@ -1229,7 +1229,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt; int i, j; - mcdlt = (LPMIXERCONTROLDETAILS_LISTTEXTW)lpmcd->paDetails; + mcdlt = lpmcd->paDetails; for (i = j = 0; j < SOUND_MIXER_NRDEVICES; j++) { if (WINE_CHN_SUPPORTS(mix->recMask, j)) @@ -1308,7 +1308,7 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, getControlType(mix->ctrl[c].ctrl.dwControlType), lpmcd->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)lpmcd->paDetails; + mcdu = lpmcd->paDetails; /* val should contain 00RL */ switch (lpmcd->cChannels) { @@ -1360,7 +1360,7 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, getControlType(mix->ctrl[c].ctrl.dwControlType), lpmcd->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + mcdb = lpmcd->paDetails; if (mcdb->fValue) { /* save the volume and then set it to 0 */ @@ -1405,7 +1405,7 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, lpmcd->cChannels); /* we mute both channels at the same time */ - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)lpmcd->paDetails; + mcdb = lpmcd->paDetails; mask = 0; for (i = j = 0; j < SOUND_MIXER_NRDEVICES; j++) {

1 0

Michael Stefaniuc : secur32: Remove superfluous pointer casts.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: e01ae46cac0163df520f94b29245691a007929aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01ae46cac0163df520f94b29… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 09:52:28 2009 +0100 secur32: Remove superfluous pointer casts. --- dlls/secur32/ntlm.c | 15 +++++++-------- dlls/secur32/schannel.c | 14 +++++++------- dlls/secur32/util.c | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index bc44a45..38c5134 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -181,8 +181,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( if(pAuthData != NULL) { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = - (PSEC_WINNT_AUTH_IDENTITY_W)pAuthData; + PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); @@ -262,8 +261,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleA( if(pAuthData != NULL) { - identity = (PSEC_WINNT_AUTH_IDENTITY_A)pAuthData; - + identity = pAuthData; + if(identity->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) { pAuthDataW = HeapAlloc(GetProcessHeap(), 0, @@ -585,12 +584,12 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( TRACE("Converting password to unicode.\n"); passwd_lenW = MultiByteToWideChar(CP_ACP, 0, - password ? (LPCSTR)password : (LPCSTR)ntlm_cred->password, + password ? password : ntlm_cred->password, password ? pwlen : ntlm_cred->pwlen, NULL, 0); unicode_password = HeapAlloc(GetProcessHeap(), 0, passwd_lenW * sizeof(SEC_WCHAR)); - MultiByteToWideChar(CP_ACP, 0, password ? (LPCSTR)password : (LPCSTR)ntlm_cred->password, + MultiByteToWideChar(CP_ACP, 0, password ? password : ntlm_cred->password, password ? pwlen : ntlm_cred->pwlen, unicode_password, passwd_lenW); SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, @@ -1523,7 +1522,7 @@ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc p for( i = 0; i < pMessage->cBuffers; ++i ) { if(pMessage->pBuffers[i].BufferType & SECBUFFER_DATA) - HMACMD5Update(&hmac_md5_ctx, (BYTE *)pMessage->pBuffers[i].pvBuffer, + HMACMD5Update(&hmac_md5_ctx, pMessage->pBuffers[i].pvBuffer, pMessage->pBuffers[i].cbBuffer); } @@ -1770,7 +1769,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, { ntlm_CreateSignature(helper, pMessage, token_idx, NTLM_SEND, FALSE); SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, - (BYTE *)pMessage->pBuffers[data_idx].pvBuffer, + pMessage->pBuffers[data_idx].pvBuffer, pMessage->pBuffers[data_idx].cbBuffer); if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9b102fb..fbf2a62 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -132,7 +132,7 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) ERR("Handle %d(%p) is in the free list, but has type %#x.\n", (handle-schan_handle_table), handle, handle->type); return SCHAN_INVALID_HANDLE; } - schan_free_handles = (struct schan_handle *)handle->object; + schan_free_handles = handle->object; handle->object = object; handle->type = type; @@ -215,7 +215,7 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( case SECPKG_ATTR_CIPHER_STRENGTHS: if (pBuffer) { - SecPkgCred_CipherStrengths *r = (SecPkgCred_CipherStrengths*)pBuffer; + SecPkgCred_CipherStrengths *r = pBuffer; /* FIXME: get from CryptoAPI */ FIXME("SECPKG_ATTR_CIPHER_STRENGTHS: semi-stub\n"); @@ -432,7 +432,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleA( debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); return schan_AcquireCredentialsHandle(fCredentialUse, - (PSCHANNEL_CRED)pAuthData, phCredential, ptsExpiry); + pAuthData, phCredential, ptsExpiry); } static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleW( @@ -444,7 +444,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleW( debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); return schan_AcquireCredentialsHandle(fCredentialUse, - (PSCHANNEL_CRED)pAuthData, phCredential, ptsExpiry); + pAuthData, phCredential, ptsExpiry); } static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( @@ -565,7 +565,7 @@ static char *schan_get_buffer(const struct schan_transport *t, struct schan_buff static ssize_t schan_pull(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { - struct schan_transport *t = (struct schan_transport *)transport; + struct schan_transport *t = transport; char *b; TRACE("Pull %zu bytes\n", buff_len); @@ -587,7 +587,7 @@ static ssize_t schan_pull(gnutls_transport_ptr_t transport, void *buff, size_t b static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { - struct schan_transport *t = (struct schan_transport *)transport; + struct schan_transport *t = transport; char *b; TRACE("Push %zu bytes\n", buff_len); @@ -851,7 +851,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( { case SECPKG_ATTR_STREAM_SIZES: { - SecPkgContext_StreamSizes *stream_sizes = (SecPkgContext_StreamSizes *)buffer; + SecPkgContext_StreamSizes *stream_sizes = buffer; gnutls_mac_algorithm_t mac = pgnutls_mac_get(ctx->session); size_t mac_size = pgnutls_mac_get_key_size(mac); gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(ctx->session); diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index 15d3a2a..a226bf5 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -129,7 +129,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se TRACE("(%p, %p)\n", password, session_key); MD4Init(&ctx); - MD4Update(&ctx, (const unsigned char*) password, len); + MD4Update(&ctx, password, len); MD4Final(&ctx); memcpy(ntlm_hash, ctx.digest, 0x10);

1 0

Vincent Pelletier : dinput: Fix macro definitions.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 2a0e659335ecf1d8967c75c9efe164c2d9d0214c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0e659335ecf1d8967c75c9e… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Wed Jan 21 07:44:39 2009 +0100 dinput: Fix macro definitions. --- include/dinput.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 44b20fd..05640bd 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -1358,7 +1358,7 @@ DECLARE_INTERFACE_(IDirectInputEffect,IUnknown) #define IDirectInputEffect_SetParameters(p,a,b) (p)->lpVtbl->SetParameters(p,a,b) #define IDirectInputEffect_Start(p,a,b) (p)->lpVtbl->Start(p,a,b) #define IDirectInputEffect_Stop(p) (p)->lpVtbl->Stop(p) -#define IDirectInputEffect_GetEffectStatus(p,a,b) (p)->lpVtbl->GetEffectStatus(p,a) +#define IDirectInputEffect_GetEffectStatus(p,a) (p)->lpVtbl->GetEffectStatus(p,a) #define IDirectInputEffect_Download(p) (p)->lpVtbl->Download(p) #define IDirectInputEffect_Unload(p) (p)->lpVtbl->Unload(p) #define IDirectInputEffect_Escape(p,a) (p)->lpVtbl->Escape(p,a) @@ -1374,7 +1374,7 @@ DECLARE_INTERFACE_(IDirectInputEffect,IUnknown) #define IDirectInputEffect_SetParameters(p,a,b) (p)->SetParameters(a,b) #define IDirectInputEffect_Start(p,a,b) (p)->Start(a,b) #define IDirectInputEffect_Stop(p) (p)->Stop() -#define IDirectInputEffect_GetEffectStatus(p,a,b) (p)->GetEffectStatus(a) +#define IDirectInputEffect_GetEffectStatus(p,a) (p)->GetEffectStatus(a) #define IDirectInputEffect_Download(p) (p)->Download() #define IDirectInputEffect_Unload(p) (p)->Unload() #define IDirectInputEffect_Escape(p,a) (p)->Escape(a)

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 4be41680a3e18ea2b295415398fad25ac396a984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be41680a3e18ea2b29541539… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 21 22:08:39 2009 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/mpi.c | 514 ++++++++++++++++++++++++------------------------ dlls/rsaenh/tomcrypt.h | 18 -- 2 files changed, 257 insertions(+), 275 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be41680a3e18ea2b2954…

1 0

Michael Stefaniuc : qmgr: Remove superfluous pointer casts.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 0fed8b992fc16b48a9e6ae5a67bbda2a254ccedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed8b992fc16b48a9e6ae5a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 09:51:39 2009 +0100 qmgr: Remove superfluous pointer casts. --- dlls/qmgr/file.c | 2 +- dlls/qmgr/qmgr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 4129887..91cabb6 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -193,7 +193,7 @@ static DWORD CALLBACK copyProgressCallback(LARGE_INTEGER totalSize, HANDLE dstFile, LPVOID obj) { - BackgroundCopyFileImpl *file = (BackgroundCopyFileImpl *) obj; + BackgroundCopyFileImpl *file = obj; BackgroundCopyJobImpl *job = file->owner; ULONG64 diff; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 4e3d259..5fdd121 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -138,7 +138,7 @@ BackgroundCopyManagerImpl globalMgr = { HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) { TRACE("(%p,%p)\n", pUnkOuter, ppObj); - *ppObj = (IBackgroundCopyManager *) &globalMgr; + *ppObj = &globalMgr; return S_OK; }

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 02ace3613c85a605e1947fc36f0c0435e1bd2684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ace3613c85a605e1947fc36… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 21 20:01:10 2009 +0100 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index cb10be4..f93b485 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -289,7 +289,7 @@ static void TestCallback(void) tvi.pszText = buf; tvi.cchTextMax = sizeof(buf)/sizeof(buf[0]); ret = TreeView_GetItem(hTree, &tvi); - ok(ret == 1, "ret"); + ok(ret == 1, "ret\n"); ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Callback item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT);

1 0

Francois Gouget : riched20/tests: Make test_TxGetNaturalSize() static.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 30ad4c9eb02e8eb44f949960c0a2b7f4272dc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ad4c9eb02e8eb44f949960c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 21 20:01:28 2009 +0100 riched20/tests: Make test_TxGetNaturalSize() static. --- dlls/riched20/tests/txtsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 87cbebf..e4d6ae4 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -671,7 +671,7 @@ static void test_TxSetText(void) CoTaskMemFree(dummyTextHost); } -void test_TxGetNaturalSize() { +static void test_TxGetNaturalSize(void) { HRESULT result; BOOL ret;

1 0

Francois Gouget : comdlg32: Remove a space before a '\n'.
by Alexandre Julliard 22 Jan '09

22 Jan '09

Module: wine Branch: master Commit: 21ca20b7a801ed37bbac7f405ed9f8a42921683b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ca20b7a801ed37bbac7f405… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 21 20:03:05 2009 +0100 comdlg32: Remove a space before a '\n'. --- dlls/comdlg32/cdlg_Sk.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Sk.rc b/dlls/comdlg32/cdlg_Sk.rc index afd070e..36d2a2a 100644 --- a/dlls/comdlg32/cdlg_Sk.rc +++ b/dlls/comdlg32/cdlg_Sk.rc @@ -373,7 +373,7 @@ STRINGTABLE DISCARDABLE IDS_CREATEFILE "File does not exist\nDo you want to create file" IDS_OVERWRITEFILE "File does already exist.\nDo you want to replace it?" IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" - IDS_INVALID_FILENAME "N�zov s�boru nem��e obsahova� �iadny z nasledovn�ch znakov: \n / : < > |" + IDS_INVALID_FILENAME "N�zov s�boru nem��e obsahova� �iadny z nasledovn�ch znakov:\n / : < > |" IDS_PATHNOTEXISTING "Cesta neexistuje" IDS_FILENOTEXISTING "S�bor neexistuje" }

1 0