November 2012 - Wine-commits

Huw Davies : oledlg: Add a missing break.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 81057ba9b9290f2baf29bec960183832a448ba88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81057ba9b9290f2baf29bec96… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 10:57:07 2012 +0000 oledlg: Add a missing break. --- dlls/oledlg/insobjdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 75ca77b..159f12b 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -195,6 +195,7 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) case IDC_ADDCONTROL: UIINSERTOBJECTDLG_AddControl(pdlgInfo); + break; case IDC_OBJTYPELIST: if (wNotifyCode == LBN_SELCHANGE)

1 0

Nikolay Sivov : xmllite: Fix equal sign parsing.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c23ce5976ee8cb96c996bda0b49b710ef15646ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ce5976ee8cb96c996bda0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 09:44:06 2012 -0500 xmllite: Fix equal sign parsing. --- dlls/xmllite/reader.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ee6a4d7..11b5eb8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -48,7 +48,6 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; -static const WCHAR eqW[] = {'=',0}; struct xml_encoding_data { @@ -515,6 +514,18 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) return S_OK; } +/* [25] Eq ::= S? '=' S? */ +static HRESULT reader_parse_eq(xmlreader *reader) +{ + static const WCHAR eqW[] = {'=',0}; + reader_skipspaces(reader); + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + reader_skipspaces(reader); + return S_OK; +} + /* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ static HRESULT reader_parse_versioninfo(xmlreader *reader) { @@ -527,9 +538,8 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip 'version' */ reader_skipn(reader, 7); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -596,9 +606,8 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip 'encoding' */ reader_skipn(reader, 8); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -624,6 +633,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; const WCHAR *start, *ptr; + HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; @@ -631,9 +641,8 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip 'standalone' */ reader_skipn(reader, 10); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE;

1 0

Nikolay Sivov : msxml3: Properly store SystemID and PublicID (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 818917a09e71d5459ffe05d6ba067a9302d24b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818917a09e71d5459ffe05d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:45:12 2012 -0500 msxml3: Properly store SystemID and PublicID (Coverity). --- dlls/msxml3/saxreader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 877493d..3b167b7 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -294,8 +294,8 @@ typedef struct saxreader *saxreader; HRESULT ret; xmlParserCtxtPtr pParserCtxt; - WCHAR *publicId; - WCHAR *systemId; + BSTR publicId; + BSTR systemId; int line; int column; BOOL vbInterface; @@ -2132,7 +2132,7 @@ static HRESULT WINAPI isaxlocator_getPublicId( publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt)); if(SysStringLen(publicId)) - This->publicId = (WCHAR*)&publicId; + This->publicId = publicId; else { SysFreeString(publicId); @@ -2154,7 +2154,7 @@ static HRESULT WINAPI isaxlocator_getSystemId( systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt)); if(SysStringLen(systemId)) - This->systemId = (WCHAR*)&systemId; + This->systemId = systemId; else { SysFreeString(systemId);

1 0

Nikolay Sivov : msxml3: Actually use skipped entity event data.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 21be19a1dcfab9b74b363fb8173afb5c40ed2355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21be19a1dcfab9b74b363fb81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:54:24 2012 -0500 msxml3: Actually use skipped entity event data. --- dlls/msxml3/tests/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 02bc00c..06fd56a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1191,6 +1191,7 @@ static HRESULT WINAPI contentHandler_skippedEntity( init_call_entry(locator, &call); call.id = CH_SKIPPEDENTITY; call.arg1W = SysAllocStringLen(name, len); + add_call(sequences, CONTENT_HANDLER_INDEX, &call); return get_expected_ret(); }

1 0

Alexandre Julliard : gdi32: Add a font glyph cache in the DIB engine.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 6050a025bb15fe7d91b9086fad04e83de6177b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6050a025bb15fe7d91b9086fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 23:19:29 2012 +0100 gdi32: Add a font glyph cache in the DIB engine. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 3 + dlls/gdi32/dibdrv/graphics.c | 282 +++++++++++++++++++++++++++++++++--------- 3 files changed, 226 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6050a025bb15fe7d91b90…

1 0

Alexandre Julliard : winex11: Don' t bother waiting for XShmPutImage to finish.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: e2da590a8550292182b96562cd20f11cfe94ce2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da590a8550292182b96562c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 14:40:13 2012 +0100 winex11: Don't bother waiting for XShmPutImage to finish. --- dlls/winex11.drv/bitblt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 17ebde7..23837de 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1910,15 +1910,12 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) #ifdef HAVE_LIBXXSHM if (surface->shminfo.shmid != -1) - { XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, coords.visrect.left, coords.visrect.top, surface->header.rect.left + coords.visrect.left, surface->header.rect.top + coords.visrect.top, coords.visrect.right - coords.visrect.left, coords.visrect.bottom - coords.visrect.top, False ); - XSync( gdi_display, False ); - } else #endif XPutImage( gdi_display, surface->window, surface->gc, surface->image,

1 0

Vincent Povirk : gdiplus: Use clipping region in alpha_blend_pixels.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 423d50eb3b4edd3140880ed2ccbe9d6ca665dcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d50eb3b4edd3140880ed2c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 27 13:42:07 2012 -0600 gdiplus: Use clipping region in alpha_blend_pixels. --- dlls/gdiplus/graphics.c | 163 +++++++++++++++++++++++++++++----------------- 1 files changed, 103 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f56682b..247b17d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -359,68 +359,67 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ } } +static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) +{ + return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); +} + /* Draw non-premultiplied ARGB data to the given graphics object */ -static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, +static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) { - if (graphics->image && graphics->image->type == ImageTypeBitmap) - { - GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; - INT x, y; + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; - for (x=0; x<src_width; x++) + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) { - for (y=0; y<src_height; y++) - { - ARGB dst_color, src_color; - GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); - src_color = ((ARGB*)(src + src_stride * y))[x]; - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); - } + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } - - return Ok; - } - else if (graphics->image && graphics->image->type == ImageTypeMetafile) - { - ERR("This should not be used for metafiles; fix caller\n"); - return NotImplemented; } - else - { - HDC hdc; - HBITMAP hbitmap; - BITMAPINFOHEADER bih; - BYTE *temp_bits; - - hdc = CreateCompatibleDC(0); - - bih.biSize = sizeof(BITMAPINFOHEADER); - bih.biWidth = src_width; - bih.biHeight = -src_height; - bih.biPlanes = 1; - bih.biBitCount = 32; - bih.biCompression = BI_RGB; - bih.biSizeImage = 0; - bih.biXPelsPerMeter = 0; - bih.biYPelsPerMeter = 0; - bih.biClrUsed = 0; - bih.biClrImportant = 0; - - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, - (void**)&temp_bits, NULL, 0); - - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); - - SelectObject(hdc, hbitmap); - gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, - hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); - DeleteObject(hbitmap); - return Ok; - } + return Ok; +} + +static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + HDC hdc; + HBITMAP hbitmap; + BITMAPINFOHEADER bih; + BYTE *temp_bits; + + hdc = CreateCompatibleDC(0); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = src_width; + bih.biHeight = -src_height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); + + SelectObject(hdc, hbitmap); + gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height); + DeleteDC(hdc); + DeleteObject(hbitmap); + + return Ok; } static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, @@ -433,20 +432,44 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst int i, size; RGNDATA *rgndata; RECT *rects; + HRGN hrgn, visible_rgn; + + hrgn = CreateRectRgn(dst_x, dst_y, dst_x + src_width, dst_y + src_height); + if (!hrgn) + return OutOfMemory; + + stat = get_clip_hrgn(graphics, &visible_rgn); + if (stat != Ok) + { + DeleteObject(hrgn); + return stat; + } + + if (visible_rgn) + { + CombineRgn(hrgn, hrgn, visible_rgn, RGN_AND); + DeleteObject(visible_rgn); + } - size = GetRegionData(hregion, 0, NULL); + if (hregion) + CombineRgn(hrgn, hrgn, hregion, RGN_AND); + + size = GetRegionData(hrgn, 0, NULL); rgndata = GdipAlloc(size); if (!rgndata) + { + DeleteObject(hrgn); return OutOfMemory; + } - GetRegionData(hregion, size, rgndata); + GetRegionData(hrgn, size, rgndata); rects = (RECT*)&rgndata->Buffer; for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) { - stat = alpha_blend_pixels(graphics, rects[i].left, rects[i].top, + stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, src_stride); @@ -454,6 +477,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst GdipFree(rgndata); + DeleteObject(hrgn); + return stat; } else if (graphics->image && graphics->image->type == ImageTypeMetafile) @@ -463,21 +488,39 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst } else { + HRGN hrgn; int save; + stat = get_clip_hrgn(graphics, &hrgn); + + if (stat != Ok) + return stat; + save = SaveDC(graphics->hdc); - ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); - stat = alpha_blend_pixels(graphics, dst_x, dst_y, src, src_width, + if (hregion) + ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + + stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, src_height, src_stride); RestoreDC(graphics->hdc, save); + DeleteObject(hrgn); + return stat; } } +static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0;

1 0

Aric Stewart : user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL .
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: bd7e8df6ba2d7984043ad9aaf50e966d05395ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e8df6ba2d7984043ad9aaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 27 14:31:46 2012 -0600 user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL. Issue discovered by Qian Hong. --- dlls/user32/edit.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f5d4e65..c143aa6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -640,7 +640,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); + if (current_line->ssa) + sz = ScriptString_pSize(current_line->ssa); + else sz = 0; if (sz) current_line->width = sz->cx; else @@ -697,8 +699,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->net_length > 0) { EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + current_line->width = sz->cx; + } + else + current_line->width = 0; } else current_line->width = 0; }

1 0

Alexandre Julliard : user32: Fix handling of NULL paint struct in BeginPaint.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: ab2cac4815e0ef4dbacea2708b121a22180438c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2cac4815e0ef4dbacea2708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 20:52:25 2012 +0100 user32: Fix handling of NULL paint struct in BeginPaint. --- dlls/user32/painting.c | 24 ++++++++++++++++-------- dlls/user32/tests/msg.c | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index b2ddfe6..a6fb23f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -893,20 +893,28 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) { HRGN hrgn; + HDC hdc; + BOOL erase; + RECT rect; UINT flags = UPDATE_NONCLIENT | UPDATE_ERASE | UPDATE_PAINT | UPDATE_INTERNALPAINT | UPDATE_NOCHILDREN; - if (!lps) return 0; - HideCaret( hwnd ); if (!(hrgn = send_ncpaint( hwnd, NULL, &flags ))) return 0; - lps->fErase = send_erase( hwnd, flags, hrgn, &lps->rcPaint, &lps->hdc ); + erase = send_erase( hwnd, flags, hrgn, &rect, &hdc ); - TRACE("hdc = %p box = (%s), fErase = %d\n", - lps->hdc, wine_dbgstr_rect(&lps->rcPaint), lps->fErase); + TRACE("hdc = %p box = (%s), fErase = %d\n", hdc, wine_dbgstr_rect(&rect), erase); - return lps->hdc; + if (!lps) + { + release_dc( hwnd, hdc, TRUE ); + return 0; + } + lps->fErase = erase; + lps->rcPaint = rect; + lps->hdc = hdc; + return hdc; } @@ -915,10 +923,10 @@ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) */ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) { - if (!lps) return FALSE; - release_dc( hwnd, lps->hdc, TRUE ); ShowCaret( hwnd ); flush_window_surfaces( FALSE ); + if (!lps) return FALSE; + release_dc( hwnd, lps->hdc, TRUE ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9816f13..ac3ba16 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9093,6 +9093,26 @@ static void test_DispatchMessage(void) if (++count > 10) break; } } + + flush_sequence(); + RedrawWindow( hwnd, &rect, 0, RDW_INVALIDATE|RDW_ERASE|RDW_FRAME ); + count = 0; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_PAINT) DispatchMessage( &msg ); + else + { + HDC hdc; + + flush_sequence(); + hdc = BeginPaint( hwnd, NULL ); + ok( !hdc, "got valid hdc %p from BeginPaint\n", hdc ); + ok( !EndPaint( hwnd, NULL ), "EndPaint succeeded\n" ); + ok_sequence( WmDispatchPaint, "WmDispatchPaint", FALSE ); + ok( !count, "Got multiple WM_PAINTs\n" ); + if (++count > 10) break; + } + } DestroyWindow(hwnd); }

1 0

Christian Costa : amstream: Fix return value of BasePinImp_GetMediaType.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: eca0bc35656fef9f0e9179cfe5fec3074d8cbe9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca0bc35656fef9f0e9179cfe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:13 2012 +0100 amstream: Fix return value of BasePinImp_GetMediaType. --- dlls/amstream/mediastreamfilter.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 3c0777c..afd080a 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -181,15 +181,14 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA } else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio)) { - if (!index) - { - amt->majortype = MEDIATYPE_Audio; - amt->subtype = MEDIASUBTYPE_PCM; - return S_OK; - } + if (index) + return S_FALSE; + + amt->majortype = MEDIATYPE_Audio; + amt->subtype = MEDIASUBTYPE_PCM; } - return S_FALSE; + return S_OK; } static const BasePinFuncTable input_BaseFuncTable = {

1 0