diff options
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/afl.c | 3 | ||||
| -rw-r--r-- | loader/dshow/cmediasample.c | 2 | ||||
| -rw-r--r-- | loader/dshow/inputpin.c | 6 | ||||
| -rw-r--r-- | loader/dshow/outputpin.c | 9 | ||||
| -rw-r--r-- | loader/ext.c | 5 | ||||
| -rw-r--r-- | loader/ldt_keeper.c | 3 | ||||
| -rw-r--r-- | loader/pe_image.c | 6 | ||||
| -rw-r--r-- | loader/registry.c | 6 |
8 files changed, 14 insertions, 26 deletions
diff --git a/loader/afl.c b/loader/afl.c index a138a7e259..337cbcd551 100644 --- a/loader/afl.c +++ b/loader/afl.c @@ -310,8 +310,7 @@ PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p) while (p->pACMDriverList) acmDriverClose((HACMDRIVER) p->pACMDriverList, 0); - if (p->pszFileName) - free(p->pszFileName); + free(p->pszFileName); if (p == MSACM_pFirstACMDriverID) MSACM_pFirstACMDriverID = p->pNextACMDriverID; diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index efa3ef89cd..3b7e45bb15 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -351,7 +351,7 @@ static HRESULT STDCALL CMediaSample_GetMediaType(IMediaSample* This, } t = &((CMediaSample*)This)->media_type; - // if(t.pbFormat)free(t.pbFormat); + // free(t.pbFormat); *ppMediaType=CreateMediaType(t); // *ppMediaType=0; //media type was not changed return 0; diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 3227339bee..f3ca4ba6c0 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -857,8 +857,7 @@ static IPin* CBaseFilter_GetUnusedPin(CBaseFilter* This) */ static void CBaseFilter_Destroy(CBaseFilter* This) { - if (This->vt) - free(This->vt); + free(This->vt); if (This->pin) This->pin->vt->Release((IUnknown*)This->pin); if (This->unused_pin) @@ -1190,8 +1189,7 @@ static void CBaseFilter2_Destroy(CBaseFilter2* This) Debug printf("CBaseFilter2_Destroy(%p) called\n", This); if (This->pin) This->pin->vt->Release((IUnknown*) This->pin); - if (This->vt) - free(This->vt); + free(This->vt); free(This); } diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index c24c29efb3..ad53303df5 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -792,12 +792,9 @@ static void COutputPin_SetNewFormat(COutputPin* This, const AM_MEDIA_TYPE* amt) */ static void COutputPin_Destroy(COutputPin* This) { - if (This->mempin->vt) - free(This->mempin->vt); - if (This->mempin) - free(This->mempin); - if (This->vt) - free(This->vt); + free(This->mempin->vt); + free(This->mempin); + free(This->vt); FreeMediaType(&(This->type)); free(This); } diff --git a/loader/ext.c b/loader/ext.c index 26b6a5a3c3..d91ab4a3de 100644 --- a/loader/ext.c +++ b/loader/ext.c @@ -93,7 +93,7 @@ LPVOID WINAPI HeapAlloc(HANDLE heap, DWORD flags, DWORD size) WIN_BOOL WINAPI HeapFree(HANDLE heap, DWORD flags, LPVOID mem) { - if (mem) free(mem); + free(mem); //printf("HeapFree %p\n", mem); //if (!mem) // abort(); @@ -409,8 +409,7 @@ WIN_BOOL WINAPI UnmapViewOfFile(LPVOID handle) result=munmap((void*)handle, p->mapping_size); if(p->next)p->next->prev=p->prev; if(p->prev)p->prev->next=p->next; - if(p->name) - free(p->name); + free(p->name); if(p==fm) fm=p->prev; free(p); diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 821137ee9f..3f7933426a 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -271,8 +271,7 @@ void Restore_LDT_Keeper(ldt_fs_t* ldt_fs) { if (ldt_fs == NULL || ldt_fs->fs_seg == 0) return; - if (ldt_fs->prev_struct) - free(ldt_fs->prev_struct); + free(ldt_fs->prev_struct); munmap((char*)ldt_fs->fs_seg, getpagesize()); ldt_fs->fs_seg = 0; free(ldt_fs); diff --git a/loader/pe_image.c b/loader/pe_image.c index b13dfd0130..85b56ab4f2 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -868,10 +868,8 @@ void PE_UnloadLibrary(WINE_MODREF *wm) { TRACE(" unloading %s\n", wm->filename); - if (wm->filename) - free(wm->filename); - if (wm->short_filename) - free(wm->short_filename); + free(wm->filename); + free(wm->short_filename); HeapFree( GetProcessHeap(), 0, wm->deps ); VirtualFree( (LPVOID)wm->module, 0, MEM_RELEASE ); HeapFree( GetProcessHeap(), 0, wm ); diff --git a/loader/registry.c b/loader/registry.c index 4a41911cdf..2eb449124c 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -158,8 +158,7 @@ void free_registry(void) while (t) { reg_handle_t* f = t; - if (t->name) - free(t->name); + free(t->name); t=t->prev; free(f); } @@ -380,8 +379,7 @@ long __stdcall RegCloseKey(long key) handle->prev->next=handle->next; if(handle->next) handle->next->prev=handle->prev; - if(handle->name) - free(handle->name); + free(handle->name); if(handle==head) head=head->prev; free(handle); |