January 2009 - Wine-Commits

Jacek Caban : wininet: Make sure that we have data buffered before sending INTERNET_STATUS_REQUEST_COMPLETE notification .
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 12931062fbf5387cfcb0bdb65a110c503728bd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12931062fbf5387cfcb0bdb65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 00:28:25 2009 +0100 wininet: Make sure that we have data buffered before sending INTERNET_STATUS_REQUEST_COMPLETE notification. --- dlls/wininet/http.c | 50 +++++++++++++++++++++++++++++++------------- dlls/wininet/tests/http.c | 2 +- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d4ea219..cdcf8e1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1636,6 +1636,29 @@ static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buf return ERROR_INTERNET_INVALID_OPTION; } +static void HTTP_ReceiveRequestData(WININETHTTPREQW *req) +{ + INTERNET_ASYNC_RESULT iar; + BYTE buffer[4096]; + BOOL res; + + TRACE("%p\n", req); + + res = NETCON_recv(&req->netConnection, buffer, + min(sizeof(buffer), req->dwContentLength - req->dwContentRead), + MSG_PEEK, (int *)&iar.dwError); + + if(res) { + iar.dwResult = (DWORD_PTR)req->hdr.hInternet; + }else { + iar.dwResult = 0; + iar.dwError = INTERNET_GetLastError(); + } + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); +} + static DWORD HTTP_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) { int bytes_read; @@ -1847,17 +1870,8 @@ static BOOL HTTPREQ_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR static void HTTPREQ_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest) { WININETHTTPREQW *req = (WININETHTTPREQW*)workRequest->hdr; - INTERNET_ASYNC_RESULT iar; - char buffer[4048]; - TRACE("%p\n", workRequest->hdr); - - iar.dwResult = NETCON_recv(&req->netConnection, buffer, - min(sizeof(buffer), req->dwContentLength - req->dwContentRead), - MSG_PEEK, (int *)&iar.dwError); - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + HTTP_ReceiveRequestData(req); } static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) @@ -3465,12 +3479,18 @@ lend: /* TODO: send notification for P3P header */ - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; - iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); + if(lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { + if(bSuccess) { + HTTP_ReceiveRequestData(lpwhr); + }else { + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwError = INTERNET_GetLastError(); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); + } + } TRACE("<--\n"); if (bSuccess) INTERNET_SetLastError(ERROR_SUCCESS); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 89995bf..34f4708 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -367,7 +367,7 @@ static void InternetReadFile_test(int flags) if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); else - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); /* Sent on WinXP only if first_connection_to_test_url is TRUE, on Win98 always sent */ CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);

1 0

Jacek Caban : urlmon: Call ReportProgress(BINDSTATUS_ACCEPTRANGES) in https handler.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 998b4653c9b37ff84339c84e344f9163d2ec1880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998b4653c9b37ff84339c84e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 18:20:00 2009 +0100 urlmon: Call ReportProgress(BINDSTATUS_ACCEPTRANGES) in https handler. --- dlls/urlmon/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 9ca8306..2e73653 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -625,6 +625,9 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA } } + if(This->https) + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_ACCEPTRANGES, NULL); + len = 0; if ((!HttpQueryInfoW(This->request, HTTP_QUERY_CONTENT_TYPE, content_type, &len, NULL) && GetLastError() != ERROR_INSUFFICIENT_BUFFER) ||

1 0

Michael Stefaniuc : dmusic: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 68eb63a4faa4bbdbe5ff8efe137380cb79269e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68eb63a4faa4bbdbe5ff8efe1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:57:20 2009 +0100 dmusic: Remove superfluous pointer casts. --- dlls/dmusic/collection.c | 8 ++++---- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 4 ++-- dlls/dmusic/instrument.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index ba16acc..06ec651 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -36,19 +36,19 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IUnknown_QueryInterface (LPUNKN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicCollectionImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicCollection)) { - *ppobj = (LPVOID)&This->CollectionVtbl; + *ppobj = &This->CollectionVtbl; IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef ((LPDIRECTMUSICCOLLECTION)&This->CollectionVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicCollectionImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicCollectionImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 2c6bdd2..09c63ea 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -91,7 +91,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD dwI TRACE("enumerating 'digital sound' ports\n"); if (i == dwIndex) { - DirectSoundEnumerateA((LPDSENUMCALLBACKA) register_waveport, (VOID*) pPortCaps); + DirectSoundEnumerateA(register_waveport, pPortCaps); return S_OK; } } diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 5789e8a..32171fa 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -167,11 +167,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusic) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &DirectMusic_CF; + *ppv = &DirectMusic_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicCollection) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Collection_CF; + *ppv = &Collection_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 2312d51..11a19fd 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -33,11 +33,11 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_IUnknown_QueryInterface (LPUNKN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicInstrumentImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicInstrument)) { - *ppobj = (LPVOID)&This->InstrumentVtbl; + *ppobj = &This->InstrumentVtbl; IDirectMusicInstrumentImpl_IDirectMusicInstrument_AddRef ((LPDIRECTMUSICINSTRUMENT)&This->InstrumentVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicInstrumentPRIVATE)) { @@ -46,7 +46,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_IUnknown_QueryInterface (LPUNKN that whoever calls it knows the layout of original implementation table and therefore tries to get data by direct access... expect crashes */ FIXME("*sigh*... requested private/unspecified interface\n"); - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicInstrumentImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; }

1 0

Michael Stefaniuc : dmime: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 49177a09580642642abc4f41f0f75ef0eed15317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49177a09580642642abc4f41f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:56:24 2009 +0100 dmime: Remove superfluous pointer casts. --- dlls/dmime/audiopath.c | 8 ++++---- dlls/dmime/dmime_main.c | 28 ++++++++++++++-------------- dlls/dmime/graph.c | 8 ++++---- dlls/dmime/lyricstrack.c | 4 ++-- dlls/dmime/markertrack.c | 4 ++-- dlls/dmime/paramcontroltrack.c | 4 ++-- dlls/dmime/performance.c | 2 +- dlls/dmime/segment.c | 8 ++++---- dlls/dmime/segtriggertrack.c | 4 ++-- dlls/dmime/seqtrack.c | 4 ++-- dlls/dmime/sysextrack.c | 4 ++-- dlls/dmime/tempotrack.c | 4 ++-- dlls/dmime/timesigtrack.c | 4 ++-- dlls/dmime/wavetrack.c | 4 ++-- 14 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49177a09580642642abc4…

1 0

Michael Stefaniuc : user32/tests: Do not cast the (IDC|IDI|RT) _* defines to LPSTR.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: e202baabd5cea4fdb2fd850581e518888947ed41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e202baabd5cea4fdb2fd85058… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:55:46 2009 +0100 user32/tests: Do not cast the (IDC|IDI|RT)_* defines to LPSTR. --- dlls/user32/tests/broadcast.c | 2 +- dlls/user32/tests/dce.c | 2 +- dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/edit.c | 2 +- dlls/user32/tests/input.c | 6 +++--- dlls/user32/tests/listbox.c | 2 +- dlls/user32/tests/menu.c | 12 ++++++------ dlls/user32/tests/msg.c | 6 +++--- dlls/user32/tests/sysparams.c | 6 +++--- dlls/user32/tests/win.c | 30 +++++++++++++++--------------- dlls/user32/tests/winstation.c | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e202baabd5cea4fdb2fd8…

1 0

Michael Stefaniuc : version: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 934ed50d49b1f6e9ce81b4ca827a3c4330f4b8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934ed50d49b1f6e9ce81b4ca8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:55:14 2009 +0100 version: Remove superfluous pointer casts. --- dlls/version/info.c | 10 +++++----- dlls/version/resource.c | 2 +- dlls/version/tests/info.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 6036f38..95dadaf 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -547,7 +547,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { DWORD len; - VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data; + VS_VERSION_INFO_STRUCT32* vvis = data; TRACE("(%s,%d,size=%d,data=%p)\n", debugstr_w(filename), handle, datasize, data ); @@ -769,7 +769,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, { static const char rootA[] = "\\"; static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; - const VS_VERSION_INFO_STRUCT16 *info = (const VS_VERSION_INFO_STRUCT16 *)pBlock; + const VS_VERSION_INFO_STRUCT16 *info = pBlock; TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); @@ -806,7 +806,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4; DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*lplpBuffer, -1, + len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; *puLen = len; @@ -828,7 +828,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; - const VS_VERSION_INFO_STRUCT32 *info = (const VS_VERSION_INFO_STRUCT32 *)pBlock; + const VS_VERSION_INFO_STRUCT32 *info = pBlock; TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); @@ -866,7 +866,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; DWORD max = (info->wLength - sizeof(VS_FIXEDFILEINFO)) * 4 - info->wLength; - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*lplpBuffer, -1, + len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1, lpBufferW + pos, max/sizeof(WCHAR) - pos ); *lplpBuffer = lpBufferW + pos; *puLen = len; diff --git a/dlls/version/resource.c b/dlls/version/resource.c index ef5ded2..efd9115 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -343,7 +343,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Find resource */ resDir = resSection + (resDataDir->VirtualAddress - sections[i].VirtualAddress); - resPtr = (const IMAGE_RESOURCE_DIRECTORY*)resDir; + resPtr = resDir; resPtr = find_entry_by_name( resPtr, typeid, resDir ); if ( !resPtr ) { diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index a4f969e..edf607c 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -383,7 +383,7 @@ static void test_32bit_win(void) if (is_unicode_enabled) { - VS_VERSION_INFO_STRUCT32 *vvis = (VS_VERSION_INFO_STRUCT32 *)pVersionInfoW; + VS_VERSION_INFO_STRUCT32 *vvis = pVersionInfoW; ok ( retvalW == ((vvis->wLength * 2) + 4) || retvalW == (vvis->wLength * 1.5), "Structure is not of the correct size\n"); }

1 0

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

Jan. 13, 2009

Module: wine Branch: master Commit: 898d795fdd31b327cff9a57c8b778dd1d75e4546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898d795fdd31b327cff9a57c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:54:56 2009 +0100 wintrust/tests: Remove superfluous pointer casts. --- dlls/wintrust/tests/asn.c | 58 ++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=898d795fdd31b327cff9a…

1 0

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

Jan. 13, 2009

Module: wine Branch: master Commit: 2fc7b8100973408a0508156fc1bcce8c4e503290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc7b8100973408a0508156fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:57:53 2009 +0100 advapi32/tests: Remove superfluous pointer casts. --- dlls/advapi32/tests/crypt.c | 12 ++++++------ dlls/advapi32/tests/crypt_lmhash.c | 2 +- dlls/advapi32/tests/crypt_md4.c | 2 +- dlls/advapi32/tests/crypt_md5.c | 2 +- dlls/advapi32/tests/security.c | 16 ++++++++-------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 44d0896..5a5b26e 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -461,8 +461,8 @@ static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvNam RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, NULL, NULL, NULL, NULL, NULL, NULL); (*pcbProvName)++; - - if (!(*pszProvName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))) + + if (!(*pszProvName = LocalAlloc(LMEM_ZEROINIT, *pcbProvName))) return FALSE; RegEnumKeyEx(hKey, dwIndex, *pszProvName, pcbProvName, NULL, NULL, NULL, NULL); @@ -518,7 +518,7 @@ static void test_enum_providers(void) /* alloc provider to half the size required * cbName holds the size required */ providerLen = cbName / 2; - if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) + if (!(provider = LocalAlloc(LMEM_ZEROINIT, providerLen))) return; result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); @@ -546,7 +546,7 @@ static void test_enum_providers(void) /* check expected versus actual values returned */ result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, NULL, &providerLen); ok(result && providerLen==cbName, "expected %i, got %i\n", (int)cbName, (int)providerLen); - if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) + if (!(provider = LocalAlloc(LMEM_ZEROINIT, providerLen))) return; providerLen = 0xdeadbeef; @@ -670,7 +670,7 @@ static void test_enum_provider_types(void) /* alloc provider type to half the size required * cbTypeName holds the size required */ typeNameSize = cbTypeName / 2; - if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) + if (!(typeName = LocalAlloc(LMEM_ZEROINIT, typeNameSize))) goto cleanup; SetLastError(0xdeadbeef); @@ -700,7 +700,7 @@ static void test_enum_provider_types(void) /* check expected versus actual values returned */ result = pCryptEnumProviderTypesA(index, NULL, 0, &provType, NULL, &typeNameSize); ok(result && typeNameSize==cbTypeName, "expected %d, got %d\n", cbTypeName, typeNameSize); - if (!(typeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, typeNameSize)))) + if (!(typeName = LocalAlloc(LMEM_ZEROINIT, typeNameSize))) goto cleanup; typeNameSize = 0xdeadbeef; diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 63ab2c0..df1d3a7 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -259,7 +259,7 @@ static void test_SystemFunction004(void) key.Length = 0x100; key.MaximumLength = 0x100; - r = pSystemFunction004(&in, &key, (struct ustring *)&out); + r = pSystemFunction004(&in, &key, &out); ok(r == STATUS_BUFFER_TOO_SMALL, "function failed\n"); in.Buffer = inbuf; diff --git a/dlls/advapi32/tests/crypt_md4.c b/dlls/advapi32/tests/crypt_md4.c index 15a594b..02e4c02 100644 --- a/dlls/advapi32/tests/crypt_md4.c +++ b/dlls/advapi32/tests/crypt_md4.c @@ -49,7 +49,7 @@ fnSystemFunction007 pSystemFunction007; md4hashfunc pSystemFunction010; md4hashfunc pSystemFunction011; -#define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD4_CTX, in ) ) +#define ctxcmp( a, b ) memcmp( a, b, FIELD_OFFSET( MD4_CTX, in ) ) static void test_md4_ctx(void) { diff --git a/dlls/advapi32/tests/crypt_md5.c b/dlls/advapi32/tests/crypt_md5.c index 23d7d6b..4c6346c 100644 --- a/dlls/advapi32/tests/crypt_md5.c +++ b/dlls/advapi32/tests/crypt_md5.c @@ -41,7 +41,7 @@ fnMD5Init pMD5Init; fnMD5Update pMD5Update; fnMD5Final pMD5Final; -#define ctxcmp( a, b ) memcmp( (char*)a, (char*)b, FIELD_OFFSET( MD5_CTX, in ) ) +#define ctxcmp( a, b ) memcmp( a, b, FIELD_OFFSET( MD5_CTX, in ) ) static void test_md5_ctx(void) { diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0eccbaa..8682cc9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -240,7 +240,7 @@ static void test_sid(void) GetLastError() ); ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n"); - pisid = (SID *)psid; + pisid = psid; ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount); ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); @@ -266,7 +266,7 @@ static void test_sid(void) r = pConvertStringSidToSidA( refs[i].refStr, &psid ); ok( r, "failed to parse sid string\n" ); - pisid = (PISID)psid; + pisid = psid; ok( pisid && !memcmp( pisid->IdentifierAuthority.Value, refs[i].auth.Value, sizeof(refs[i].auth) ), @@ -373,7 +373,7 @@ static void test_trustee(void) "MultipleTrusteeOperation wrong\n"); ok( trustee.TrusteeForm == TRUSTEE_IS_SID, "TrusteeForm wrong\n"); ok( trustee.TrusteeType == TRUSTEE_IS_UNKNOWN, "TrusteeType wrong\n"); - ok( trustee.ptstrName == (LPSTR) psid, "ptstrName wrong\n" ); + ok( trustee.ptstrName == psid, "ptstrName wrong\n" ); /* test BuildTrusteeWithObjectsAndSidA (test 1) */ memset( &trustee, 0xff, sizeof trustee ); @@ -2215,7 +2215,7 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; - ExplicitAccess.Trustee.ptstrName = (LPWSTR)EveryoneSid; + ExplicitAccess.Trustee.ptstrName = EveryoneSid; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n"); @@ -2263,7 +2263,7 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.grfAccessMode = REVOKE_ACCESS; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; - ExplicitAccess.Trustee.ptstrName = (LPWSTR)UsersSid; + ExplicitAccess.Trustee.ptstrName = UsersSid; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n"); @@ -2508,17 +2508,17 @@ static void test_ConvertSecurityDescriptorToString() size = 4096; pCreateWellKnownSid(WinLocalSid, NULL, sid_buf, &size); - SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, FALSE); + SetSecurityDescriptorOwner(&desc, sid_buf, FALSE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:S-1-2-0"); - SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, TRUE); + SetSecurityDescriptorOwner(&desc, sid_buf, TRUE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:S-1-2-0"); size = sizeof(sid_buf); pCreateWellKnownSid(WinLocalSystemSid, NULL, sid_buf, &size); - SetSecurityDescriptorOwner(&desc, (PSID)sid_buf, TRUE); + SetSecurityDescriptorOwner(&desc, sid_buf, TRUE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SY");

1 0

Michael Stefaniuc : dmscript: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: d62a0eec7b83f25e01c250938b5c9f638237aab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62a0eec7b83f25e01c250938… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:56:48 2009 +0100 dmscript: Remove superfluous pointer casts. --- dlls/dmscript/dmscript_main.c | 20 ++++++++++---------- dlls/dmscript/script.c | 10 +++++----- dlls/dmscript/scripttrack.c | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index ae1cdbc..bbecb7b 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -582,43 +582,43 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegment) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSegment_CF; + *ppv = &ScriptAutoImplSegment_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptTrack_CF; + *ppv = &ScriptTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_AudioVBScript) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &AudioVBScript_CF; + *ppv = &AudioVBScript_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScript) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Script_CF; + *ppv = &Script_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpPerformance) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplPerformance_CF; + *ppv = &ScriptAutoImplPerformance_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptSourceCodeLoader) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptSourceCodeLoader_CF; + *ppv = &ScriptSourceCodeLoader_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSegmentState) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSegmentState_CF; + *ppv = &ScriptAutoImplSegmentState_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPathConfig) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplAudioPathConfig_CF; + *ppv = &ScriptAutoImplAudioPathConfig_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplAudioPath_CF; + *ppv = &ScriptAutoImplAudioPath_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicScriptAutoImpSong) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &ScriptAutoImplSong_CF; + *ppv = &ScriptAutoImplSong_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 3d9ae42..d7c696b 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -45,19 +45,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPVOID)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = (LPVOID)&This->ScriptVtbl; + *ppobj = &This->ScriptVtbl; IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = (LPVOID)&This->ObjectVtbl; + *ppobj = &This->ObjectVtbl; IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPVOID)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } @@ -524,7 +524,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA IDirectMusicObject* pObject = NULL; DMUS_OBJECTDESC desc; - ZeroMemory ((LPVOID)&desc, sizeof(DMUS_OBJECTDESC)); + ZeroMemory (&desc, sizeof(DMUS_OBJECTDESC)); desc.dwSize = sizeof(DMUS_OBJECTDESC); desc.dwValidData = DMUS_OBJ_STREAM | DMUS_OBJ_CLASS; desc.guidClass = CLSID_DirectMusicContainer; diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 4c3aca8..7ff8ef8 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -34,7 +34,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = (LPUNKNOWN)&This->UnknownVtbl; + *ppobj = &This->UnknownVtbl; IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = (LPPERSISTSTREAM)&This->PersistStreamVtbl; + *ppobj = &This->PersistStreamVtbl; IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Michael Stefaniuc : dmstyle: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 2b9c8433b2a81ab740d73a81ef2a28d3a53ac278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9c8433b2a81ab740d73a81e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 10:57:08 2009 +0100 dmstyle: Remove superfluous pointer casts. --- dlls/dmstyle/auditiontrack.c | 4 ++-- dlls/dmstyle/chordtrack.c | 4 ++-- dlls/dmstyle/commandtrack.c | 4 ++-- dlls/dmstyle/dmstyle_main.c | 16 ++++++++-------- dlls/dmstyle/motiftrack.c | 4 ++-- dlls/dmstyle/mutetrack.c | 4 ++-- dlls/dmstyle/style.c | 10 +++++----- dlls/dmstyle/styletrack.c | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b9c8433b2a81ab740d73…

1 0