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

Henri Verbeet : d2d1: Take the bitmap' s alpha mode into account in bitmap brushes.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: c4503779bb82a03016cb05c815390b378f314fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4503779bb82a03016cb05c81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:21 2015 +0200 d2d1: Take the bitmap's alpha mode into account in bitmap brushes. --- dlls/d2d1/brush.c | 24 +++++++++++++----------- dlls/d2d1/render_target.c | 17 +++++++++++------ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index fb40f3d..b968a65 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -728,8 +728,9 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_targe struct { float _11, _21, _31, pad0; - float _12, _22, _32, pad1; - } transform; + float _12, _22, _32, opacity; + BOOL ignore_alpha; + } bitmap_brush_cb; D2D1_COLOR_F color; HRESULT hr; @@ -783,17 +784,18 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_targe d = b._11 * b._22 - b._21 * b._12; if (d != 0.0f) { - transform._11 = b._22 / d; - transform._21 = -b._21 / d; - transform._31 = (b._21 * b._32 - b._31 * b._22) / d; - transform._12 = -b._12 / d; - transform._22 = b._11 / d; - transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; + bitmap_brush_cb._11 = b._22 / d; + bitmap_brush_cb._21 = -b._21 / d; + bitmap_brush_cb._31 = (b._21 * b._32 - b._31 * b._22) / d; + bitmap_brush_cb._12 = -b._12 / d; + bitmap_brush_cb._22 = b._11 / d; + bitmap_brush_cb._32 = -(b._11 * b._32 - b._31 * b._12) / d; } - transform.pad1 = brush->opacity; + bitmap_brush_cb.opacity = brush->opacity; + bitmap_brush_cb.ignore_alpha = bitmap->format.alphaMode == D2D1_ALPHA_MODE_IGNORE; - buffer_desc.ByteWidth = sizeof(transform); - buffer_data.pSysMem = &transform; + buffer_desc.ByteWidth = sizeof(bitmap_brush_cb); + buffer_data.pSysMem = &bitmap_brush_cb; } else { diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 1c641e7..ead6b29 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1564,6 +1564,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, #if 0 float3x2 transform; float opacity; + bool ignore_alpha; SamplerState s; Texture2D t; @@ -1576,26 +1577,30 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, texcoord.x = position.x * transform._11 + position.y * transform._21 + transform._31; texcoord.y = position.x * transform._12 + position.y * transform._22 + transform._32; ret = t.Sample(s, texcoord); - ret.a *= opacity; + if (ignore_alpha) + ret.a = opacity; + else + ret.a *= opacity; return ret; } #endif - 0x43425844, 0x9a5f9280, 0xa5351c23, 0x15d6e760, 0xce35bcc3, 0x00000001, 0x000001d0, 0x00000003, + 0x43425844, 0xf2e9967c, 0xad1d1ac2, 0x865274b8, 0x6ab4c5ca, 0x00000001, 0x000001fc, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000134, 0x00000040, - 0x0000004d, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300005a, 0x00106000, 0x00000000, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000160, 0x00000040, + 0x00000058, 0x04000059, 0x00208e46, 0x00000000, 0x00000003, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0800000f, 0x00100012, 0x00000000, 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x08000000, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0020802a, 0x00000000, 0x00000000, 0x0800000f, 0x00100042, 0x00000000, 0x00101046, 0x00000000, 0x00208046, 0x00000000, 0x00000001, 0x08000000, 0x00100022, 0x00000000, 0x0010002a, 0x00000000, 0x0020802a, 0x00000000, 0x00000001, 0x09000045, 0x001000f2, 0x00000000, - 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00102082, + 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x08000038, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x0020803a, 0x00000000, 0x00000001, 0x05000036, 0x00102072, - 0x00000000, 0x00100246, 0x00000000, 0x0100003e, + 0x00000000, 0x00100246, 0x00000000, 0x0b000037, 0x00102082, 0x00000000, 0x0020800a, 0x00000000, + 0x00000002, 0x0020803a, 0x00000000, 0x00000001, 0x0010003a, 0x00000000, 0x0100003e, }; /* The basic idea here is to evaluate the implicit form of the curve in * texture space. "t.z" determines which side of the curve is shaded. */

1 0

Henri Verbeet : d2d1: Force alpha to 1.0f for clears.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 230785dc328a373627b242d47250cf5ee5d01540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230785dc328a373627b242d47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:22 2015 +0200 d2d1: Force alpha to 1.0f for clears. --- dlls/d2d1/render_target.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ead6b29..6c533f2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1133,6 +1133,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1Rend static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color) { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + D2D1_COLOR_F c = {0.0f, 0.0f, 0.0f, 0.0f}; D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; @@ -1162,8 +1163,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - buffer_desc.ByteWidth = sizeof(*color); - buffer_data.pSysMem = color; + if (color) + c = *color; + c.a = 1.0f; + buffer_desc.ByteWidth = sizeof(c); + buffer_data.pSysMem = &c; if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) {

1 0

Hans Leidekker : user32: Add a stub implementation of IsWindowRedirectedForPrint.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 1a78666654f60fdd408f3627f7d8828437148655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a78666654f60fdd408f3627f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:38:13 2015 +0200 user32: Add a stub implementation of IsWindowRedirectedForPrint. --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index e395d2f..d2b4b73 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -748,6 +748,16 @@ BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags ) return FALSE; } +/********************************************************************** + * IsWindowRedirectedForPrint [USER32.@] + */ +BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) +{ + FIXME("(%p): stub\n", hwnd); + return FALSE; +} + + static const WCHAR imeW[] = {'I','M','E',0}; const struct builtin_class_descr IME_builtin_class = { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 204ccd4..f0e541f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -450,6 +450,7 @@ @ stdcall IsWindow(long) @ stdcall IsWindowEnabled(long) # @ stub IsWindowInDestroy +@ stdcall IsWindowRedirectedForPrint(long) @ stdcall IsWindowUnicode(long) @ stdcall IsWindowVisible(long) @ stdcall IsZoomed(long)

1 0

Hans Leidekker : wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: f7538bfe4734761f1090d079a9d55cef4c33463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7538bfe4734761f1090d079a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:38:39 2015 +0200 wininet: Add a stub implementation of INTERNET_OPTION_SUPPRESS_BEHAVIOR. --- dlls/wininet/internet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 74f44b0..ee04f40 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2765,6 +2765,15 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); collect_connections(COLLECT_CONNECTIONS); return ERROR_SUCCESS; + + case INTERNET_OPTION_SUPPRESS_BEHAVIOR: + FIXME("INTERNET_OPTION_SUPPRESS_BEHAVIOR stub\n"); + + if(size != sizeof(ULONG)) + return ERROR_INTERNET_BAD_OPTION_LENGTH; + + FIXME("%08x\n", *(ULONG*)buf); + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION;

1 0

Hans Leidekker : winspool: Don't fail on empty server name in AddPrinterW.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: ccb19eed6997920d7182252178ac9963b4cc5f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccb19eed6997920d718225217… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 29 11:39:01 2015 +0200 winspool: Don't fail on empty server name in AddPrinterW. --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8cfedfb..4549034 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3149,7 +3149,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); - if(pName != NULL) { + if(pName && *pName) { ERR("pName = %s - unsupported\n", debugstr_w(pName)); SetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

Alexandre Julliard : Wine release 1.7.48
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: website Branch: master Commit: 74430085ee7632ad99b8ffa13f113cc4f0865744 URL: http://source.winehq.org/git/website.git/?a=commit;h=74430085ee7632ad99b8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:30:11 2015 +0200 Wine release 1.7.48 --- news/en/2015072801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015072801.xml b/news/en/2015072801.xml new file mode 100644 index 0000000..a5c1254 --- /dev/null +++ b/news/en/2015072801.xml @@ -0,0 +1,16 @@ +<news> +<date>July 28, 2015</date> +<title>Wine 1.7.48 Released</title> +<body> + The Wine development release 1.7.48 is now available. + <a href="{$root}/announce/1.7.48">What's new</a> in this release: +<ul> + <li>Fleshed out OpenMP implementation.</li> + <li>I/O stream support in the MSVCIRT C++ runtime.</li> + <li>Support for pixel snapping in DirectWrite.</li> + <li>More support for OpenGL core contexts.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.48.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : dwrite: Implement GetRecommendedRenderingMode().
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: e877cfbcfa4759b57048f029c14e12acbb6acafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877cfbcfa4759b57048f029c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 27 11:10:32 2015 +0300 dwrite: Implement GetRecommendedRenderingMode(). --- dlls/dwrite/dwrite_private.h | 9 +++ dlls/dwrite/font.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/opentype.c | 30 +++++++++- dlls/dwrite/tests/font.c | 28 +++++---- 4 files changed, 174 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e877cfbcfa4759b57048f…

1 0

Jacek Caban : include: Added inspectable.idl file.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 5c000dca57f2bae082a729bfa667d429e0c4c836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c000dca57f2bae082a729bfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 27 13:41:16 2015 +0200 include: Added inspectable.idl file. --- include/Makefile.in | 1 + include/inspectable.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3b8d8d1..f829712 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -62,6 +62,7 @@ PUBLIC_IDL_H_SRCS = \ indexsrv.idl \ inputscope.idl \ inseng.idl \ + inspectable.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inspectable.idl b/include/inspectable.idl new file mode 100644 index 0000000..847d21d --- /dev/null +++ b/include/inspectable.idl @@ -0,0 +1,41 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "unknwn.idl"; +import "hstring.idl"; + +typedef [v1_enum] enum TrustLevel { + BaseTrust, + PartialTrust, + FullTrust +} TrustLevel; + +[ + object, + uuid(af86e2e0-b12d-4c6a-9c5a-d7aa65101e90), + pointer_default(unique) +] +interface IInspectable : IUnknown +{ + HRESULT GetIids([out] ULONG *iidCount, [out, size_is(,*iidCount)] IID **iids); + HRESULT GetRuntimeClassName([out] HSTRING *className); + HRESULT GetTrustLevel([out] TrustLevel *trustLevel); +} + +typedef [unique] IInspectable *LPINSPECTABLE;

1 0

Daniel Lehman : gdi32: Check for NULL pointer in GetOutlineTextMetrics.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 22c51eeabf6f7dcdcdcb6f41d51b1faa8072aead URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c51eeabf6f7dcdcdcb6f41d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jul 20 16:38:05 2015 -0700 gdi32: Check for NULL pointer in GetOutlineTextMetrics. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a7a3d7..1187598 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7722,7 +7722,7 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX if (physdev->font->potm || get_outline_text_metrics( physdev->font )) { - if(cbSize >= physdev->font->potm->otmSize) + if(potm && cbSize >= physdev->font->potm->otmSize) { memcpy(potm, physdev->font->potm, physdev->font->potm->otmSize); scale_outline_font_metrics(physdev->font, potm); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cce4a1f..8595a4a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2147,6 +2147,11 @@ static void test_GetOutlineTextMetrics(void) } ok(otm->otmpFullName == unset_ptr, "expected %p got %p\n", unset_ptr, otm->otmpFullName); + /* check handling of NULL pointer */ + SetLastError(0xdeadbeef); + ret = GetOutlineTextMetricsA(hdc, otm_size, NULL); + ok(ret == otm_size, "expected %u, got %u, error %d\n", otm_size, ret, GetLastError()); + HeapFree(GetProcessHeap(), 0, otm); SelectObject(hdc, hfont_old);

1 0

Matteo Bruni : wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 53d152794574ce19d835340dda626845b2e85dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d152794574ce19d835340dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:53 2015 +0200 wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible. --- dlls/wined3d/directx.c | 27 +++---- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/utils.c | 156 ++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 19 ++++- 4 files changed, 164 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d152794574ce19d8353…

1 0