wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : d3dx9: Avoid LPDIRECT3DSURFACE9.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 9ec7cdf12b07779d19d26097ba22bf276fda76ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec7cdf12b07779d19d26097b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:50 2012 +0100 d3dx9: Avoid LPDIRECT3DSURFACE9. --- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 108 +++++++++++++++------------------------------------ 2 files changed, 33 insertions(+), 77 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 909d81e..c5dffce 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -371,7 +371,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown) STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9 *device) PURE; STDMETHOD(GetDesc)(THIS_ D3DXRTS_DESC *desc) PURE; - STDMETHOD(BeginScene)(THIS_ LPDIRECT3DSURFACE9 surface, CONST D3DVIEWPORT9 *viewport) PURE; + STDMETHOD(BeginScene)(THIS_ struct IDirect3DSurface9 *surface, const D3DVIEWPORT9 *viewport) PURE; STDMETHOD(EndScene)(THIS_ DWORD mipfilter) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index c551e14..3c4d4c5 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -104,88 +104,44 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D /* Surface Loading/Saving */ -HRESULT WINAPI D3DXLoadSurfaceFromFileA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromFileW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPCWSTR srcfile, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) - -HRESULT WINAPI D3DXLoadSurfaceFromResourceA( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromResourceW( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - HMODULE srcmodule, - LPCWSTR resource, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); -#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) - -HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT*destrect, - LPCVOID srcdata, - UINT srcdatasize, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey, - D3DXIMAGE_INFO *srcinfo); - -HRESULT WINAPI D3DXLoadSurfaceFromSurface( LPDIRECT3DSURFACE9 destsurface, - CONST PALETTEENTRY *destpalette, - CONST RECT *destrect, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect, - DWORD filter, - D3DCOLOR colorkey); +HRESULT WINAPI D3DXLoadSurfaceFromFileA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const char *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromFileW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const WCHAR *srcfile, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromFile WINELIB_NAME_AW(D3DXLoadSurfaceFromFile) + +HRESULT WINAPI D3DXLoadSurfaceFromResourceA(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const char *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +HRESULT WINAPI D3DXLoadSurfaceFromResourceW(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, HMODULE srcmodule, const WCHAR *resource, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); +#define D3DXLoadSurfaceFromResource WINELIB_NAME_AW(D3DXLoadSurfaceFromResource) + +HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, const void *srcdata, UINT srcdatasize, + const RECT *srcrect, DWORD filter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo); + +HRESULT WINAPI D3DXLoadSurfaceFromSurface(struct IDirect3DSurface9 *destsurface, + const PALETTEENTRY *destpalette, const RECT *destrect, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect, DWORD filter, D3DCOLOR colorkey); HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const void *src_memory, D3DFORMAT src_format, UINT src_pitch, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key); -HRESULT WINAPI D3DXSaveSurfaceToFileInMemory( LPD3DXBUFFER *destbuffer, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileA( LPCSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); - -HRESULT WINAPI D3DXSaveSurfaceToFileW( LPCWSTR destfile, - D3DXIMAGE_FILEFORMAT destformat, - LPDIRECT3DSURFACE9 srcsurface, - CONST PALETTEENTRY *srcpalette, - CONST RECT *srcrect); -#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) +HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(struct ID3DXBuffer **destbuffer, + D3DXIMAGE_FILEFORMAT destformat, struct IDirect3DSurface9 *srcsurface, + const PALETTEENTRY *srcpalette, const RECT *srcrect); + +HRESULT WINAPI D3DXSaveSurfaceToFileA(const char *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *destfile, D3DXIMAGE_FILEFORMAT destformat, + struct IDirect3DSurface9 *srcsurface, const PALETTEENTRY *srcpalette, const RECT *srcrect); +#define D3DXSaveSurfaceToFile WINELIB_NAME_AW(D3DXSaveSurfaceToFile) /* Volume Loading/Saving */

1 0

Francois Gouget : cmd: Make WCMD_forf_getinputhandle() static.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 5f86884771b8be83c214a18ffb52ca5008bf5a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f86884771b8be83c214a18ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 19:50:10 2012 +0100 cmd: Make WCMD_forf_getinputhandle() static. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 855040e..e567bb6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1746,7 +1746,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { +static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING];

1 0

Francois Gouget : services: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: cbeae4ca3d302b1ddad78712617b9b41b1885445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeae4ca3d302b1ddad787126… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 19:44:51 2012 +0100 services: Fix compilation on systems that don't support nameless unions. --- programs/services/rpc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9fe81d1..166e2b7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -118,11 +118,11 @@ static void run_after_timeout(void (*func)(struct service_entry*), struct servic elem->service_entry = service; GetSystemTimeAsFileTime(&elem->time); - time.LowPart = elem->time.dwLowDateTime; - time.HighPart = elem->time.dwHighDateTime; + time.u.LowPart = elem->time.dwLowDateTime; + time.u.HighPart = elem->time.dwHighDateTime; time.QuadPart += timeout*10000000; - elem->time.dwLowDateTime = time.LowPart; - elem->time.dwHighDateTime = time.HighPart; + elem->time.dwLowDateTime = time.u.LowPart; + elem->time.dwHighDateTime = time.u.HighPart; EnterCriticalSection(&timeout_queue_cs); list_add_head(&timeout_queue, &elem->entry); @@ -1640,8 +1640,8 @@ DWORD events_loop(void) ULARGE_INTEGER time; GetSystemTimeAsFileTime(&cur_time); - time.LowPart = cur_time.dwLowDateTime; - time.HighPart = cur_time.dwHighDateTime; + time.u.LowPart = cur_time.dwLowDateTime; + time.u.HighPart = cur_time.dwHighDateTime; EnterCriticalSection(&timeout_queue_cs); timeout = INFINITE; @@ -1661,8 +1661,8 @@ DWORD events_loop(void) { ULARGE_INTEGER time_diff; - time_diff.LowPart = iter->time.dwLowDateTime; - time_diff.HighPart = iter->time.dwHighDateTime; + time_diff.u.LowPart = iter->time.dwLowDateTime; + time_diff.u.HighPart = iter->time.dwHighDateTime; time_diff.QuadPart = (time_diff.QuadPart-time.QuadPart)/10000; if(time_diff.QuadPart < timeout)

1 0

André Hentschel : ole32: Don' t leak memory allocated by ProgIDFromCLSID (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: fbe682a22a28996f5f9e2c7a892545887a52d3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe682a22a28996f5f9e2c7a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:45 2012 +0100 ole32: Don't leak memory allocated by ProgIDFromCLSID (coverity). --- dlls/ole32/clipboard.c | 1 + dlls/ole32/storage32.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 57b0c46..a7308c2 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -664,6 +664,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); + CoTaskMemFree(strProgID); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 70494a1..d2e9f69 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -9075,6 +9075,7 @@ static HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DW if(hRes == S_OK) { *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE); + CoTaskMemFree(wstrProgID); } }

1 0

André Hentschel : setupapi: Avoid memory leaks ( coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 4d796458d0ed517d45adc57a1aedaf1c3bdde232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d796458d0ed517d45adc57a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:58 2012 +0100 setupapi: Avoid memory leaks (coverity). --- dlls/setupapi/install.c | 1 + dlls/setupapi/queue.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 1c8236a..e216e8c 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1640,6 +1640,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, ( 2 + dir_len + name_len) * sizeof( WCHAR )); if( !fullname ) { + FindClose( hdl ); HeapFree( GetProcessHeap(), 0, filter ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index cd733a0..1855e99 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1156,7 +1156,11 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + return FALSE; + } source = inf_source; } else if (!source)

1 0

André Hentschel : oleaut32: Don' t leak memory allocated by heap_alloc_zero (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a46bfd644d8b80c54f315869420b9eaf85e6a061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46bfd644d8b80c54f3158694… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:54 2012 +0100 oleaut32: Don't leak memory allocated by heap_alloc_zero (coverity). --- dlls/oleaut32/typelib.c | 9 +++++---- dlls/oleaut32/typelib2.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7700121..3d94164 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4070,10 +4070,10 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) SLTG_TypeInfoTail *pTITail; SLTG_MemberHeader *pMemHeader; - if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, - pOtherTypeInfoBlks[i].index_name)) { - FIXME_(typelib)("Index strings don't match\n"); - return NULL; + if(strcmp(pBlkEntry[order].index_string + (char*)pMagic, pOtherTypeInfoBlks[i].index_name)) { + FIXME_(typelib)("Index strings don't match\n"); + heap_free(pOtherTypeInfoBlks); + return NULL; } pTIHeader = pBlk; @@ -4189,6 +4189,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) if(i != pTypeLibImpl->TypeInfoCount) { FIXME("Somehow processed %d TypeInfos\n", i); + heap_free(pOtherTypeInfoBlks); return NULL; } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8ea95fe..689d9af 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -5272,7 +5272,8 @@ static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR f if (failed) { ICreateTypeLib2_fnRelease(&create_tlib2->ICreateTypeLib2_iface); - return NULL; + heap_free(create_tlib2); + return NULL; } return &create_tlib2->ICreateTypeLib2_iface;

1 0

André Hentschel : ole32: Don' t leak memory allocated by FileMonikerImpl_DecomposePath (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: c223354912255b7d422e4461bd15712e886fa6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223354912255b7d422e4461b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:43 2012 +0100 ole32: Don't leak memory allocated by FileMonikerImpl_DecomposePath (coverity). --- dlls/ole32/filemoniker.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 20c0870..b3a5cc2 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -711,24 +711,25 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, /* the length of the composed path string is raised by the sum of the two paths lengths */ newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); - if (newStr==NULL) - return E_OUTOFMEMORY; - - /* new path is the concatenation of the rest of str1 and str2 */ - for(*newStr=0,j=0;j<=lastIdx1;j++) - strcatW(newStr,strDec1[j]); + if (newStr) + { + /* new path is the concatenation of the rest of str1 and str2 */ + for(*newStr=0,j=0;j<=lastIdx1;j++) + strcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) - strcatW(newStr,bkSlash); + if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || lstrcmpW(strDec2[i],bkSlash)!=0) + strcatW(newStr,bkSlash); - for(j=i;j<=lastIdx2;j++) - strcatW(newStr,strDec2[j]); + for(j=i;j<=lastIdx2;j++) + strcatW(newStr,strDec2[j]); - /* create a new moniker with the new string */ - res=CreateFileMoniker(newStr,ppmkComposite); + /* create a new moniker with the new string */ + res=CreateFileMoniker(newStr,ppmkComposite); - /* free all strings space memory used by this function */ - HeapFree(GetProcessHeap(),0,newStr); + /* free all strings space memory used by this function */ + HeapFree(GetProcessHeap(),0,newStr); + } + else res = E_OUTOFMEMORY; for(i=0; strDec1[i]!=NULL;i++) CoTaskMemFree(strDec1[i]);

1 0

André Hentschel : msxml3: Avoid memory leak (coverity) .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 764011a94f884af336bc8a27dc0b94b461efc288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764011a94f884af336bc8a27d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:16:41 2012 +0100 msxml3: Avoid memory leak (coverity). --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 5700311..9a9d93e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -689,6 +689,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) { SafeArrayUnaccessData(sa); + heap_free(bsc); return hr; } size++;

1 0

André Hentschel : urlmon: Avoid memory leaks (coverity ).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 99a0c55a8fb502770c31ce1e92c36cece1f288c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a0c55a8fb502770c31ce1e9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:17:03 2012 +0100 urlmon: Avoid memory leaks (coverity). --- dlls/urlmon/bindprot.c | 3 +++ dlls/urlmon/uri.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 60912a4..8deccda 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1149,7 +1149,10 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface task = heap_alloc(sizeof(switch_task_t)); if(!task) + { + heap_free(data); return E_OUTOFMEMORY; + } task->data = data; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 20e0582..18e2ebb 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5185,8 +5185,10 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) if(!data) return E_OUTOFMEMORY; hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); - if(FAILED(hr)) + if(FAILED(hr)) { + heap_free(data); return hr; + } if(size < sizeof(struct persist_uri)) { heap_free(data); @@ -6356,8 +6358,10 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve Uri *uri; if((uri = get_uri_obj(pIUri))) { - if(!uri->create_flags) + if(!uri->create_flags) { + heap_free(ret); return E_UNEXPECTED; + } IUri_AddRef(pIUri); ret->uri = uri;

1 0

André Hentschel : shell32: Reorder code to avoid memory leaks (coverity).
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: b4b396a957290a0f7fffc36763e4f15c2d798e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b396a957290a0f7fffc3676… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 28 16:17:01 2012 +0100 shell32: Reorder code to avoid memory leaks (coverity). --- dlls/shell32/brsfolder.c | 6 +++--- dlls/shell32/pidl.c | 3 ++- dlls/shell32/shelldispatch.c | 2 +- dlls/shell32/shellpath.c | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3200051..0e7b9d3 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -369,11 +369,11 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, tvi.cChildren= pEnumIL ? 1 : 0; tvi.mask |= TVIF_CHILDREN; - lptvid = SHAlloc( sizeof(TV_ITEMDATA) ); - if (!lptvid) + if (!GetName(lpsf, pidl, SHGDN_NORMAL, szBuff)) return NULL; - if (!GetName(lpsf, pidl, SHGDN_NORMAL, szBuff)) + lptvid = SHAlloc( sizeof(TV_ITEMDATA) ); + if (!lptvid) return NULL; tvi.pszText = szBuff; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 58b8104..a712504 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2503,10 +2503,11 @@ LPITEMIDLIST* _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) UINT i; LPITEMIDLIST *apidldest; - apidldest = SHAlloc(cidl * sizeof(LPITEMIDLIST)); if (!apidlsrc) return NULL; + apidldest = SHAlloc(cidl * sizeof(LPITEMIDLIST)); + for (i = 0; i < cidl; i++) apidldest[i] = ILClone(apidlsrc[i]); diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 825c405..65237ef 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch2 *iface, BST if (!service) { ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); - CloseServiceHandle(service); + CloseServiceHandle(scm); return S_OK; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e607149..6fdd762 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3790,7 +3790,10 @@ static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id ) hr = get_known_folder_registry_path(id, NULL, &registryPath); if(SUCCEEDED(hr)) + { hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey)); + HeapFree(GetProcessHeap(), 0, registryPath); + } if(SUCCEEDED(hr)) {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012