wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Nikolay Sivov : amstream: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: bd102b527690dd4e937021da82f6f68b3a6573d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd102b527690dd4e937021da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 19:11:05 2012 +0400 amstream: Call interface methods properly. --- dlls/amstream/amstream.c | 6 +++--- dlls/amstream/audiodata.c | 2 +- dlls/amstream/mediastream.c | 4 ++-- dlls/amstream/tests/amstream.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c61fcd0..293e2b9 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -87,8 +87,8 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_QueryInterface(IAMMultiMediaStream IsEqualGUID(riid, &IID_IMultiMediaStream) || IsEqualGUID(riid, &IID_IAMMultiMediaStream)) { - IUnknown_AddRef(iface); - *ppvObject = This; + IAMMultiMediaStream_AddRef(iface); + *ppvObject = iface; return S_OK; } @@ -306,7 +306,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream return E_POINTER; if (This->pFilterGraph) - return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + return IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); else *ppGraphBuilder = NULL; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 7d3c38a..2bd57da 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -48,7 +48,7 @@ static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID ri IsEqualGUID(riid, &IID_IMemoryData) || IsEqualGUID(riid, &IID_IAudioData)) { - IUnknown_AddRef(iface); + IAudioData_AddRef(iface); *ret_iface = iface; return S_OK; } diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 6656bf7..295796b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -60,8 +60,8 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMedia IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { - IUnknown_AddRef(iface); - *ppv = This; + IDirectDrawMediaStream_AddRef(iface); + *ppv = iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index ffc6fe0..06fb330 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -155,7 +155,7 @@ static void test_renderfile(void) error: if (pddsample) - IDirectDrawMediaSample_Release(pddsample); + IDirectDrawStreamSample_Release(pddsample); if (pddstream) IDirectDrawMediaStream_Release(pddstream); if (pvidstream) @@ -260,7 +260,7 @@ static void test_media_streams(void) } if (ddraw_sample) - IDirectDrawMediaSample_Release(ddraw_sample); + IDirectDrawStreamSample_Release(ddraw_sample); if (ddraw_stream) IDirectDrawMediaStream_Release(ddraw_stream); }

1 0

Piotr Caban : msvcp90: Fixed buffer allocation in basic_stringbuf<wchar> class.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e40d02868d26a402abc8402299daccd2d6a2f5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40d02868d26a402abc840229… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 18 14:54:17 2012 +0200 msvcp90: Fixed buffer allocation in basic_stringbuf<wchar> class. --- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 1bc8ee2..4969c7b 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -3946,7 +3946,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w this->seekhigh = NULL; if(count && str) { - wchar_t *buf = MSVCRT_operator_new(count); + wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -4120,7 +4120,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); size = oldsize|0xf; size += size/2; - buf = MSVCRT_operator_new(size); + buf = MSVCRT_operator_new(size*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a0e54ad..fd2f6a7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3932,7 +3932,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w this->seekhigh = NULL; if(count && str) { - wchar_t *buf = MSVCRT_operator_new(count); + wchar_t *buf = MSVCRT_operator_new(count*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -4106,7 +4106,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * oldsize = (ptr ? basic_streambuf_wchar_epptr(&this->base)-basic_streambuf_wchar_eback(&this->base): 0); size = oldsize|0xf; size += size/2; - buf = MSVCRT_operator_new(size); + buf = MSVCRT_operator_new(size*sizeof(wchar_t)); if(!buf) { ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL);

1 0

Marcus Meissner : riched20: Fixed pointer to value out of scope (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 3a2de10a9ccdb6a93930aa76e582d6bc397d0347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2de10a9ccdb6a93930aa76e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:56:12 2012 +0200 riched20: Fixed pointer to value out of scope (Coverity). --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 18cd159..6221f4b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -292,6 +292,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea do { LONG nWideChars = 0; + WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; if (!stream->dwSize) { @@ -305,7 +306,6 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { - WCHAR wszText[STREAMIN_BUFFER_SIZE+1]; char * buf = stream->buffer; DWORD size = stream->dwSize; DWORD cp = CP_ACP;

1 0

Marcus Meissner : hhctrl.ocx: Initialize ret on some error paths (Coverity) .
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 2461466ba0689534081f51fe3fac7ec9cd84ee34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2461466ba0689534081f51fe3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:55:52 2012 +0200 hhctrl.ocx: Initialize ret on some error paths (Coverity). --- dlls/hhctrl.ocx/chm.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 02931f4..6c2904d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -326,7 +326,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HH_WINTYPEW wintype; HRESULT hr; DWORD cbRead; - BOOL ret; + BOOL ret = FALSE; static const WCHAR null[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; @@ -357,8 +357,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) pszJump2 = ConvertChmString(info, &wintype.pszJump2); pszUrlJump1 = ConvertChmString(info, &wintype.pszUrlJump1); pszUrlJump2 = ConvertChmString(info, &wintype.pszUrlJump2); - - ret = SUCCEEDED(hr); } else { @@ -378,7 +376,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) wintype.dwExStyles = 0; wintype.nShowState = SW_SHOW; wintype.curNavType = HHWIN_NAVTYPE_TOC; - ret = TRUE; } /* merge the new data with any pre-existing HH_WINTYPE structure */ @@ -400,6 +397,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) heap_free(pszJump2); heap_free(pszUrlJump1); heap_free(pszUrlJump2); + ret = TRUE; done: if (pStream)

1 0

Marcus Meissner : joy.cpl: Avoid uninitialized variable usage (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: f51b6e7847167c984234815842e1e17f72212504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51b6e7847167c98423481584… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 18 11:51:24 2012 +0200 joy.cpl: Avoid uninitialized variable usage (Coverity). --- dlls/joy.cpl/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 354dfd7..b84a0aa 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -289,6 +289,7 @@ static DWORD WINAPI input_thread(void *param) r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]); r.top = (TEST_AXIS_Y + axes_pos[i][1]); + r.bottom = r.right = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); @@ -549,6 +550,7 @@ static DWORD WINAPI ff_input_thread(void *param) r.left = FF_AXIS_X + state.lX; r.top = FF_AXIS_Y + state.lY; + r.right = r.bottom = 0; /* unused */ MapDialogRect(data->graphics.hwnd, &r); SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);

1 0

Marcus Meissner : qcap: Fixed another use-after free (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 985d2ba18ed736423fb161985faf45adcc505b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985d2ba18ed736423fb161985… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 23:07:11 2012 +0200 qcap: Fixed another use-after free (Coverity). --- dlls/qcap/vfwcapture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7be59cc..227a671 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -793,11 +793,11 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) VfwPinImpl *This = (VfwPinImpl *)iface; hr = qcap_driver_get_format(This->driver_info, &pmt); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); + DeleteMediaType(pmt); + } TRACE("%p -- %x\n", This, hr); - DeleteMediaType(pmt); - return hr; }

1 0

Marcus Meissner : qcap: Fixed a use after free in error path (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 524ff6fe27cfb0a2f2154b1543134d0e93784c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=524ff6fe27cfb0a2f2154b154… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 23:04:31 2012 +0200 qcap: Fixed a use after free in error path (Coverity). --- dlls/qcap/v4l.c | 1 + dlls/qcap/vfwcapture.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 119eb29..1851ba4 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -314,6 +314,7 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) if (!vi) { CoTaskMemFree(mT[0]); + mT[0] = NULL; return E_OUTOFMEMORY; } mT[0]->majortype = MEDIATYPE_Video; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 68341ae..7be59cc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -678,9 +678,10 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI return VFW_S_NO_MORE_ITEMS; hr = qcap_driver_get_format(This->driver_info, &vfw_pmt); - CopyMediaType(pmt, vfw_pmt); - DeleteMediaType(vfw_pmt); - + if (SUCCEEDED(hr)) { + CopyMediaType(pmt, vfw_pmt); + DeleteMediaType(vfw_pmt); + } return hr; }

1 0

Marcus Meissner : quartz: Avoid linked list walk with free next (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: de7635a2f0a1424b14318788f935ff2a3d531a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7635a2f0a1424b14318788f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 22:36:48 2012 +0200 quartz: Avoid linked list walk with free next (Coverity). --- dlls/quartz/systemclock.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 842541b..043299b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -116,12 +116,15 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { } /** First SingleShots Advice: sorted list */ - for (it = This->pSingleShotAdvise; NULL != it && (it->rtBaseTime + it->rtIntervalTime) <= curTime; it = it->next) { + it = This->pSingleShotAdvise; + while ((NULL != it) && (it->rtBaseTime + it->rtIntervalTime) <= curTime) { + SystemClockAdviseEntry* nextit = it->next; /** send event ... */ SetEvent(it->hEvent); /** ... and Release it */ QUARTZ_RemoveAviseEntryFromQueue(This, it); CoTaskMemFree(it); + it = nextit; } if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000;

1 0

Marcus Meissner : user32: Fixed two use-after-free (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 84bb5969120d605ec0f6bbe458851cba4670edaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bb5969120d605ec0f6bbe45… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 21:31:34 2012 +0200 user32: Fixed two use-after-free (Coverity). --- dlls/user32/dde_client.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index ef3ee3f..90fa4db 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1246,14 +1246,18 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction { if ((pConv = WDML_GetConv(hConv, TRUE)) && pConv->instance == pInstance) { - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC && (idTransaction == 0 || pXAct->xActID == idTransaction)) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } } @@ -1262,13 +1266,16 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv; pConv = pConv->next) { if (!(pConv->wStatus & ST_CONNECTED)) continue; - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } }

1 0

Marcus Meissner : user32: Free the correct dce (Coverity).
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 3fb8a4263868d5db0bd2a4d7321b6e1a2af5db23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb8a4263868d5db0bd2a4d73… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Aug 17 21:23:38 2012 +0200 user32: Free the correct dce (Coverity). --- dlls/user32/painting.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 5a3614c..dcf615d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -314,9 +314,11 @@ static struct dce *get_window_dce( HWND hwnd ) if (dce_to_free) { - SetDCHook( dce->hdc, NULL, 0 ); - DeleteDC( dce->hdc ); - HeapFree( GetProcessHeap(), 0, dce ); + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + if (dce_to_free == dce) + dce = NULL; } } return dce;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
55
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 August 2012