janitorial: Remove superfluous casts of void pointers to other pointer types.

This commit is contained in:
Michael Stefaniuc 2007-06-27 00:16:11 +02:00 committed by Alexandre Julliard
parent b4475b257e
commit 0152ec0375
5 changed files with 5 additions and 5 deletions

View file

@ -260,7 +260,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream
hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
pNewStreams = (IMediaStream**)CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*));
if (!pNewStreams) if (!pNewStreams)
{ {
IMediaStream_Release(pStream); IMediaStream_Release(pStream);

View file

@ -150,7 +150,7 @@ xmlChar *xmlChar_from_wchar( LPWSTR str )
xmlChar *xmlstr; xmlChar *xmlstr;
len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL );
xmlstr = (xmlChar*) HeapAlloc( GetProcessHeap(), 0, len ); xmlstr = HeapAlloc( GetProcessHeap(), 0, len );
if ( xmlstr ) if ( xmlstr )
WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL ); WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL );
return xmlstr; return xmlstr;

View file

@ -2682,7 +2682,7 @@ static void
RTFFlushCPOutputBuffer(RTF_Info *info) RTFFlushCPOutputBuffer(RTF_Info *info)
{ {
int bufferMax = info->dwCPOutputCount * 2 * sizeof(WCHAR); int bufferMax = info->dwCPOutputCount * 2 * sizeof(WCHAR);
WCHAR *buffer = (WCHAR *)RTFAlloc(bufferMax); WCHAR *buffer = RTFAlloc(bufferMax);
int length; int length;
length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer, length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer,

View file

@ -605,7 +605,7 @@ static void test_StrCmpW(void)
static WCHAR *CoDupStrW(const char* src) static WCHAR *CoDupStrW(const char* src)
{ {
INT len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); INT len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0);
WCHAR* szTemp = (WCHAR*)CoTaskMemAlloc(len * sizeof(WCHAR)); WCHAR* szTemp = CoTaskMemAlloc(len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, src, -1, szTemp, len); MultiByteToWideChar(CP_ACP, 0, src, -1, szTemp, len);
return szTemp; return szTemp;
} }

View file

@ -94,7 +94,7 @@ static void test_CopyImage_Bitmap(int depth)
unsigned int i; unsigned int i;
/* Create a device-independent bitmap (DIB) */ /* Create a device-independent bitmap (DIB) */
info = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 2; info->bmiHeader.biWidth = 2;
info->bmiHeader.biHeight = 2; info->bmiHeader.biHeight = 2;