summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:46:46 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:50:55 +0200
commite74708f6194ef0af2bdf37e857ed232027fa46ba (patch)
treef7b53476abeb1cc8ccbe1c49113e9722c51b7800 /loader
parent2ad00b5319603b22f9b0858bb14d016f673157cb (diff)
parentcb8796857c8bd851e3b97d729af149e3f003b851 (diff)
downloadmpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2
mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz
Merge svn changes up to r30748
Diffstat (limited to 'loader')
-rw-r--r--loader/dmo/buffer.c4
-rw-r--r--loader/dmo/dmo.c2
-rw-r--r--loader/drv.c4
-rw-r--r--loader/dshow/allocator.c6
-rw-r--r--loader/dshow/cmediasample.c8
-rw-r--r--loader/dshow/inputpin.c24
-rw-r--r--loader/elfdll.c6
-rw-r--r--loader/ext.c14
-rw-r--r--loader/ldt_keeper.c2
-rw-r--r--loader/module.c6
-rw-r--r--loader/registry.c2
-rw-r--r--loader/win32.c4
12 files changed, 41 insertions, 41 deletions
diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c
index 70883b9abe..78428e249f 100644
--- a/loader/dmo/buffer.c
+++ b/loader/dmo/buffer.c
@@ -69,12 +69,12 @@ IMPLEMENT_IUNKNOWN(CMediaBuffer)
CMediaBuffer* CMediaBufferCreate(unsigned long maxlen, void* mem,
unsigned long len, int copy)
{
- CMediaBuffer* This = (CMediaBuffer*) malloc(sizeof(CMediaBuffer));
+ CMediaBuffer* This = malloc(sizeof(CMediaBuffer));
if (!This)
return NULL;
- This->vt = (IMediaBuffer_vt*) malloc(sizeof(IMediaBuffer_vt));
+ This->vt = malloc(sizeof(IMediaBuffer_vt));
if (!This->vt)
{
CMediaBuffer_Destroy(This);
diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c
index f8898efcb5..0ca7cf3206 100644
--- a/loader/dmo/dmo.c
+++ b/loader/dmo/dmo.c
@@ -36,7 +36,7 @@ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id,
{
HRESULT hr = 0;
const char* em = NULL;
- DMO_Filter* This = (DMO_Filter*) malloc(sizeof(DMO_Filter));
+ DMO_Filter* This = malloc(sizeof(DMO_Filter));
if (!This)
return NULL;
diff --git a/loader/drv.c b/loader/drv.c
index 43d9485646..9479e6944d 100644
--- a/loader/drv.c
+++ b/loader/drv.c
@@ -75,7 +75,7 @@ void SetCodecPath(const char* path)
needs_free=0;
return;
}
- def_path = (char*) malloc(strlen(path)+1);
+ def_path = malloc(strlen(path)+1);
strcpy(def_path, path);
needs_free=1;
}
@@ -153,7 +153,7 @@ HDRVR DrvOpen(LPARAM lParam2)
#endif
printf("Loading codec DLL: '%s'\n",filename);
- hDriver = (NPDRVR) malloc(sizeof(DRVR));
+ hDriver = malloc(sizeof(DRVR));
if (!hDriver)
return (HDRVR) 0;
memset((void*)hDriver, 0, sizeof(DRVR));
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)
{
diff --git a/loader/elfdll.c b/loader/elfdll.c
index 1927640505..e4a0190f89 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -197,7 +197,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
// wm->binfmt.pe.pe_resource = (PIMAGE_RESOURCE_DIRECTORY)RVA(hModule, dir->VirtualAddress);
- wm->filename = (char*) malloc(strlen(path)+1);
+ wm->filename = malloc(strlen(path)+1);
strcpy(wm->filename, path);
wm->modname = strrchr( wm->filename, '\\' );
if (!wm->modname) wm->modname = wm->filename;
@@ -216,7 +216,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
if(local_wm)
{
- local_wm->next = (modref_list*) malloc(sizeof(modref_list));
+ local_wm->next = malloc(sizeof(modref_list));
local_wm->next->prev=local_wm;
local_wm->next->next=NULL;
local_wm->next->wm=wm;
@@ -224,7 +224,7 @@ static WINE_MODREF *ELFDLL_CreateModref(HMODULE hModule, LPCSTR path)
}
else
{
- local_wm = (modref_list*) malloc(sizeof(modref_list));
+ local_wm = malloc(sizeof(modref_list));
local_wm->next=local_wm->prev=NULL;
local_wm->wm=wm;
}
diff --git a/loader/ext.c b/loader/ext.c
index 23c0292c6c..9c00d1988b 100644
--- a/loader/ext.c
+++ b/loader/ext.c
@@ -197,7 +197,7 @@ WIN_BOOL WINAPI IsBadReadPtr(LPCVOID data, UINT size)
LPSTR HEAP_strdupA(HANDLE heap, DWORD flags, LPCSTR string)
{
// return strdup(string);
- char* answ = (char*) malloc(strlen(string) + 1);
+ char* answ = malloc(strlen(string) + 1);
strcpy(answ, string);
return answ;
}
@@ -208,7 +208,7 @@ LPWSTR HEAP_strdupAtoW(HANDLE heap, DWORD flags, LPCSTR string)
if(string==0)
return 0;
size=strlen(string);
- answer = (WCHAR*) malloc(sizeof(WCHAR) * (size + 1));
+ answer = malloc(sizeof(WCHAR) * (size + 1));
for(i=0; i<=size; i++)
answer[i]=(short)string[i];
return answer;
@@ -222,7 +222,7 @@ LPSTR HEAP_strdupWtoA(HANDLE heap, DWORD flags, LPCWSTR string)
size=0;
while(string[size])
size++;
- answer = (char*) malloc(size + 2);
+ answer = malloc(size + 2);
for(i=0; i<=size; i++)
answer[i]=(char)string[i];
return answer;
@@ -372,12 +372,12 @@ HANDLE WINAPI CreateFileMappingA(HANDLE handle, LPSECURITY_ATTRIBUTES lpAttr,
{
if(fm==0)
{
- fm = (file_mapping*) malloc(sizeof(file_mapping));
+ fm = malloc(sizeof(file_mapping));
fm->prev=NULL;
}
else
{
- fm->next = (file_mapping*) malloc(sizeof(file_mapping));
+ fm->next = malloc(sizeof(file_mapping));
fm->next->prev=fm;
fm=fm->next;
}
@@ -385,7 +385,7 @@ HANDLE WINAPI CreateFileMappingA(HANDLE handle, LPSECURITY_ATTRIBUTES lpAttr,
fm->handle=answer;
if(name)
{
- fm->name = (char*) malloc(strlen(name)+1);
+ fm->name = malloc(strlen(name)+1);
strcpy(fm->name, name);
}
else
@@ -510,7 +510,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type, DWORD protec
}
else
{
- virt_alloc *new_vm = (virt_alloc*) malloc(sizeof(virt_alloc));
+ virt_alloc *new_vm = malloc(sizeof(virt_alloc));
new_vm->mapping_size=size;
new_vm->address=(char*)answer;
new_vm->prev=vm;
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c
index c5fa434e80..ae5485ceff 100644
--- a/loader/ldt_keeper.c
+++ b/loader/ldt_keeper.c
@@ -182,7 +182,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
{
struct modify_ldt_ldt_s array;
int ret;
- ldt_fs_t* ldt_fs = (ldt_fs_t*) malloc(sizeof(ldt_fs_t));
+ ldt_fs_t* ldt_fs = malloc(sizeof(ldt_fs_t));
if (!ldt_fs)
return NULL;
diff --git a/loader/module.c b/loader/module.c
index 3eb024460a..79c01270d3 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -241,7 +241,7 @@ static WIN_BOOL MODULE_DllProcessAttach( WINE_MODREF *wm, LPVOID lpReserved )
//local_wm=wm;
if(local_wm)
{
- local_wm->next = (modref_list*) malloc(sizeof(modref_list));
+ local_wm->next = malloc(sizeof(modref_list));
local_wm->next->prev=local_wm;
local_wm->next->next=NULL;
local_wm->next->wm=wm;
@@ -854,7 +854,7 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
// memory management:
case 0x150011: //NewPtrClear
case 0x150012: //NewPtrSysClear
- reg->eax=(uint32_t)malloc(((uint32_t *)stack_base)[1]);
+ reg->eax = malloc(((uint32_t *)stack_base)[1]);
memset((void *)reg->eax,0,((uint32_t *)stack_base)[1]);
#ifdef DEBUG_QTX_API
printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
@@ -862,7 +862,7 @@ static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
return 1;
case 0x15000F: //NewPtr
case 0x150010: //NewPtrSys
- reg->eax=(uint32_t)malloc(((uint32_t *)stack_base)[1]);
+ reg->eax = malloc(((uint32_t *)stack_base)[1]);
#ifdef DEBUG_QTX_API
printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
#endif
diff --git a/loader/registry.c b/loader/registry.c
index 37a262270e..9964eeb9ff 100644
--- a/loader/registry.c
+++ b/loader/registry.c
@@ -277,7 +277,7 @@ static struct reg_value* insert_reg_value(int handle, const char* name, int type
{
if(regs==0)
create_registry();
- regs=(struct reg_value*)realloc(regs, sizeof(struct reg_value)*(reg_size+1));
+ regs = realloc(regs, sizeof(struct reg_value) * (reg_size +1 ));
//regs=(struct reg_value*)my_realloc(regs, sizeof(struct reg_value)*(reg_size+1));
v=regs+reg_size;
reg_size++;
diff --git a/loader/win32.c b/loader/win32.c
index fbd4d5a4e5..f560ffdfb4 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -358,7 +358,7 @@ void* mreq_private(int size, int to_zero, int type);
void* mreq_private(int size, int to_zero, int type)
{
int nsize = size + sizeof(alloc_header);
- alloc_header* header = (alloc_header* ) malloc(nsize);
+ alloc_header* header = malloc(nsize);
if (!header)
return 0;
if (to_zero)
@@ -4716,7 +4716,7 @@ static HPALETTE WINAPI expCreatePalette(CONST LOGPALETTE *lpgpl)
dbgprintf("CreatePalette(%x) => NULL\n", lpgpl);
i = sizeof(LOGPALETTE)+((lpgpl->palNumEntries-1)*sizeof(PALETTEENTRY));
- test = (HPALETTE)malloc(i);
+ test = malloc(i);
memcpy((void *)test, lpgpl, i);
return test;