diff options
Diffstat (limited to 'loader/dshow')
| -rw-r--r-- | loader/dshow/allocator.c | 6 | ||||
| -rw-r--r-- | loader/dshow/cmediasample.c | 8 | ||||
| -rw-r--r-- | loader/dshow/inputpin.c | 24 |
3 files changed, 19 insertions, 19 deletions
diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 8ead279a37..b75f1bebfb 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -58,7 +58,7 @@ static inline int avm_list_print(avm_list_t* head) static inline avm_list_t* avm_list_add_head(avm_list_t* head, void* member) { - avm_list_t* n = (avm_list_t*) malloc(sizeof(avm_list_t)); + avm_list_t* n = malloc(sizeof(avm_list_t)); n->member = member; if (!head) @@ -310,7 +310,7 @@ IMPLEMENT_IUNKNOWN(MemAllocator) MemAllocator* MemAllocatorCreate() { - MemAllocator* This = (MemAllocator*) malloc(sizeof(MemAllocator)); + MemAllocator* This = malloc(sizeof(MemAllocator)); if (!This) return NULL; @@ -323,7 +323,7 @@ MemAllocator* MemAllocatorCreate() This->props.cbAlign = 1; This->props.cbPrefix = 0; - This->vt = (IMemAllocator_vt*) malloc(sizeof(IMemAllocator_vt)); + This->vt = malloc(sizeof(IMemAllocator_vt)); if (!This->vt) { diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index c594bae787..efa3ef89cd 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -313,7 +313,7 @@ static HRESULT STDCALL CMediaSample_SetActualDataLength(IMediaSample* This, char* c = cms->own_block; Debug printf("CMediaSample - buffer overflow %ld %d %p %p\n", __MIDL_0010, ((CMediaSample*)This)->size, cms->own_block, cms->block); - cms->own_block = (char*) realloc(cms->own_block, (size_t) __MIDL_0010 + SAFETY_ACEL); + cms->own_block = realloc(cms->own_block, (size_t) __MIDL_0010 + SAFETY_ACEL); if (c == cms->block) cms->block = cms->own_block; cms->size = __MIDL_0010; @@ -510,7 +510,7 @@ static void CMediaSample_ResetPointer(CMediaSample* This) */ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size) { - CMediaSample* This = (CMediaSample*) malloc(sizeof(CMediaSample)); + CMediaSample* This = malloc(sizeof(CMediaSample)); if (!This) return NULL; @@ -524,8 +524,8 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size) //if (size < 0x1000) // size = (size + 0xfff) & ~0xfff; - This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt)); - This->own_block = (char*) malloc((size_t)size + SAFETY_ACEL); + This->vt = malloc(sizeof(IMediaSample_vt)); + This->own_block = malloc((size_t)size + SAFETY_ACEL); This->media_type.pbFormat = 0; This->media_type.pUnk = 0; diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 5c9b832f7a..3227339bee 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -167,7 +167,7 @@ IMPLEMENT_IUNKNOWN(CEnumPins) */ static CEnumPins* CEnumPinsCreate(IPin* p, IPin* pp) { - CEnumPins* This = (CEnumPins*) malloc(sizeof(CEnumPins)); + CEnumPins* This = malloc(sizeof(CEnumPins)); if (!This) return NULL; @@ -177,7 +177,7 @@ static CEnumPins* CEnumPinsCreate(IPin* p, IPin* pp) This->pin2 = pp; This->counter = 0; - This->vt = (IEnumPins_vt*) malloc(sizeof(IEnumPins_vt)); + This->vt = malloc(sizeof(IEnumPins_vt)); if (!This->vt) { free(This); @@ -539,7 +539,7 @@ IMPLEMENT_IUNKNOWN(CInputPin) */ CInputPin* CInputPinCreate(CBaseFilter* p, const AM_MEDIA_TYPE* amt) { - CInputPin* This = (CInputPin*) malloc(sizeof(CInputPin)); + CInputPin* This = malloc(sizeof(CInputPin)); if (!This) return NULL; @@ -548,7 +548,7 @@ CInputPin* CInputPinCreate(CBaseFilter* p, const AM_MEDIA_TYPE* amt) This->parent = p; CopyMediaType(&(This->type),amt); - This->vt= (IPin_vt*) malloc(sizeof(IPin_vt)); + This->vt= malloc(sizeof(IPin_vt)); if (!This->vt) { @@ -879,7 +879,7 @@ IMPLEMENT_IUNKNOWN(CBaseFilter) */ CBaseFilter* CBaseFilterCreate(const AM_MEDIA_TYPE* type, CBaseFilter2* parent) { - CBaseFilter* This = (CBaseFilter*) malloc(sizeof(CBaseFilter)); + CBaseFilter* This = malloc(sizeof(CBaseFilter)); if (!This) return NULL; @@ -888,7 +888,7 @@ CBaseFilter* CBaseFilterCreate(const AM_MEDIA_TYPE* type, CBaseFilter2* parent) This->pin = (IPin*) CInputPinCreate(This, type); This->unused_pin = (IPin*) CRemotePinCreate(This, parent->GetPin(parent)); - This->vt = (IBaseFilter_vt*) malloc(sizeof(IBaseFilter_vt)); + This->vt = malloc(sizeof(IBaseFilter_vt)); if (!This->vt || !This->pin || !This->unused_pin) { CBaseFilter_Destroy(This); @@ -1214,7 +1214,7 @@ static GUID CBaseFilter2_interf3 = */ CBaseFilter2* CBaseFilter2Create() { - CBaseFilter2* This = (CBaseFilter2*) malloc(sizeof(CBaseFilter2)); + CBaseFilter2* This = malloc(sizeof(CBaseFilter2)); if (!This) return NULL; @@ -1222,7 +1222,7 @@ CBaseFilter2* CBaseFilter2Create() This->refcount = 1; This->pin = (IPin*) CRemotePin2Create(This); - This->vt = (IBaseFilter_vt*) malloc(sizeof(IBaseFilter_vt)); + This->vt = malloc(sizeof(IBaseFilter_vt)); if (!This->pin || !This->vt) { @@ -1374,7 +1374,7 @@ IMPLEMENT_IUNKNOWN(CRemotePin) */ CRemotePin* CRemotePinCreate(CBaseFilter* pt, IPin* rpin) { - CRemotePin* This = (CRemotePin*) malloc(sizeof(CRemotePin)); + CRemotePin* This = malloc(sizeof(CRemotePin)); if (!This) return NULL; @@ -1385,7 +1385,7 @@ CRemotePin* CRemotePinCreate(CBaseFilter* pt, IPin* rpin) This->remote_pin = rpin; This->refcount = 1; - This->vt = (IPin_vt*) malloc(sizeof(IPin_vt)); + This->vt = malloc(sizeof(IPin_vt)); if (!This->vt) { @@ -1464,7 +1464,7 @@ IMPLEMENT_IUNKNOWN(CRemotePin2) */ CRemotePin2* CRemotePin2Create(CBaseFilter2* p) { - CRemotePin2* This = (CRemotePin2*) malloc(sizeof(CRemotePin2)); + CRemotePin2* This = malloc(sizeof(CRemotePin2)); if (!This) return NULL; @@ -1474,7 +1474,7 @@ CRemotePin2* CRemotePin2Create(CBaseFilter2* p) This->parent = p; This->refcount = 1; - This->vt = (IPin_vt*) malloc(sizeof(IPin_vt)); + This->vt = malloc(sizeof(IPin_vt)); if (!This->vt) { |