August 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Validate the port number in WinHttpCrackUrl.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 17b4abf47f369a056401abc3b9e60f9c94e4eb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b4abf47f369a056401abc3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:02 2016 +0200 winhttp: Validate the port number in WinHttpCrackUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 22 ++++++++++++++++++++++ dlls/winhttp/url.c | 19 ++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index ec6dbd0..27979f6 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -69,6 +69,9 @@ static const WCHAR url12[] = static const WCHAR url13[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; static const WCHAR url14[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t',0}; +static const WCHAR url15[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','6','5','5','3','6',0}; +static const WCHAR url16[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','0',0}; +static const WCHAR url17[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -718,6 +721,25 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 0, "unexpected length %u\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo, "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + + reset_url_components( &uc ); + SetLastError( 0xdeadbeef ); + ret = WinHttpCrackUrl( url15, 0, 0, &uc ); + error = GetLastError(); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url16, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + ok( !uc.nPort, "got %u\n", uc.nPort ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url17, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 2b479a9..8888b8f 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -163,6 +163,19 @@ static WCHAR *escape_url( LPCWSTR url, DWORD *len ) return ret; } +static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) +{ + const WCHAR *p = str; + DWORD port = 0; + while (len && isdigitW( *p )) + { + if ((port = port * 10 + *p - '0') > 65535) return ERROR_WINHTTP_INVALID_URL; + p++; len--; + } + *ret = port; + return ERROR_SUCCESS; +} + /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ @@ -172,7 +185,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN DWORD err, scheme_len, user_len, passwd_len, host_len, path_len, extra_len; INTERNET_SCHEME scheme = 0; - TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); + TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { @@ -258,7 +271,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((err = set_component( &uc->lpszHostName, &host_len, p, r - p, flags ))) goto exit; r++; - uc->nPort = atoiW( r ); + if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { @@ -284,7 +297,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((err = set_component( &uc->lpszHostName, &host_len, p, r - p, flags ))) goto exit; r++; - uc->nPort = atoiW( r ); + if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else {

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: e248f530f3848b34989e217f94e780e923f107cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e248f530f3848b34989e217f9… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Tue Aug 16 14:28:28 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 342 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 171 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e248f530f3848b34989e2…

1 0

Kenneth Haley : v4 resend: Riched20: allow setting background text color.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: fc1b2e0473d26ecb37575edae139e3a684e3d1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1b2e0473d26ecb37575edae… Author: Kenneth Haley <haleykd(a)users.sf.net> Date: Mon Aug 15 13:03:07 2016 -0600 v4 resend: Riched20: allow setting background text color. Signed-off-by: Kenneth Haley <haleykd(a)users.sf.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/paint.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fb77a67..9c54623 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -489,7 +489,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) { RTFColor *c = RTFGetColor(info, info->rtfParam); if (c && c->rtfCBlue >= 0) - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + fmt.crBackColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); else fmt.dwEffects = CFE_AUTOBACKCOLOR; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42434b9..736080a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -201,6 +201,21 @@ static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } +static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + else if ( (style->fmt.dwMask & CFM_BACKCOLOR) + && !(style->fmt.dwEffects & CFE_AUTOBACKCOLOR) ) + color = style->fmt.crBackColor; + else + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOW ); + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -314,14 +329,17 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } - static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); - COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF back_color = get_back_color( c, run->style, selected ); COLORREF old_text, old_back = 0; const WCHAR *text = get_text( run, 0 ); ME_String *masked = NULL; + const BOOL paint_bg = ( selected + || ( ( run->style->fmt.dwMask & CFM_BACKCOLOR ) + && !(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects) ) + ); if (c->editor->cPasswordMask) { @@ -330,16 +348,16 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } old_text = SetTextColor( c->hDC, text_color ); - if (selected) old_back = SetBkColor( c->hDC, back_color ); + if (paint_bg) old_back = SetBkColor( c->hDC, back_color ); if (run->para->nFlags & MEPF_COMPLEX) - ScriptTextOut( c->hDC, &run->style->script_cache, x, y, selected ? ETO_OPAQUE : 0, sel_rect, + ScriptTextOut( c->hDC, &run->style->script_cache, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, &run->script_analysis, NULL, 0, run->glyphs, run->num_glyphs, run->advances, NULL, run->offsets ); else - ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + ExtTextOutW( c->hDC, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); - if (selected) SetBkColor( c->hDC, old_back ); + if (paint_bg) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); draw_underline( c, run, x, y, text_color ); @@ -389,7 +407,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, FALSE, NULL ); + + if (!(run->style->fmt.dwEffects & CFE_AUTOBACKCOLOR) + && (run->style->fmt.dwMask & CFM_BACKCOLOR) ) + { + RECT tmp_rect; + get_selection_rect( c, run, 0, run->len, cy, &tmp_rect ); + OffsetRect( &tmp_rect, x, ymin ); + draw_text( c, run, x, y - yOffset, FALSE, &tmp_rect ); + } + else + draw_text( c, run, x, y - yOffset, FALSE, NULL ); + if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY );

1 0

Józef Kucia : wined3d: Do not switch display mode when windowed is TRUE.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 910fc594d9e483143863e27eb7498dd26ccdd3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910fc594d9e483143863e27eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:15 2016 +0200 wined3d: Do not switch display mode when windowed is TRUE. Fixes a regression introduced by commit cad279449c62a965a70a712a91b11ba52c4ff4f7. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 406dca9..c2a8c55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4648,6 +4648,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view_desc view_desc; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; + BOOL backbuffer_resized; HRESULT hr = WINED3D_OK; unsigned int i; @@ -4737,10 +4738,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_swapchain_set_window(swapchain, NULL); } + backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width + || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height; + if (!swapchain_desc->windowed != !swapchain->desc.windowed || swapchain->reapply_mode || mode - || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width - || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height) + || (!swapchain_desc->windowed && backbuffer_resized)) { if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) return hr;

1 0

André Hentschel : kernel32/tests: Fill in the delay IAT to succeed on Win10.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: bdd7be374723bb92b7f2f735c5ed91827acd4cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd7be374723bb92b7f2f735c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 15 17:52:53 2016 +0200 kernel32/tests: Fill in the delay IAT to succeed on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7585b9b..28449ac 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2608,7 +2608,7 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) ok(!!pd->ThunkAddress, "no ThunkAddress supplied\n"); if (pd->ThunkAddress) - ok(pd->ThunkAddress->u1.Ordinal == 0, "expected 0, got %x\n", (UINT)pd->ThunkAddress->u1.Ordinal); + ok(pd->ThunkAddress->u1.Ordinal, "no ThunkAddress value supplied\n"); ok(!!pd->TargetDllName, "no TargetDllName supplied\n"); if (pd->TargetDllName) @@ -2782,9 +2782,20 @@ static void test_ResolveDelayLoadedAPI(void) ret = WriteFile(hfile, test_func, sizeof(test_func), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); - file_size = GetFileSize(hfile, NULL); + SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, SEEK_SET ); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + /* 0x1a00 is an empty space between delay data and extended delay data, real thunks are not necessary */ + itd32.u1.Function = nt_header.OptionalHeader.ImageBase + 0x1a00 + i * 0x20; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + + itd32.u1.Function = 0; SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.ImportNameTableRVA - file_size, &dummy, NULL); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)

1 0

Vincent Povirk : gdiplus/tests: Add test for containers in metafiles.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 977ba49768f355582af47e2fa3bb2279525b1677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977ba49768f355582af47e2fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:42 2016 -0500 gdiplus/tests: Add test for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index c2cc400..a9d54a7 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1709,6 +1709,166 @@ static void test_frameunit(void) expect(Ok, stat); } +static const emfplus_record container_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSave}, + {0, EmfPlusRecordTypeRestore}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeScaleWorldTransform}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndContainer}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeBeginContainerNoParams}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_containers(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + GpBitmap *bitmap; + GpBrush *brush; + ARGB color; + HDC hdc; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GraphicsContainer state1, state2; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Normal usage */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff000000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 5.0, 5.0, 5.0, 5.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipSaveGraphics(graphics, &state1); + expect(Ok, stat); + + stat = GdipRestoreGraphics(graphics, state1); + expect(Ok, stat); + + /* Popping two states at once */ + stat = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipScaleWorldTransform(graphics, 4.0, 4.0, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipBeginContainer2(graphics, &state2); + expect(Ok, stat); + + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff00ff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 20.0, 20.0, 5.0, 5.0); + expect(Ok, stat); + + /* Restoring an invalid state seems to break the graphics object? */ + if (0) { + stat = GdipEndContainer(graphics, state1); + expect(Ok, stat); + } + + /* Ending metafile with a state open */ + stat = GdipBeginContainer2(graphics, &state1); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, container_records, "container metafile", dst_points, &frame, UnitPixel); + + sync_metafile(&metafile, "container.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, container_records, "container playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 80, 80, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 12, 12, &color); + expect(Ok, stat); + expect(0xff000000, color); + + stat = GdipBitmapGetPixel(bitmap, 8, 8, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 42, 42, &color); + expect(Ok, stat); + expect(0xff00ff00, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1743,6 +1903,7 @@ START_TEST(metafile) test_worldtransform(); test_converttoemfplus(); test_frameunit(); + test_containers(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Add support for containers in metafiles.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: f28803c0a4b34ad4a46fcb1700076c17633c4fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28803c0a4b34ad4a46fcb170… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 15 16:25:41 2016 -0500 gdiplus: Add support for containers in metafiles. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 5 + dlls/gdiplus/graphics.c | 14 +++ dlls/gdiplus/image.c | 1 + dlls/gdiplus/metafile.c | 205 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 225 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f28803c0a4b34ad4a46fc…

1 0

Hans Leidekker : winhttp: Set required buffer length for all components in WinHttpCrackUrl.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 1d07f8987993fb0cb5398e9a45f2435eb771a471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d07f8987993fb0cb5398e9a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:01 2016 +0200 winhttp: Set required buffer length for all components in WinHttpCrackUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 49 ++++++++++++----- dlls/winhttp/url.c | 139 ++++++++++++++++++++++++++++++----------------- 2 files changed, 124 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d07f8987993fb0cb5398…

1 0

Michael Stefaniuc : msvcirt/tests: Simplify generating a pointer to address 0x1.
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: ac2ad35d4dab8ac83966f53a6a196005202790e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2ad35d4dab8ac83966f53a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 09:43:37 2016 +0200 msvcirt/tests: Simplify generating a pointer to address 0x1. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4940669..9750d88 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -4509,7 +4509,7 @@ static void test_istream(void) ok(ret == EOF, "expected -1 got %d\n", ret); ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); /* get_char */ is1.count = 0xabababab; @@ -4552,14 +4552,14 @@ static void test_istream(void) ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); ok(c == EOF, "expected -1 got %d\n", c); is1.base_ios.state = IOSTATE_failbit; pis = call_func2(p_istream_get_char, &is1, NULL); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); /* get_sb */ is1.count = 0xabababab;

1 0

Nikolay Sivov : strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind).
by Alexandre Julliard Aug. 16, 2016

Aug. 16, 2016

Module: wine Branch: master Commit: 51021faaef8312c35e9772873ad588c194c5c709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51021faaef8312c35e9772873… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 16:38:33 2016 +0300 strmbase: Fix media type leaks when creating IEnumMediaTypes instance (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 63b9ec2..91c0ddc 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -125,18 +125,23 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->basePin = basePin; i = 0; - while (enumFunc(basePin, i, &amt) == S_OK) i++; + while (enumFunc(basePin, i, &amt) == S_OK) + { + FreeMediaType(&amt); + i++; + } pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) { - enumFunc(basePin,i,&amt); - if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) + HRESULT hr; + + if (FAILED(hr = enumFunc(basePin, i, &pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]))) { IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); - return E_OUTOFMEMORY; + return hr; } } *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;

1 0