wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Andrew Eikum : xaudio2: Protect access to source voice during creation ( Coverity).
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 6c50c182e6e03a63a93c2df7a92abea5d8ccb20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c50c182e6e03a63a93c2df7a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:25 2016 -0600 xaudio2: Protect access to source voice during creation (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c82e8b477fe476b2eb3ad4452225619ca2e7a58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a2e3ef5..2f750bd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1364,8 +1364,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ + EnterCriticalSection(&src->lock); if(!src->in_use) break; + LeaveCriticalSection(&src->lock); } if(&src->entry == &This->source_voices){ @@ -1386,6 +1388,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); src->xa2 = This; + + EnterCriticalSection(&src->lock); } src->in_use = TRUE; @@ -1398,6 +1402,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->al_fmt = get_al_format(pSourceFormat); if(!src->al_fmt){ src->in_use = FALSE; + LeaveCriticalSection(&src->lock); WARN("OpenAL can't convert this format!\n"); return AUDCLNT_E_UNSUPPORTED_FORMAT; } @@ -1410,6 +1415,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; + LeaveCriticalSection(&src->lock); return hr; } @@ -1420,6 +1426,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; + LeaveCriticalSection(&src->lock); return E_OUTOFMEMORY; } @@ -1427,6 +1434,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, alSourcePlay(src->al_src); + LeaveCriticalSection(&src->lock); + #if XAUDIO2_VER == 0 *ppSourceVoice = (IXAudio2SourceVoice*)&src->IXAudio20SourceVoice_iface; #elif XAUDIO2_VER <= 3

1 0

Andrew Eikum : xaudio2: Report incoming underruns to the application.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 76016117dc693be2203b06fe60f04b702196b03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76016117dc693be2203b06fe6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 25 13:30:30 2016 -0600 xaudio2: Report incoming underruns to the application. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3934253513c277e0a0163a923af7c4d92f911881) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 23ea0c6..a2e3ef5 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -41,6 +41,8 @@ static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei static HINSTANCE instance; +#define IN_AL_PERIODS 4 + #if XAUDIO2_VER == 0 #define COMPAT_E_INVALID_CALL E_INVALIDARG #define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED @@ -2164,6 +2166,30 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al return buf->offs_bytes < buf->cur_end_bytes; } +#if XAUDIO2_VER > 0 +static UINT32 get_underrun_warning(XA2SourceImpl *src) +{ + UINT32 period_bytes = src->xa2->period_frames * src->submit_blocksize; + UINT32 total = 0, i; + + for(i = 0; i < src->nbufs && total < IN_AL_PERIODS * period_bytes; ++i){ + XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; + total += buf->cur_end_bytes - buf->offs_bytes; + if(buf->xa2buffer.LoopCount == XAUDIO2_LOOP_INFINITE) + return 0; + if(buf->xa2buffer.LoopCount > 0){ + total += (buf->loop_end_bytes - buf->xa2buffer.LoopBegin) * (buf->xa2buffer.LoopCount - buf->looped); + total += buf->play_end_bytes - buf->loop_end_bytes; + } + } + + if(total >= IN_AL_PERIODS * period_bytes) + return 0; + + return ((IN_AL_PERIODS * period_bytes - total) / period_bytes + 1) * period_bytes; +} +#endif + /* Looping: * * The looped section of a buffer is a subset of the play area which is looped @@ -2179,7 +2205,7 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al * * In the simple case, playback will start at PlayBegin. At LoopEnd, playback * will move to LoopBegin and repeat that loop LoopCount times. Then, playback - * will cease at LoopEnd. + * will cease at PlayEnd. * * If PlayLength is zero, then PlayEnd is the end of the buffer. * @@ -2239,9 +2265,9 @@ static void update_source_state(XA2SourceImpl *src) alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); - /* maintain 4 periods in AL */ + /* maintain IN_AL_PERIODS periods in AL */ while(src->cur_buf != (src->first_buf + src->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS && - src->in_al_bytes - bufpos < 4 * src->xa2->period_frames * src->submit_blocksize){ + src->in_al_bytes - bufpos < IN_AL_PERIODS * src->xa2->period_frames * src->submit_blocksize){ TRACE("%p: going to queue a period from buffer %u\n", src, src->cur_buf); /* starting from an empty buffer */ @@ -2319,8 +2345,11 @@ static void do_engine_tick(IXAudio2Impl *This) #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else - /* TODO: detect incoming underrun and inform callback */ - IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, 0); + UINT32 underrun; + underrun = get_underrun_warning(src); + if(underrun > 0) + TRACE("Calling OnVoiceProcessingPassStart with BytesRequired: %u\n", underrun); + IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, underrun); #endif }

1 0

Andrew Eikum : xaudio2: Remove run-time version checks for XAudio2 object.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 5b9e842a1ef5eadda85f2a2e53852a026fdb867e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9e842a1ef5eadda85f2a2e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:34 2016 -0600 xaudio2: Remove run-time version checks for XAudio2 object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb9f616b2ba1b4bccda39f7e933612aba4cd562b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 186 ++++++++++++++++++++-------------------- dlls/xaudio2_7/xaudio_private.h | 2 - 2 files changed, 91 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b9e842a1ef5eadda85f2…

1 0

Andrew Eikum : xaudio2_8: Use shared source.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 344be3a1d0a12a599ca63d3956f61b416ca26006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344be3a1d0a12a599ca63d395… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:11 2016 -0600 xaudio2_8: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f15d5b37cbc4ac95b01393337eafe1e88e4d6ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/xaudio2_7/Makefile.in | 2 + dlls/xaudio2_7/x3daudio.c | 55 +++++++++++++ dlls/xaudio2_7/xapofx.c | 83 +++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 16 +--- dlls/xaudio2_7/xaudio_dll.c | 42 ++++++++-- dlls/xaudio2_8/Makefile.in | 10 ++- dlls/xaudio2_8/xaudio_dll.c | 163 -------------------------------------- include/xapofx.h | 4 - 10 files changed, 191 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=344be3a1d0a12a599ca63…

1 0

Andrew Eikum : xaudio2: Explicitly version the 2.7 coclasses.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 0056371153a8afe2698f6d23c0add37a74b15053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0056371153a8afe2698f6d23c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:02 2016 -0600 xaudio2: Explicitly version the 2.7 coclasses. In versions 2.8 and later, no coclasses are provided by the API, so we should version the old ones to make it clear they're out of date. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ad4c61100c06cbd9eb6587c543ceac94b932621) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 10 +++++----- dlls/xaudio2_7/xapofx.c | 4 ++-- dlls/xaudio2_7/xaudio_classes.idl | 2 +- dlls/xaudio2_7/xaudio_dll.c | 40 +++++++++++++++++++-------------------- dlls/xaudio2_8/xaudio_dll.c | 6 +++--- include/xapofx.h | 8 ++++---- include/xaudio2.idl | 14 +++++++------- include/xaudio2fx.idl | 18 +++++++++--------- 8 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0056371153a8afe2698f6…

1 0

André Hentschel : xaudio2_7: Check return of IAudioClient_Start (Coverity).
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 850ac564e4160251d6fef97da5eb0b75ead06be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850ac564e4160251d6fef97da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:34:57 2015 +0100 xaudio2_7: Check return of IAudioClient_Start (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35eebeef0fe0b3f03f44731f805c447b2342acfd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 73e6db1..50480ef 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1700,7 +1700,13 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - IAudioClient_Start(This->aclient); + hr = IAudioClient_Start(This->aclient); + if (FAILED(hr)) + { + WARN("Start(IAudioClient) failed: %08x\n", hr); + hr = COMPAT_E_DEVICE_INVALIDATED(This->version); + goto exit; + } if(This->version <= 20) *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface;

1 0

Nikolay Sivov : riched20: Remove duplicated condition.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 7cb3b72559745d94e7b7e3a0fbb40426f93d775f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb3b72559745d94e7b7e3a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 15 10:54:58 2016 +0300 riched20: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1013e67..a2f23c9 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1976,7 +1976,7 @@ static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) if (*end == *start) return S_FALSE; - if (bStart == tomEnd || bStart == tomFalse) + if (bStart == tomEnd) *start = *end; else *end = *start;

1 0

Alistair Leslie-Hughes : wined3d: Correct memory size for Geforce 9600 GT.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 1da27c10b8edfa41e1308b8b67c80d236c4fed9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da27c10b8edfa41e1308b8b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 15 07:48:30 2016 +0000 wined3d: Correct memory size for Geforce 9600 GT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4fc7736..cac8958 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1231,7 +1231,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 },

1 0

Alexandre Julliard : gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 7373a7c71da2684f1497acdb2cb2051a4448ac56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7373a7c71da2684f1497acdb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:37:01 2016 +0900 gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 43 +++++++++++-------------------------------- dlls/gdi32/tests/path.c | 4 ++-- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index e09cd0b..0d89cfb 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -374,9 +374,9 @@ static HRGN PATH_PathToRegion(const struct gdi_path *pPath, INT nPolyFillMode) INT *pNumPointsInStroke; HRGN hrgn; - if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; + if (!pPath->count) return 0; - /* FIXME: What happens when number of points is zero? */ + if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ @@ -636,30 +636,20 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, INT nSize) /*********************************************************************** * PathToRegion (GDI32.@) - * - * FIXME - * Check that SetLastError is being called correctly - * - * The documentation does not state this explicitly, but a test under Windows - * shows that the region which is returned should be in device coordinates. */ HRGN WINAPI PathToRegion(HDC hdc) { HRGN hrgnRval = 0; DC *dc = get_dc_ptr( hdc ); - /* Get pointer to path */ if(!dc) return 0; if (!dc->path) SetLastError(ERROR_CAN_NOT_COMPLETE); else { - if ((hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc)))) - { - /* FIXME: Should we empty the path even if conversion failed? */ - free_gdi_path( dc->path ); - dc->path = NULL; - } + hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc)); + free_gdi_path( dc->path ); + dc->path = NULL; } release_dc_ptr( dc ); return hrgnRval; @@ -674,6 +664,7 @@ static BOOL PATH_FillPath( HDC hdc, const struct gdi_path *pPath ) HRGN hrgn; /* Construct a region from the path and fill it */ + if (!pPath->count) return TRUE; if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)))) { /* Since PaintRgn interprets the region as being in logical coordinates @@ -752,8 +743,6 @@ BOOL WINAPI FillPath(HDC hdc) /*********************************************************************** * SelectClipPath (GDI32.@) - * FIXME - * Check that SetLastError is being called correctly */ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) { @@ -2116,24 +2105,14 @@ BOOL nulldrv_CloseFigure( PHYSDEV dev ) BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { - BOOL ret; - HRGN hrgn; - DC *dc = get_nulldrv_dc( dev ); + BOOL ret = FALSE; + HRGN hrgn = PathToRegion( dev->hdc ); - if (!dc->path) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - if (!(hrgn = PATH_PathToRegion( dc->path, GetPolyFillMode(dev->hdc)))) return FALSE; - ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; - if (ret) + if (hrgn) { - free_gdi_path( dc->path ); - dc->path = NULL; + ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; + DeleteObject( hrgn ); } - /* FIXME: Should this function delete the path even if it failed? */ - DeleteObject( hrgn ); return ret; } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index f7ed012..6e7f65a 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -266,7 +266,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); ret = SelectClipPath( hdc, RGN_OR ); - todo_wine ok( !ret, "SelectClipPath succeeded on empty path\n" ); + ok( !ret, "SelectClipPath succeeded on empty path\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); @@ -282,7 +282,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); rgn = PathToRegion( hdc ); - todo_wine ok( !rgn, "PathToRegion succeeded on empty path\n" ); + ok( !rgn, "PathToRegion succeeded on empty path\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); DeleteObject( rgn ); ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" );

1 0

Alexandre Julliard : gdiplus: Avoid using PathToRegion with an empty path.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: bc44b3f60d3df213f3a55d6f0878c019932bebfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc44b3f60d3df213f3a55d6f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:36:37 2016 +0900 gdiplus: Avoid using PathToRegion with an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index a0c0823..50cb46a 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1114,6 +1114,12 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) GpStatus stat; INT save_state; + if (!path->pathdata.Count) /* PathToRegion doesn't support empty paths */ + { + *hrgn = CreateRectRgn( 0, 0, 0, 0 ); + return *hrgn ? Ok : OutOfMemory; + } + if (!graphics) { new_hdc = CreateCompatibleDC(0);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
60
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 June 2016