October 2012 - Wine-Commits

Jacek Caban : urlmon.idl: Added AsyncInstallDistributionUnit declaration.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: a19fb6086bb57fc85c69182938e9c72cd9e24824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19fb6086bb57fc85c6918293… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 13:02:43 2012 +0100 urlmon.idl: Added AsyncInstallDistributionUnit declaration. --- include/urlmon.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 85444f9..53e803e 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2096,6 +2096,7 @@ cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST,DWORD d cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST,DWORD,LPCWSTR,IInternetSecurityManager*);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") +cpp_quote("HRESULT WINAPI AsyncInstallDistributionUnit(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPCWSTR,IBindCtx*,LPVOID,DWORD);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Christian Costa : d3drm: Move mesh builder data cleaning code into a separate function.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: de690b8dae171ceb893f1a0873fb59a6670be14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de690b8dae171ceb893f1a087… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:15 2012 +0100 d3drm: Move mesh builder data cleaning code into a separate function. --- dlls/d3drm/meshbuilder.c | 59 +++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c28cefd..9d3e67a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -314,6 +314,25 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface); } +static void clean_mesh_builder_data(IDirect3DRMMeshBuilderImpl *mesh_builder) +{ + HeapFree(GetProcessHeap(), 0, mesh_builder->name); + mesh_builder->name = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->pVertices); + mesh_builder->pVertices = NULL; + mesh_builder->nb_vertices = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); + mesh_builder->pNormals = NULL; + mesh_builder->nb_normals = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); + mesh_builder->pFaceData = NULL; + mesh_builder->face_data_size = 0; + mesh_builder->nb_faces = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pCoords2d); + mesh_builder->pCoords2d = NULL; + mesh_builder->nb_coords2d = 0; +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface, REFIID riid, void** ppvObject) @@ -363,15 +382,11 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + clean_mesh_builder_data(This); if (This->material) IDirect3DRMMaterial2_Release(This->material); if (This->texture) IDirect3DRMTexture3_Release(This->texture); - HeapFree(GetProcessHeap(), 0, This->name); - HeapFree(GetProcessHeap(), 0, This->pVertices); - HeapFree(GetProcessHeap(), 0, This->pNormals); - HeapFree(GetProcessHeap(), 0, This->pFaceData); - HeapFree(GetProcessHeap(), 0, This->pCoords2d); HeapFree(GetProcessHeap(), 0, This); } @@ -1114,9 +1129,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); - /* Remove previous name */ - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; hr = IDirectXFileData_GetName(pData, NULL, &size); if (hr != DXFILE_OK) return hr; @@ -1128,11 +1140,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) hr = IDirectXFileData_GetName(pData, This->name, &size); if (hr != DXFILE_OK) - { - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; return hr; - } } TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); @@ -1518,15 +1526,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); - /* First free allocated buffers of previous mesh data */ - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; + clean_mesh_builder_data(This); if (loadflags == D3DRMLOAD_FROMMEMORY) { @@ -1622,22 +1622,7 @@ end: IDirectXFile_Release(pDXFile); if (ret != D3DRM_OK) - { - /* Clean mesh data */ - This->nb_vertices = 0; - This->nb_normals = 0; - This->nb_faces = 0; - This->face_data_size = 0; - This->nb_coords2d = 0; - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; - } + clean_mesh_builder_data(This); return ret; }

1 0

Jörg Höhle : ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 602807c2a5afca3feba11b5f4d56f1c38cb48665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602807c2a5afca3feba11b5f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 6 19:07:44 2012 +0100 ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE). --- dlls/ntdll/threadpool.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bd6e06b..81abac3 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1015,7 +1015,11 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, return STATUS_INVALID_PARAMETER_1; q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) + { status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); + if (status == STATUS_SUCCESS) + status = STATUS_PENDING; + } else if (CompletionEvent) event = CompletionEvent; @@ -1029,7 +1033,10 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, if (CompletionEvent == INVALID_HANDLE_VALUE && event) { if (status == STATUS_PENDING) + { NtWaitForSingleObject(event, FALSE, NULL); + status = STATUS_SUCCESS; + } NtClose(event); }

1 0

Jörg Höhle : winealsa: Fix capture overrun logging.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: c596ddffab5c41e4c5ab8afed63f1ae40627503d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c596ddffab5c41e4c5ab8afed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 25 22:53:21 2012 +0100 winealsa: Fix capture overrun logging. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1c8b03a..9275fbc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2043,9 +2043,13 @@ static void alsa_read_data(ACImpl *This) nread = snd_pcm_readi(This->pcm_handle, This->local_buffer + pos * This->fmt->nBlockAlign, readable); + TRACE("read %ld from %u limit %lu\n", nread, This->held_frames + This->lcl_offs_frames, readable); if(nread < 0){ int ret; + if(nread == -EAGAIN) /* no data yet */ + return; + WARN("read failed, recovering: %ld (%s)\n", nread, snd_strerror(nread)); ret = snd_pcm_recover(This->pcm_handle, nread, 0);

1 0

Michael Stefaniuc : usp10: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: b4712d2e165979e8c77697a013d3e9c97eeb66ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4712d2e165979e8c77697a01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 31 11:32:33 2012 +0100 usp10: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/usp10/opentype.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 138890f..635b822 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -933,7 +933,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched Backtrack\n"); - ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); + ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)((BYTE *)ccsf1 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_1, Coverage[GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)])); indexGlyphs = GET_BE_WORD(ccsf3_2->InputGlyphCount); for (k = 0; k < indexGlyphs; k++) @@ -946,7 +947,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched IndexGlyphs\n"); - ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); + ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)((BYTE *)ccsf3_2 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_2, Coverage[GET_BE_WORD(ccsf3_2->InputGlyphCount)])); for (k = 0; k < GET_BE_WORD(ccsf3_3->LookaheadGlyphCount); k++) { @@ -958,7 +960,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); + ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)((BYTE *)ccsf3_3 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_3, Coverage[GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)])); if (GET_BE_WORD(ccsf3_4->SubstCount)) { @@ -1421,7 +1424,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched Backtrack\n"); - ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)(((LPBYTE)ccpf3)+sizeof(GPOS_ChainContextPosFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccpf3->BacktrackGlyphCount)-1))); + ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)((BYTE *)ccpf3 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_1, Coverage[GET_BE_WORD(ccpf3->BacktrackGlyphCount)])); indexGlyphs = GET_BE_WORD(ccpf3_2->InputGlyphCount); for (k = 0; k < indexGlyphs; k++) @@ -1434,7 +1438,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched IndexGlyphs\n"); - ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)(((LPBYTE)ccpf3_2)+sizeof(GPOS_ChainContextPosFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_2->InputGlyphCount)-1))); + ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)((BYTE *)ccpf3_2 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_2, Coverage[GET_BE_WORD(ccpf3_2->InputGlyphCount)])); for (k = 0; k < GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); k++) { @@ -1446,7 +1451,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched LookAhead\n"); - ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)(((LPBYTE)ccpf3_3)+sizeof(GPOS_ChainContextPosFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)-1))); + ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)((BYTE *)ccpf3_3 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_3, Coverage[GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)])); if (GET_BE_WORD(ccpf3_4->PosCount)) {

1 0

Daniel Lehman : msvcp90: In istream<>::tellg don't use sentry.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 01c451703c3de5e029a20cc19b6fc77e382ee700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c451703c3de5e029a20cc19… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 1 10:54:36 2012 -0700 msvcp90: In istream<>::tellg don't use sentry. --- dlls/msvcp90/ios.c | 55 +++++++++++------------- dlls/msvcp90/tests/ios.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01c451703c3de5e029a20…

1 0

Daniel Lehman : msvcp90: Update fpos<>::off instead of pos in stringbuf<>:: seekoff.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 64527285cf7fab1de5dbd2952df4eee5ecd3b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64527285cf7fab1de5dbd2952… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 28 15:16:17 2012 -0700 msvcp90: Update fpos<>::off instead of pos in stringbuf<>::seekoff. --- dlls/msvcp90/ios.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a11f90c..9435cb2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3803,6 +3803,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, this->seekhigh = cur_w; ret->off = 0; + ret->pos = 0; ret->state = 0; beg = basic_streambuf_char_eback(&this->base); @@ -3841,7 +3842,7 @@ fpos_int* __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, off = -1; } - ret->pos = off; + ret->off = off; return ret; } @@ -4213,6 +4214,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekoff(basic_stringbuf_wchar *this, this->seekhigh = cur_w; ret->off = 0; + ret->pos = 0; ret->state = 0; beg = basic_streambuf_wchar_eback(&this->base); @@ -4251,7 +4253,7 @@ fpos_int* __thiscall basic_stringbuf_wchar_seekoff(basic_stringbuf_wchar *this, off = -1; } - ret->pos = off; + ret->off = off; return ret; }

1 0

Michael Stefaniuc : user32/test: Don't over-allocate memory for DDEDATA.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 2e31a44aca00bceb5e9a6495881adca9a8fc5a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e31a44aca00bceb5e9a64958… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 23:14:52 2012 +0100 user32/test: Don't over-allocate memory for DDEDATA. --- dlls/user32/tests/dde.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3ad48f0..e5d5554 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -143,7 +143,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA else lstrcpyA(str, "requested data\r\n"); - size = sizeof(DDEDATA) + lstrlenA(str) + 1; + size = FIELD_OFFSET(DDEDATA, Value[lstrlenA(str) + 1]); hglobal = GlobalAlloc(GMEM_MOVEABLE, size); ok(hglobal != NULL, "Expected non-NULL hglobal\n"); @@ -314,8 +314,7 @@ static void test_ddeml_client(void) { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -336,8 +335,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -357,8 +355,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); - ok(size == 19 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 19, got %d\n", size); + ok(size == 17, "Expected 17, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -483,8 +480,7 @@ todo_wine { str = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21 || broken(size == 28), /* sizes are rounded up on win9x */ - "Expected 21, got %d\n", size); + ok(size == 19, "Expected 19, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

André Hentschel : wininet: Fix WININET_SetAuthorization on error path (coverity).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 5010f0933e496bb367fe2b1414fb000a46bd83d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5010f0933e496bb367fe2b141… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:25 2012 +0100 wininet: Fix WININET_SetAuthorization on error path (coverity). --- dlls/wininet/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a3235a4..418610d 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -188,7 +188,7 @@ static BOOL WININET_SetAuthorization( http_request_t *request, LPWSTR username, q = heap_strdupW(password); if( !q ) { - heap_free(username); + heap_free(p); return FALSE; }

1 0

André Hentschel : winex11: Avoid memory leaks ( coverity).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 585a66a46320dc8bba7771ec147ef3d7a800310e URL: http://source.winehq.org/git/wine.git/?a=commit;h=585a66a46320dc8bba7771ec1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:22 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xrender.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 37a115e..bd3ef7b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2400,6 +2400,7 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (!tmp) { HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, prop_data); return FALSE; } diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d7f0508..389f684 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1405,9 +1405,9 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, buflen ? buf : zero, buflen ? buflen : sizeof(zero)); - HeapFree(GetProcessHeap(), 0, buf); } + HeapFree(GetProcessHeap(), 0, buf); formatEntry->gis[glyph] = gi; }

1 0