October 2012 - Wine-Commits

Huw Davies : gdi32: Pass individual x, y co-ords to draw_glyph rather than a POINT.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 3e7517328d6c9e30e05bd6891a718be06ed09539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7517328d6c9e30e05bd6891… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 19 13:12:06 2012 +0100 gdi32: Pass individual x, y co-ords to draw_glyph rather than a POINT. --- dlls/gdi32/dibdrv/graphics.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 0183268..f70e00f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -440,7 +440,7 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) } } -static void draw_glyph( dib_info *dib, const POINT *origin, const GLYPHMETRICS *metrics, +static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, RECT *bounds ) @@ -449,8 +449,8 @@ static void draw_glyph( dib_info *dib, const POINT *origin, const GLYPHMETRICS * RECT rect, clipped_rect; POINT src_origin; - rect.left = origin->x + metrics->gmptGlyphOrigin.x; - rect.top = origin->y - metrics->gmptGlyphOrigin.y; + rect.left = x + metrics->gmptGlyphOrigin.x; + rect.top = y - metrics->gmptGlyphOrigin.y; rect.right = rect.left + metrics->gmBlackBoxX; rect.bottom = rect.top + metrics->gmBlackBoxY; add_bounds_rect( bounds, &rect ); @@ -643,7 +643,6 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, dibdrv_physdev *pdev = get_dibdrv_pdev(dev); struct clipped_rects clipped_rects; UINT aa_flags, i; - POINT origin; RECT bounds; DWORD text_color, err; struct intensity_range ranges[17]; @@ -679,8 +678,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); aa_flags = get_font_aa_flags( dev->hdc ); - origin.x = x; - origin.y = y; + for (i = 0; i < count; i++) { GLYPHMETRICS metrics; @@ -690,7 +688,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (err) continue; if (glyph_dib.bits.ptr) - draw_glyph( &pdev->dib, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); + draw_glyph( &pdev->dib, x, y, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); free_dib_info( &glyph_dib ); @@ -698,16 +696,16 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, { if (flags & ETO_PDY) { - origin.x += dx[ i * 2 ]; - origin.y += dx[ i * 2 + 1]; + x += dx[ i * 2 ]; + y += dx[ i * 2 + 1]; } else - origin.x += dx[ i ]; + x += dx[ i ]; } else { - origin.x += metrics.gmCellIncX; - origin.y += metrics.gmCellIncY; + x += metrics.gmCellIncX; + y += metrics.gmCellIncY; } }

1 0

Huw Davies : gdi32: Use the helper to draw the glyphs.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: e6c349d69f1abce70b3bda3d4618f121042a8128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c349d69f1abce70b3bda3d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 19 13:12:07 2012 +0100 gdi32: Use the helper to draw the glyphs. --- dlls/gdi32/dibdrv/graphics.c | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f70e00f..6694bde 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -453,7 +453,7 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics rect.top = y - metrics->gmptGlyphOrigin.y; rect.right = rect.left + metrics->gmBlackBoxX; rect.bottom = rect.top + metrics->gmBlackBoxY; - add_bounds_rect( bounds, &rect ); + if (bounds) add_bounds_rect( bounds, &rect ); for (i = 0; i < clipped_rects->count; i++) { @@ -564,11 +564,15 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits COLORREF fg, bg; DWORD fg_pixel, bg_pixel; struct intensity_range glyph_intensities[17]; + struct clipped_rects visrect; assert( info->bmiHeader.biBitCount > 8 ); /* mono and indexed formats don't support anti-aliasing */ init_dib_info_from_bitmapinfo( &dib, info, bits->ptr ); + visrect.count = 1; + visrect.rects = &src->visrect; + fg = make_rgb_colorref( hdc, &dib, GetTextColor( hdc ), &got_pixel, &fg_pixel); if (!got_pixel) fg_pixel = dib.funcs->colorref_to_pixel( &dib, fg ); @@ -595,24 +599,8 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits if (err) continue; if (glyph_dib.bits.ptr) - { - RECT rect, clipped_rect; - POINT src_origin; + draw_glyph( &dib, x, y, &metrics, &glyph_dib, fg_pixel, glyph_intensities, &visrect, NULL ); - rect.left = x + metrics.gmptGlyphOrigin.x; - rect.top = y - metrics.gmptGlyphOrigin.y; - rect.right = rect.left + metrics.gmBlackBoxX; - rect.bottom = rect.top + metrics.gmBlackBoxY; - - if (intersect_rect( &clipped_rect, &rect, &src->visrect )) - { - src_origin.x = clipped_rect.left - rect.left; - src_origin.y = clipped_rect.top - rect.top; - - dib.funcs->draw_glyph( &dib, &clipped_rect, &glyph_dib, &src_origin, - fg_pixel, glyph_intensities ); - } - } free_dib_info( &glyph_dib ); if (dx)

1 0

Jacek Caban : mshtml: Properly handle OOM errors in htmlnode.c (coverity).
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 23c87ba829b44c68574b6aeee5abcadac3410de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c87ba829b44c68574b6aeee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:34 2012 +0200 mshtml: Properly handle OOM errors in htmlnode.c (coverity). --- dlls/mshtml/htmlnode.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 91ffe6d..b1f1b80 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -282,6 +282,9 @@ static IHTMLDOMChildrenCollection *create_child_collection(HTMLDocumentNode *doc HTMLDOMChildrenCollection *ret; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return NULL; + ret->IHTMLDOMChildrenCollection_iface.lpVtbl = &HTMLDOMChildrenCollectionVtbl; ret->ref = 1; @@ -468,7 +471,7 @@ static HRESULT WINAPI HTMLDOMNode_get_childNodes(IHTMLDOMNode *iface, IDispatch *p = (IDispatch*)create_child_collection(This->doc, nslist); nsIDOMNodeList_Release(nslist); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDOMNode_get_attributes(IHTMLDOMNode *iface, IDispatch **p) @@ -1072,8 +1075,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno htmldoc_addref(&doc->basedoc); node->doc = doc; - if(nsnode) - nsIDOMNode_AddRef(nsnode); + nsIDOMNode_AddRef(nsnode); node->nsnode = nsnode; nsres = nsIDOMNode_SetMshtmlNode(nsnode, (nsISupports*)&node->IHTMLDOMNode_iface);

1 0

Maarten Lankhorst : dsound: Fix IDirectSoundCaptureBuffer Start/Stop, with tests.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 21c45016034b48fc93356195993726d91153e7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c45016034b48fc933561959… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 16 14:06:26 2012 +0200 dsound: Fix IDirectSoundCaptureBuffer Start/Stop, with tests. --- dlls/dsound/capture.c | 6 ++++-- dlls/dsound/tests/capture.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 5336b59..1b004e6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -493,13 +493,14 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf EnterCriticalSection(&(This->device->lock)); - This->flags = dwFlags; - TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); if (This->device->state == STATE_STOPPED) This->device->state = STATE_STARTING; else if (This->device->state == STATE_STOPPING) This->device->state = STATE_CAPTURING; + else + goto out; TRACE("new This->device->state=%s\n",captureStateString[This->device->state]); + This->flags = dwFlags; if (This->device->buffer) FillMemory(This->device->buffer, This->device->buflen, (This->device->pwfx->wBitsPerSample == 8) ? 128 : 0); @@ -511,6 +512,7 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Start(IDirectSoundCaptureBuf return hres; } +out: LeaveCriticalSection(&This->device->lock); TRACE("returning DS_OK\n"); diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index ba52818..2afd522 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -394,15 +394,18 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, ok(ref==0,"IDirectSoundNotify_Release(): has %d references, should have " "0\n",ref); - if (record) { - rc=IDirectSoundCaptureBuffer_Start(dscbo,DSCBSTART_LOOPING); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + rc=IDirectSoundCaptureBuffer_Start(dscbo,DSCBSTART_LOOPING); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + + rc=IDirectSoundCaptureBuffer_Start(dscbo,0); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); - rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); - ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING), - "GetStatus: bad status: %x\n",status); + rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); + ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING), + "GetStatus: bad status: %x\n",status); + if (record) { /* wait for the notifications */ for (i = 0; i < (NOTIFICATIONS * 2); i++) { rc=WaitForMultipleObjects(NOTIFICATIONS,state.event,FALSE,3000); @@ -417,9 +420,12 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, break; } - rc=IDirectSoundCaptureBuffer_Stop(dscbo); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); } + rc=IDirectSoundCaptureBuffer_Stop(dscbo); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + + rc=IDirectSoundCaptureBuffer_Stop(dscbo); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); } static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,

1 0

Huw Davies : fonts: 10-pixel strikes for Tahoma bold.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 673617ee4eb15aa778859d3bcc227e8d8a514e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673617ee4eb15aa778859d3bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 19 15:41:41 2012 +0100 fonts: 10-pixel strikes for Tahoma bold. --- fonts/tahomabd.sfd | 868 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/tahomabd.ttf | Bin 86520 -> 92720 bytes 2 files changed, 868 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=673617ee4eb15aa778859…

1 0

Huw Davies : gdi32: Move the string rendering code to a common function.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: aa9827b08e9d6a32c6dc8561667c365314de49fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9827b08e9d6a32c6dc85616… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 19 13:12:08 2012 +0100 gdi32: Move the string rendering code to a common function. --- dlls/gdi32/dibdrv/graphics.c | 106 +++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 6694bde..5f73c92 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -553,13 +553,49 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS return ERROR_SUCCESS; } +static void render_string( HDC hdc, dib_info *dib, INT x, INT y, UINT flags, UINT aa_flags, + const WCHAR *str, UINT count, const INT *dx, DWORD text_color, + const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + RECT *bounds ) +{ + UINT i; + DWORD err; + GLYPHMETRICS metrics; + dib_info glyph_dib; + + for (i = 0; i < count; i++) + { + err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); + if (err) continue; + + if (glyph_dib.bits.ptr) + draw_glyph( dib, x, y, &metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + + free_dib_info( &glyph_dib ); + + if (dx) + { + if (flags & ETO_PDY) + { + x += dx[ i * 2 ]; + y += dx[ i * 2 + 1]; + } + else + x += dx[ i ]; + } + else + { + x += metrics.gmCellIncX; + y += metrics.gmCellIncY; + } + } +} + BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) { dib_info dib; - UINT i; - DWORD err; BOOL got_pixel; COLORREF fg, bg; DWORD fg_pixel, bg_pixel; @@ -590,35 +626,8 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits dib.funcs->solid_rects( &dib, 1, &src->visrect, bkgnd_color.and, bkgnd_color.xor ); } - for (i = 0; i < count; i++) - { - GLYPHMETRICS metrics; - dib_info glyph_dib; - - err = get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); - if (err) continue; - - if (glyph_dib.bits.ptr) - draw_glyph( &dib, x, y, &metrics, &glyph_dib, fg_pixel, glyph_intensities, &visrect, NULL ); - - free_dib_info( &glyph_dib ); - - if (dx) - { - if (flags & ETO_PDY) - { - x += dx[ i * 2 ]; - y += dx[ i * 2 + 1]; - } - else - x += dx[ i ]; - } - else - { - x += metrics.gmCellIncX; - y += metrics.gmCellIncY; - } - } + render_string( hdc, &dib, x, y, flags, aa_flags, str, count, dx, + fg_pixel, glyph_intensities, &visrect, NULL ); return TRUE; } @@ -630,9 +639,9 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); struct clipped_rects clipped_rects; - UINT aa_flags, i; + UINT aa_flags; RECT bounds; - DWORD text_color, err; + DWORD text_color; struct intensity_range ranges[17]; init_clipped_rects( &clipped_rects ); @@ -667,35 +676,8 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, aa_flags = get_font_aa_flags( dev->hdc ); - for (i = 0; i < count; i++) - { - GLYPHMETRICS metrics; - dib_info glyph_dib; - - err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &glyph_dib ); - if (err) continue; - - if (glyph_dib.bits.ptr) - draw_glyph( &pdev->dib, x, y, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); - - free_dib_info( &glyph_dib ); - - if (dx) - { - if (flags & ETO_PDY) - { - x += dx[ i * 2 ]; - y += dx[ i * 2 + 1]; - } - else - x += dx[ i ]; - } - else - { - x += metrics.gmCellIncX; - y += metrics.gmCellIncY; - } - } + render_string( dev->hdc, &pdev->dib, x, y, flags, aa_flags, str, count, dx, + text_color, ranges, &clipped_rects, &bounds ); done: add_clipped_bounds( pdev, &bounds, pdev->clip );

1 0

Maarten Lankhorst : winmm: Do not blindly reset device when already stopped .
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 6f84708902f49f6376d26e9f7f632f5742d87c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f84708902f49f6376d26e9f7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 16 14:06:25 2012 +0200 winmm: Do not blindly reset device when already stopped. --- dlls/winmm/waveform.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 73f7a04..9bcabe2 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1398,6 +1398,8 @@ static void WOD_PushData(WINMM_Device *device) goto exit; if(!device->first){ + if (device->stopped) + goto exit; device->stopped = TRUE; device->last_clock_pos = 0; IAudioClient_Stop(device->client);

1 0

Huw Davies : gdi32: Pass a dib_info structure to draw_glyph.
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 3ef520650c281cbce37fc47401bf69cc1c3f484e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef520650c281cbce37fc4740… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 19 13:12:05 2012 +0100 gdi32: Pass a dib_info structure to draw_glyph. --- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a811a75..0183268 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -440,7 +440,7 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) } } -static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, +static void draw_glyph( dib_info *dib, const POINT *origin, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, RECT *bounds ) @@ -462,8 +462,8 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; - pdev->dib.funcs->draw_glyph( &pdev->dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, + text_color, ranges ); } } } @@ -690,7 +690,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (err) continue; if (glyph_dib.bits.ptr) - draw_glyph( pdev, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); + draw_glyph( &pdev->dib, &origin, &metrics, &glyph_dib, text_color, ranges, &clipped_rects, &bounds ); free_dib_info( &glyph_dib );

1 0

Jacek Caban : mshtml: Properly handle OOM errors in navigate.c (coverity).
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: b6227fc4e89cfa20c23782f7e42c8dccdad36398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6227fc4e89cfa20c23782f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:15 2012 +0200 mshtml: Properly handle OOM errors in navigate.c (coverity). --- dlls/mshtml/navigate.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f1f0f98..06d1207 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -215,7 +215,11 @@ static const nsIInputStreamVtbl nsInputStreamVtbl = { static nsProtocolStream *create_nsprotocol_stream(void) { - nsProtocolStream *ret = heap_alloc(sizeof(nsProtocolStream)); + nsProtocolStream *ret; + + ret = heap_alloc(sizeof(nsProtocolStream)); + if(!ret) + return NULL; ret->nsIInputStream_iface.lpVtbl = &nsInputStreamVtbl; ret->ref = 1; @@ -877,8 +881,10 @@ static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) HRESULT hres; if(!This->buf) { + This->buf = heap_alloc(128); + if(!This->buf) + return E_OUTOFMEMORY; This->size = 128; - This->buf = heap_alloc(This->size); } do { @@ -921,23 +927,20 @@ static const BSCallbackVtbl BufferBSCVtbl = { }; -static BufferBSC *create_bufferbsc(IMoniker *mon) -{ - BufferBSC *ret = heap_alloc_zero(sizeof(*ret)); - - init_bscallback(&ret->bsc, &BufferBSCVtbl, mon, 0); - ret->hres = E_FAIL; - - return ret; -} - HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { - BufferBSC *bsc = create_bufferbsc(mon); + BufferBSC *bsc; int cp = CP_ACP; WCHAR *text; HRESULT hres; + bsc = heap_alloc_zero(sizeof(*bsc)); + if(!bsc) + return E_OUTOFMEMORY; + + init_bscallback(&bsc->bsc, &BufferBSCVtbl, mon, 0); + bsc->hres = E_FAIL; + hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; @@ -1164,8 +1167,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return S_OK; } - if(!This->nsstream) + if(!This->nsstream) { This->nsstream = create_nsprotocol_stream(); + if(!This->nsstream) + return E_OUTOFMEMORY; + } do { BOOL first_read = !This->bsc.readed;

1 0

Jacek Caban : mshtml: Properly handle OOM errors in omnavigator.c (coverity ).
by Alexandre Julliard Oct. 19, 2012

Oct. 19, 2012

Module: wine Branch: master Commit: 3a4a4acd1a083ef8a839ac8786b49d9f864698b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4a4acd1a083ef8a839ac878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:57:47 2012 +0200 mshtml: Properly handle OOM errors in omnavigator.c (coverity). --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/omnavigator.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dede0a7..0fad7aa 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -803,7 +803,7 @@ static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigato TRACE("(%p)->(%p)\n", This, p); *p = OmNavigator_Create(); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 6d7ec15..51421d3 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -941,6 +941,9 @@ IOmNavigator *OmNavigator_Create(void) OmNavigator *ret; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return NULL; + ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl; ret->ref = 1;

1 0