system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 01:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

iccvid: Use CRT allocation functions.

Browse source
This commit is contained in:
Alex Henrie 2023-11-02 21:30:32 -06:00 committed by Alexandre Julliard
parent e90e08b599
commit f10be2e88b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/iccvid/iccvid.c
View file

@ -51,7 +51,6 @@
#include "iccvid_private.h"
#include "wine/debug.h"
#include "wine/heap.h"
WINE_DEFAULT_DEBUG_CHANNEL(iccvid);
@ -353,7 +352,7 @@ static cinepak_info *decode_cinepak_init(void)
cinepak_info *cvinfo;
int i;
cvinfo = heap_alloc( sizeof (cinepak_info) );
cvinfo = malloc(sizeof(cinepak_info));
if( !cvinfo )
return NULL;
cvinfo->strip_num = 0;
@ -374,10 +373,10 @@ static void free_cvinfo( cinepak_info *cvinfo )
for( i=0; i<cvinfo->strip_num; i++ )
{
heap_free(cvinfo->v4_codebook[i]);
heap_free(cvinfo->v1_codebook[i]);
free(cvinfo->v4_codebook[i]);
free(cvinfo->v1_codebook[i]);
}
heap_free( cvinfo );
free( cvinfo );
}
typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit,
@ -481,13 +480,13 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size,
for(i = cvinfo->strip_num; i < frame.strips; i++)
{
if((cvinfo->v4_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL)
if((cvinfo->v4_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL)
{
ERR("CVID: codebook v4 alloc err\n");
return;
}
if((cvinfo->v1_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL)
if((cvinfo->v1_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL)
{
ERR("CVID: codebook v1 alloc err\n");
return;
@ -941,7 +940,7 @@ static LRESULT ICCVID_Close( ICCVID_Info *info )
return 0;
if( info->cvinfo )
free_cvinfo( info->cvinfo );
heap_free( info );
free( info );
return 1;
}
@ -1001,7 +1000,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0;
info = heap_alloc( sizeof (ICCVID_Info) );
info = malloc(sizeof(ICCVID_Info));
if( info )
{
info->dwMagic = ICCVID_MAGIC;