Skip to content

W
wine-winehq
Commit 819ad641 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

msrle32: Remove some superfluous casts.

parent 27d8b743
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
dlls/msrle32/msrle32.c
View file @ 819ad641
...@@ -1136,7 +1136,7 @@ static CodecInfo* Open(LPICOPEN icinfo) ...@@ -1136,7 +1136,7 @@ static CodecInfo* Open(LPICOPEN icinfo)
return NULL; return NULL;
} }
pi = (CodecInfo*)LocalAlloc(LPTR, sizeof(CodecInfo)); pi = LocalAlloc(LPTR, sizeof(CodecInfo));
if (pi != NULL) { if (pi != NULL) {
pi->fccHandler = icinfo->fccHandler; pi->fccHandler = icinfo->fccHandler;
...@@ -1165,7 +1165,7 @@ static LRESULT Close(CodecInfo *pi) ...@@ -1165,7 +1165,7 @@ static LRESULT Close(CodecInfo *pi)
if (pi->pPrevFrame != NULL || pi->pCurFrame != NULL) if (pi->pPrevFrame != NULL || pi->pCurFrame != NULL)
CompressEnd(pi); CompressEnd(pi);
LocalFree((HLOCAL)pi); LocalFree(pi);
return 1; return 1;
} }
...@@ -1419,7 +1419,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, ...@@ -1419,7 +1419,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
switch (lpbiOut->biBitCount) { switch (lpbiOut->biBitCount) {
case 4: case 4:
case 8: case 8:
pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed); pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed);
if (pi->palette_map == NULL) { if (pi->palette_map == NULL) {
CompressEnd(pi); CompressEnd(pi);
return ICERR_MEMORY; return ICERR_MEMORY;
...@@ -1669,7 +1669,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, ...@@ -1669,7 +1669,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
switch (lpbiOut->biBitCount) { switch (lpbiOut->biBitCount) {
case 4: case 4:
case 8: case 8:
pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed); pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed);
if (pi->palette_map == NULL) if (pi->palette_map == NULL)
return ICERR_MEMORY; return ICERR_MEMORY;
...@@ -1679,7 +1679,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, ...@@ -1679,7 +1679,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
break; break;
case 15: case 15:
case 16: case 16:
pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2);
if (pi->palette_map == NULL) if (pi->palette_map == NULL)
return ICERR_MEMORY; return ICERR_MEMORY;
...@@ -1699,7 +1699,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, ...@@ -1699,7 +1699,7 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
break; break;
case 24: case 24:
case 32: case 32:
pi->palette_map = (LPBYTE)LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD));
if (pi->palette_map == NULL) if (pi->palette_map == NULL)
return ICERR_MEMORY; return ICERR_MEMORY;
memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD));
...@@ -1753,7 +1753,7 @@ static LRESULT DecompressEnd(CodecInfo *pi) ...@@ -1753,7 +1753,7 @@ static LRESULT DecompressEnd(CodecInfo *pi)
pi->bDecompress = FALSE; pi->bDecompress = FALSE;
if (pi->palette_map != NULL) { if (pi->palette_map != NULL) {
LocalFree((HLOCAL)pi->palette_map); LocalFree(pi->palette_map);
pi->palette_map = NULL; pi->palette_map = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment