March 2015 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Do not access Bitmap bits when drawing transparent pixels.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 08c1e6cd96064a2025f62dbc046b888b63b73b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c1e6cd96064a2025f62dbc0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 17 16:09:56 2015 -0500 gdiplus: Do not access Bitmap bits when drawing transparent pixels. --- dlls/gdiplus/graphics.c | 6 +++++- dlls/gdiplus/tests/graphics.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68a4ee5..4ed25c9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -365,8 +365,12 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ 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]; + + if (!(src_color & 0xff000000)) + continue; + + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fd4cf80..e0bd615 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2417,6 +2417,27 @@ static void test_fromMemoryBitmap(void) GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); + + /* If we don't draw to the HDC, the bits are never accessed */ + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, (BYTE*)1, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + todo_wine expect(0x0c0b0d, color); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + GdipDisposeImage((GpImage*)bitmap); } static void test_GdipIsVisiblePoint(void)

1 0

Vincent Povirk : gdiplus: Access bitmaps by row in alpha_blend_bmp_pixels.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 0bec10bc3dc9576a42929de7d016a9be45022810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bec10bc3dc9576a42929de7d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 17 16:11:14 2015 -0500 gdiplus: Access bitmaps by row in alpha_blend_bmp_pixels. --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4ed25c9..6d86e3a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -360,9 +360,9 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - for (x=0; x<src_width; x++) + for (y=0; y<src_height; y++) { - for (y=0; y<src_height; y++) + for (x=0; x<src_width; x++) { ARGB dst_color, src_color; src_color = ((ARGB*)(src + src_stride * y))[x];

1 0

Francois Gouget : oledlg: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: b8521dbccd1f9afcee7c8b9e18c99ffb231311a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8521dbccd1f9afcee7c8b9e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:10 2015 +0100 oledlg: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/oledlg/pastespl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 4d31488..530c4ed 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION #include <stdarg.h>

1 0

Francois Gouget : printui: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: a186ded57f7dce7137ed72e4ee6dff6beea42ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186ded57f7dce7137ed72e4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:02 2015 +0100 printui: Remove an unneeded NONAMELESSUNION directive. --- dlls/printui/printui.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index c6e610d..32e7b52 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : pdh: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 18 Mar '15

18 Mar '15

Module: wine Branch: master Commit: 362a260409ff2bf156b0404695f723715c4f6cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362a260409ff2bf156b040469… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:17 2015 +0100 pdh: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/pdh/pdh_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f197095..2631fe1 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -23,7 +23,7 @@ #include <math.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h"

1 0

Huw Davies : riched20: Don' t resend a partial chunk to the edit stream callback.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 2a5886974d80d2c64f12d8b7816d23a6f0a702e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5886974d80d2c64f12d8b78… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 17 09:39:38 2015 +0000 riched20: Don't resend a partial chunk to the edit stream callback. It's basically used as a boolean to terminate the writing process if it's set to zero. --- dlls/riched20/tests/editor.c | 31 +++++++++++++++++++++++++++++++ dlls/riched20/writer.c | 23 ++++++----------------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 101aec0..b15f16f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3404,6 +3404,24 @@ static void test_WM_SETTEXT(void) #undef TEST_SETTEXTW } +/* Set *pcb to one to show that the remaining cb-1 bytes are not + resent to the callkack. */ +static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + char** str = (char**)dwCookie; + ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + *pcb = 0; + if (cb > 0) { + memcpy(*str, pbBuff, cb); + *str += cb; + *pcb = 1; + } + return 0; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3452,6 +3470,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem3) == 0, "streamed text different, got %s\n", buf); + /* Use a callback that sets *pcb to one */ + p = buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_esCallback_written_1; + memset(buf, 0, sizeof(buf)); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + r = strlen(buf); + ok(r == 14, "streamed text length is %d, expecting 14\n", r); + ok(strcmp(buf, TestItem3) == 0, + "streamed text different, got %s\n", buf); + + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ea797fd..26a64a7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -49,29 +49,18 @@ ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) static BOOL ME_StreamOutFlush(ME_OutStream *pStream) { - LONG nStart = 0; LONG nWritten = 0; - LONG nRemaining = 0; EDITSTREAM *stream = pStream->stream; - while (nStart < pStream->pos) { - TRACE("sending %u bytes\n", pStream->pos - nStart); - /* Some apps seem not to set *pcb unless a problem arises, relying - on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ - nRemaining = pStream->pos - nStart; - nWritten = 0xDEADBEEF; - stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer + nStart, - pStream->pos - nStart, &nWritten); + if (pStream->pos) { + TRACE("sending %u bytes\n", pStream->pos); + nWritten = pStream->pos; + stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer, + pStream->pos, &nWritten); TRACE("error=%u written=%u\n", stream->dwError, nWritten); - if (nWritten > (pStream->pos - nStart) || nWritten<0) { - FIXME("Invalid returned written size *pcb: 0x%x (%d) instead of %d\n", - (unsigned)nWritten, nWritten, nRemaining); - nWritten = nRemaining; - } if (nWritten == 0 || stream->dwError) return FALSE; - pStream->written += nWritten; - nStart += nWritten; + /* Don't resend partial chunks if nWritten < pStream->pos */ } pStream->pos = 0; return TRUE;

1 0

Francois Gouget : oledb32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 11f1a21e9f63fd399f29091afcd439ef9d1264e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f1a21e9f63fd399f29091af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:29 2015 +0100 oledb32: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/convert.c | 2 -- dlls/oledb32/datainit.c | 2 -- dlls/oledb32/main.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 36448d3..11d153c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index dfafeb1..3cd3821 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -18,8 +18,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 48aa5a3..f28e57a 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : oledb32/tests: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: f597fe8f4f3d78d829a61446b5a9a29f9f804ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f597fe8f4f3d78d829a61446b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:37 2015 +0100 oledb32/tests: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/tests/database.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index a46725c..b4ce139 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -21,8 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Nikolay Sivov : ole32: Handle ILockBytes creation failure (PVS-Studio).
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 1c2bbe8f650b79d827ecad9277c6e02baf6f152e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2bbe8f650b79d827ecad927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 14 01:15:59 2015 +0300 ole32: Handle ILockBytes creation failure (PVS-Studio). --- dlls/ole32/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index c7d58d6..db1e4a8 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -576,6 +576,12 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) hStorage = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, 0); if (hStorage == NULL) return E_OUTOFMEMORY; hr = CreateILockBytesOnHGlobal(hStorage, FALSE, &ptrILockBytes); + if (FAILED(hr)) + { + GlobalFree(hStorage); + return hr; + } + hr = StgCreateDocfileOnILockBytes(ptrILockBytes, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &std.u.pstg); ILockBytes_Release(ptrILockBytes);

1 0

Nikolay Sivov : dwrite: Initially format and layout don' t have a fallback set.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 947f8e64d5570edfd9d73f7de891583816391bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947f8e64d5570edfd9d73f7de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 00:43:20 2015 +0300 dwrite: Initially format and layout don't have a fallback set. --- dlls/dwrite/layout.c | 21 +++++++++++++++++---- dlls/dwrite/tests/layout.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 24fb580..32c248b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -57,6 +57,7 @@ struct dwrite_textformat_data { IDWriteInlineObject *trimmingsign; IDWriteFontCollection *collection; + IDWriteFontFallback *fallback; }; enum layout_range_attr_kind { @@ -173,6 +174,7 @@ static const IDWriteTextFormat1Vtbl dwritetextformatvtbl; static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); + if (data->fallback) IDWriteFontFallback_Release(data->fallback); if (data->trimmingsign) IDWriteInlineObject_Release(data->trimmingsign); heap_free(data->family_name); heap_free(data->locale); @@ -219,6 +221,14 @@ static inline const char *debugstr_run(const struct layout_run *run) run->descr.stringLength); } +static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) +{ + *fallback = format->fallback; + if (*fallback) + IDWriteFontFallback_AddRef(*fallback); + return S_OK; +} + static struct layout_run *alloc_layout_run(void) { struct layout_run *ret; @@ -1877,8 +1887,8 @@ static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback **fallback) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextLayout2Vtbl dwritetextlayoutvtbl = { @@ -2194,6 +2204,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); layout->format.readingdir = IDWriteTextFormat_GetReadingDirection(format); layout->format.flow = IDWriteTextFormat_GetFlowDirection(format); + layout->format.fallback = NULL; hr = IDWriteTextFormat_GetLineSpacing(format, &layout->format.spacingmethod, &layout->format.spacing, &layout->format.baseline); if (FAILED(hr)) @@ -2228,6 +2239,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); if (hr == S_OK) { layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + IDWriteTextFormat1_GetFontFallback(format1, &layout->format.fallback); IDWriteTextFormat1_Release(format1); } else @@ -2745,8 +2757,8 @@ static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat1_GetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback **fallback) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%p): stub\n", This, fallback); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, fallback); + return get_fontfallback_from_format(&This->format, fallback); } static const IDWriteTextFormat1Vtbl dwritetextformatvtbl = { @@ -2822,6 +2834,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimming.delimiterCount = 0; This->format.trimmingsign = NULL; This->format.collection = collection; + This->format.fallback = NULL; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat*)&This->IDWriteTextFormat1_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a0de75e..663605e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1122,6 +1122,42 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteTextLayout2_Release(layout2); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + return; + } + +if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + IDWriteTextLayout2_Release(layout2); +} + START_TEST(layout) { HRESULT hr; @@ -1150,6 +1186,7 @@ START_TEST(layout) test_SetLocaleName(); test_SetPairKerning(); test_SetVerticalGlyphOrientation(); + test_fallback(); IDWriteFactory_Release(factory); }

1 0