November 2015 - Wine-Commits

Julian Rüger : German translation for release 1.7.54
by Jeremy Newman Nov. 4, 2015

Nov. 4, 2015

Module: website Branch: master Commit: a6626fb44bf19da0675b7d9eaf607b5a8125ddbc URL: http://source.winehq.org/git/website.git/?a=commit;h=a6626fb44bf19da0675b7d… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Nov 4 16:51:30 2015 +0100 German translation for release 1.7.54 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015103001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015103001.xml b/news/de/2015103001.xml new file mode 100644 index 0000000..32fbb88 --- /dev/null +++ b/news/de/2015103001.xml @@ -0,0 +1,17 @@ +<news> +<date>30. Oktober 2015</date> +<title>Wine 1.7.54 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.54 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.54">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Implementierung der TransmitFile-Funktion.</li> + <li>Weitere Implementierung der Webservices-DLL.</li> + <li>Verbesserte Video-Dekodierung.</li> + <li>Eine Alternative zum veralteten Prelink-Tool.</li> + <li>Größeres Update der türkischen Übersetzung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.54.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : comctl32: Protect TVM_GETITEM from invalid item pointers.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 60fedd23f95c66f4dce06c5c447de9ec99ebefa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fedd23f95c66f4dce06c5c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 4 12:52:04 2015 +0100 comctl32: Protect TVM_GETITEM from invalid item pointers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 7 +++++++ dlls/comctl32/treeview.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5003dfa..917df23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -905,6 +905,13 @@ static void test_get_set_item(void) expect(TRUE, ret); ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state); + /* invalid item pointer, nt4 crashes here but later versions just return 0 */ + tviRoot.hItem = (HTREEITEM)0xdeadbeef; + tviRoot.mask = TVIF_STATE; + tviRoot.state = 0; + ret = SendMessageA(hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot); + expect(FALSE, ret); + DestroyWindow(hTree); DestroyWindow(hTree2); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 812bd35..6adafc4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -63,6 +63,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(treeview); @@ -2068,11 +2069,20 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) if (!TREEVIEW_ValidItem(infoPtr, item)) { + BOOL valid_item = FALSE; if (!item) return FALSE; - TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); - infoPtr = item->infoPtr; - if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + __TRY + { + infoPtr = item->infoPtr; + TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); + valid_item = TREEVIEW_ValidItem(infoPtr, item); + } + __EXCEPT_PAGE_FAULT + { + } + __ENDTRY + if (!valid_item) return FALSE; } TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);

1 0

Martin Storsjo : makedep: Set use_msvcrt for ucrtbase imports as well.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: d33f0a492b2e5d049a076c8548974eeb2e3aec27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33f0a492b2e5d049a076c854… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:21:58 2015 +0200 makedep: Set use_msvcrt for ucrtbase imports as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea3fb6..af7fea1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2907,7 +2907,8 @@ static void update_makefile( const char *path ) make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) - make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ); + make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || + !strcmp( make->imports.str[i], "ucrtbase" ); make->install_lib_rules = empty_strarray; make->install_dev_rules = empty_strarray;

1 0

Henri Verbeet : wined3d: Disallow stencil size mismatches in wined3d_check_pixel_format_depth() if the format has stencil bits.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 27e65fb963b177a1c1ca0a3cbb0de147f318969a URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e65fb963b177a1c1ca0a3cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:47 2015 +0100 wined3d: Disallow stencil size mismatches in wined3d_check_pixel_format_depth() if the format has stencil bits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e2203ea..a7329e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4309,9 +4309,10 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in return FALSE; /* Some cards like Intel i915 ones only offer D24S8 but lots of games also - * need a format without stencil, so allow more stencil bits than - * requested. */ - if (cfg->stencilSize < format->stencil_size) + * need a format without stencil. We can allow a mismatch if the format + * doesn't have any stencil bits. If it does have stencil bits the size + * must match, or stencil wrapping would break. */ + if (format->stencil_size && cfg->stencilSize != format->stencil_size) return FALSE; return TRUE;

1 0

Nikolay Sivov : dwrite/tests: Simple test to show that run analysis instances are not reused.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: a5127f5fc5ee12ec527f711cbcdeb33a35d66f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5127f5fc5ee12ec527f711cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 22:05:25 2015 +0300 dwrite/tests: Simple test to show that run analysis instances are not reused. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 104e8e6..f6bca9c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3495,7 +3495,7 @@ static void test_CreateGlyphRunAnalysis(void) DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, }; - IDWriteGlyphRunAnalysis *analysis; + IDWriteGlyphRunAnalysis *analysis, *analysis2; IDWriteFactory *factory; DWRITE_GLYPH_RUN run; IDWriteFontFace *face; @@ -3783,6 +3783,15 @@ static void test_CreateGlyphRunAnalysis(void) hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); ok(hr == S_OK, "got 0x%08x\n", hr); ok((rect2.right - rect2.left) > (rect.right - rect.left), "got rect width %d\n", rect2.right - rect2.left); + + /* instances are not reused for same runs */ + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, &m, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(analysis2 != analysis, "got %p, previous instance %p\n", analysis2, analysis); + IDWriteGlyphRunAnalysis_Release(analysis2); + IDWriteGlyphRunAnalysis_Release(analysis); IDWriteFontFace_Release(face);

1 0

Henri Verbeet : wined3d: Call wglGetPixelFormat() through the gl_ops table.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: b53256b8b752855576252cc2290dfbc9cb0f1280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53256b8b752855576252cc22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:49 2015 +0100 wined3d: Call wglGetPixelFormat() through the gl_ops table. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 13b8471..1692d0d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -820,7 +820,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) return TRUE; - current = GetPixelFormat(dc); + current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; if (!current) @@ -1219,7 +1219,7 @@ static void context_enter(struct wined3d_context *context) context->needs_set = 1; } else if (!context->needs_set && !(context->hdc_is_private && context->hdc_has_format) - && context->pixel_format != GetPixelFormat(context->hdc)) + && context->pixel_format != context->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context->hdc)) context->needs_set = 1; } } @@ -1588,10 +1588,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - context_enter(ret); - ret->gl_info = gl_info; + context_enter(ret); + if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc);

1 0

Henri Verbeet : wined3d: Get rid of getDepthStencilBits().
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: 99033b14534ffe8ff6c88c8d38a70d398c933b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99033b14534ffe8ff6c88c8d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:46 2015 +0100 wined3d: Get rid of getDepthStencilBits(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 31 ++++++++++++------------------- dlls/wined3d/directx.c | 24 ++++++++++-------------- dlls/wined3d/utils.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 22 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 543eaf3..e97206e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1244,7 +1244,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - BYTE depthBits=0, stencilBits=0; unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; unsigned int i; @@ -1253,8 +1252,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), auxBuffers, findCompatible); - getDepthStencilBits(ds_format, &depthBits, &stencilBits); - current_value = 0; for (i = 0; i < cfg_count; ++i) { @@ -1276,9 +1273,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC continue; if (cfg->alphaSize < color_format->alpha_size) continue; - if (cfg->depthSize < depthBits) + if (cfg->depthSize < ds_format->depth_size) continue; - if (stencilBits && cfg->stencilSize != stencilBits) + if (ds_format->stencil_size && cfg->stencilSize != ds_format->stencil_size) continue; /* Check multisampling support. */ if (cfg->numSamples) @@ -1287,9 +1284,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC value = 1; /* We try to locate a format which matches our requirements exactly. In case of * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if (cfg->depthSize == depthBits) + if (cfg->depthSize == ds_format->depth_size) value += 1; - if (cfg->stencilSize == stencilBits) + if (cfg->stencilSize == ds_format->stencil_size) value += 2; if (cfg->alphaSize == color_format->alpha_size) value += 4; @@ -1325,8 +1322,8 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.cAlphaBits = color_format->alpha_size; pfd.cColorBits = color_format->red_size + color_format->green_size + color_format->blue_size + color_format->alpha_size; - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; + pfd.cDepthBits = ds_format->depth_size; + pfd.cStencilBits = ds_format->stencil_size; pfd.iLayerType = PFD_MAIN_PLANE; iPixelFormat = ChoosePixelFormat(hdc, &pfd); @@ -2245,21 +2242,17 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o static BOOL match_depth_stencil_format(const struct wined3d_format *existing, const struct wined3d_format *required) { - BYTE existing_depth, existing_stencil, required_depth, required_stencil; - if (existing == required) return TRUE; if ((existing->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) != (required->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) return FALSE; - - getDepthStencilBits(existing, &existing_depth, &existing_stencil); - getDepthStencilBits(required, &required_depth, &required_stencil); - - if(existing_depth < required_depth) return FALSE; - /* If stencil bits are used the exact amount is required - otherwise wrapping - * won't work correctly */ - if(required_stencil && required_stencil != existing_stencil) return FALSE; + if (existing->depth_size < required->depth_size) + return FALSE; + /* If stencil bits are used the exact amount is required - otherwise + * wrapping won't work correctly. */ + if (required->stencil_size && required->stencil_size != existing->stencil_size) + return FALSE; return TRUE; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e30e785..e2203ea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4291,15 +4291,8 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - BYTE depthSize, stencilSize; BOOL lockable = FALSE; - if (!getDepthStencilBits(format, &depthSize, &stencilSize)) - { - ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) return FALSE; @@ -4307,15 +4300,18 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) lockable = TRUE; - /* On some modern cards like the Geforce8/9 GLX doesn't offer some dephthstencil formats which D3D9 reports. - * We can safely report 'compatible' formats (e.g. D24 can be used for D16) as long as we aren't dealing with - * a lockable format. This also helps D3D <= 7 as they expect D16 which isn't offered without this on Geforce8 cards. */ - if(!(cfg->depthSize == depthSize || (!lockable && cfg->depthSize > depthSize))) + /* On some modern cards like the Geforce8/9, GLX doesn't offer some + * dephth/stencil formats which D3D9 reports. We can safely report + * "compatible" formats (e.g. D24 can be used for D16) as long as we + * aren't dealing with a lockable format. This also helps D3D <= 7 as they + * expect D16 which isn't offered without this on Geforce8 cards. */ + if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) return FALSE; - /* Some cards like Intel i915 ones only offer D24S8 but lots of games also need a format without stencil, so - * allow more stencil bits than requested. */ - if(cfg->stencilSize < stencilSize) + /* Some cards like Intel i915 ones only offer D24S8 but lots of games also + * need a format without stencil, so allow more stencil bits than + * requested. */ + if (cfg->stencilSize < format->stencil_size) return FALSE; return TRUE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 40ba09c..4ddfead 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4016,37 +4016,6 @@ unsigned int count_bits(unsigned int mask) return count; } -/* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ -BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) -{ - TRACE("format %s.\n", debug_d3dformat(format->id)); - - switch (format->id) - { - case WINED3DFMT_D16_LOCKABLE: - case WINED3DFMT_D16_UNORM: - case WINED3DFMT_S1_UINT_D15_UNORM: - case WINED3DFMT_X8D24_UNORM: - case WINED3DFMT_S4X4_UINT_D24_UNORM: - case WINED3DFMT_D24_UNORM_S8_UINT: - case WINED3DFMT_S8_UINT_D24_FLOAT: - case WINED3DFMT_D32_UNORM: - case WINED3DFMT_D32_FLOAT: - case WINED3DFMT_INTZ: - break; - default: - FIXME("Unsupported depth/stencil format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - *depthSize = format->depth_size; - *stencilSize = format->stencil_size; - - TRACE("Returning depthSize: %d and stencilSize: %d for format %s.\n", - *depthSize, *stencilSize, debug_d3dformat(format->id)); - return TRUE; -} - /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fb261a..ac0b09a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,8 +2903,6 @@ void state_pointsprite_w(struct wined3d_context *context, void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -BOOL getDepthStencilBits(const struct wined3d_format *format, - BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; /* Math utils */

1 0

Alexandre Julliard : configure: Use the correct help string macro.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: ef2d8ee221ee66deaca59758880ab0ffb2426f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2d8ee221ee66deaca597588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 4 00:26:57 2015 +0900 configure: Use the correct help string macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0814400..296a15f 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Ca AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) -AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) +AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))

1 0

Nikolay Sivov : dwrite: Apply run reading direction to advances and offsets on analysis creation.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: b6f1e74ced7aa0d9de9e71ec30e08e1c4408ca70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f1e74ced7aa0d9de9e71ec3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 3 20:32:22 2015 +0300 dwrite: Apply run reading direction to advances and offsets on analysis creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 74 ++++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2c52840..9244978 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4097,31 +4097,16 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a freetype_get_glyph_bbox(&glyph_bitmap); if (is_rtl) - OffsetRect(bbox, origin.x - advance->x, origin.y - advance->y); + OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else OffsetRect(bbox, origin.x, origin.y); - if (advanceoffset) { - FLOAT offset_x = advanceoffset->x + ascenderoffset->x; - FLOAT offset_y = advanceoffset->y + ascenderoffset->y; - - if (is_rtl) { - offset_x *= -1.0f; - offset_y *= -1.0f; - } - - OffsetRect(bbox, offset_x, offset_y); - } + if (advanceoffset) + OffsetRect(bbox, advanceoffset->x + ascenderoffset->x, advanceoffset->y + ascenderoffset->y); UnionRect(&analysis->bounds, &analysis->bounds, bbox); - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; } IDWriteFontFace2_Release(fontface2); @@ -4218,14 +4203,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW freetype_get_glyph_bbox(&glyph_bitmap); if (IsRectEmpty(bbox)) { - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; continue; } @@ -4241,21 +4220,12 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW is_1bpp = freetype_get_glyph_bitmap(&glyph_bitmap); if (is_rtl) - OffsetRect(bbox, origin.x - advance->x, origin.y - advance->y); + OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else OffsetRect(bbox, origin.x, origin.y); - if (advanceoffset) { - FLOAT offset_x = advanceoffset->x + ascenderoffset->x; - FLOAT offset_y = advanceoffset->y + ascenderoffset->y; - - if (is_rtl) { - offset_x *= -1.0f; - offset_y *= -1.0f; - } - - OffsetRect(bbox, offset_x, offset_y); - } + if (advanceoffset) + OffsetRect(bbox, advanceoffset->x + ascenderoffset->x, advanceoffset->y + ascenderoffset->y); OffsetRect(bbox, analysis->origin.x, analysis->origin.y); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) @@ -4297,14 +4267,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW heap_free(glyph_bitmap.buf); - if (is_rtl) { - origin.x -= advance->x; - origin.y -= advance->y; - } - else { - origin.x += advance->x; - origin.y += advance->y; - } + origin.x += advance->x; + origin.y += advance->y; } IDWriteFontFace2_Release(fontface2); @@ -4460,6 +4424,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; + FLOAT rtl_factor; UINT32 i; *ret = NULL; @@ -4521,6 +4486,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA analysis->run.glyphAdvances = NULL; analysis->run.glyphOffsets = NULL; + rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) transform_2d_vec(&analysis->origin, &analysis->m); @@ -4528,7 +4495,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (run->glyphAdvances) { for (i = 0; i < run->glyphCount; i++) { - init_2d_vec(analysis->advances + i, run->glyphAdvances[i] * ppdip, run->isSideways); + init_2d_vec(analysis->advances + i, rtl_factor * run->glyphAdvances[i] * ppdip, run->isSideways); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) transform_2d_vec(analysis->advances + i, &analysis->m); } @@ -4550,7 +4517,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; - init_2d_vec(analysis->advances + i, get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip, + init_2d_vec(analysis->advances + i, rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip, run->isSideways); break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: @@ -4560,7 +4527,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (FAILED(hr)) init_2d_vec(analysis->advances + i, 0.0f, FALSE); else - init_2d_vec(analysis->advances + i, floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f), + init_2d_vec(analysis->advances + i, rtl_factor * floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f), run->isSideways); break; default: @@ -4576,8 +4543,9 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (run->glyphOffsets) { for (i = 0; i < run->glyphCount; i++) { - init_2d_vec(analysis->advanceoffsets + i, run->glyphOffsets[i].advanceOffset * ppdip, run->isSideways); - init_2d_vec(analysis->ascenderoffsets + i, run->glyphOffsets[i].ascenderOffset * ppdip, !run->isSideways); + init_2d_vec(analysis->advanceoffsets + i, rtl_factor * run->glyphOffsets[i].advanceOffset * ppdip, run->isSideways); + /* Positive ascender offset moves glyph up. Keep it orthogonal to advance direction. */ + init_2d_vec(analysis->ascenderoffsets + i, -run->glyphOffsets[i].ascenderOffset * ppdip, !run->isSideways); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) { transform_2d_vec(analysis->advanceoffsets + i, &analysis->m); transform_2d_vec(analysis->ascenderoffsets + i, &analysis->m);

1 0

Mark Harmstone : winepulse: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop.
by Alexandre Julliard Nov. 4, 2015

Nov. 4, 2015

Module: wine Branch: master Commit: b56682cc49b3a6f4db03414d440dcd533b65d39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56682cc49b3a6f4db03414d4… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:22:28 2015 -0600 winepulse: Return PKEY_AudioEndpoint_PhysicalSpeakers device prop. Edited by Maarten Lankhorst: No support for multiple devices in winepulse yet. Synchronous static data initialization by Andrew Eikum <aeikum(a)codeweavers.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 84 +++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 64e6c2a..9aa1537 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -79,6 +79,8 @@ static pthread_mutex_t pulse_lock; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; static struct list g_sessions = LIST_INIT(g_sessions); +static UINT g_phys_speakers_mask = 0; + /* Mixer format + period times */ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; @@ -330,13 +332,44 @@ static const enum pa_channel_position pulse_pos_from_wfx[] = { PA_CHANNEL_POSITION_TOP_REAR_RIGHT }; +static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) { + int i; + DWORD mask = 0; + + for (i = 0; i < map->channels; ++i) + switch (map->map[i]) { + default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map->map[i])); break; + case PA_CHANNEL_POSITION_FRONT_LEFT: mask |= SPEAKER_FRONT_LEFT; break; + case PA_CHANNEL_POSITION_MONO: + case PA_CHANNEL_POSITION_FRONT_CENTER: mask |= SPEAKER_FRONT_CENTER; break; + case PA_CHANNEL_POSITION_FRONT_RIGHT: mask |= SPEAKER_FRONT_RIGHT; break; + case PA_CHANNEL_POSITION_REAR_LEFT: mask |= SPEAKER_BACK_LEFT; break; + case PA_CHANNEL_POSITION_REAR_CENTER: mask |= SPEAKER_BACK_CENTER; break; + case PA_CHANNEL_POSITION_REAR_RIGHT: mask |= SPEAKER_BACK_RIGHT; break; + case PA_CHANNEL_POSITION_LFE: mask |= SPEAKER_LOW_FREQUENCY; break; + case PA_CHANNEL_POSITION_SIDE_LEFT: mask |= SPEAKER_SIDE_LEFT; break; + case PA_CHANNEL_POSITION_SIDE_RIGHT: mask |= SPEAKER_SIDE_RIGHT; break; + case PA_CHANNEL_POSITION_TOP_CENTER: mask |= SPEAKER_TOP_CENTER; break; + case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case PA_CHANNEL_POSITION_TOP_REAR_LEFT: mask |= SPEAKER_TOP_BACK_LEFT; break; + case PA_CHANNEL_POSITION_TOP_REAR_CENTER: mask |= SPEAKER_TOP_BACK_CENTER; break; + case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + + return mask; +} + static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { WAVEFORMATEX *wfx = &fmt->Format; pa_stream *stream; pa_channel_map map; pa_sample_spec ss; pa_buffer_attr attr; - int ret, i; + int ret; unsigned int length = 0; pa_channel_map_init_auto(&map, 2, PA_CHANNEL_MAP_ALSA); @@ -401,28 +434,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { else fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - fmt->dwChannelMask = 0; - for (i = 0; i < map.channels; ++i) - switch (map.map[i]) { - default: FIXME("Unhandled channel %s\n", pa_channel_position_to_string(map.map[i])); break; - case PA_CHANNEL_POSITION_FRONT_LEFT: fmt->dwChannelMask |= SPEAKER_FRONT_LEFT; break; - case PA_CHANNEL_POSITION_MONO: - case PA_CHANNEL_POSITION_FRONT_CENTER: fmt->dwChannelMask |= SPEAKER_FRONT_CENTER; break; - case PA_CHANNEL_POSITION_FRONT_RIGHT: fmt->dwChannelMask |= SPEAKER_FRONT_RIGHT; break; - case PA_CHANNEL_POSITION_REAR_LEFT: fmt->dwChannelMask |= SPEAKER_BACK_LEFT; break; - case PA_CHANNEL_POSITION_REAR_CENTER: fmt->dwChannelMask |= SPEAKER_BACK_CENTER; break; - case PA_CHANNEL_POSITION_REAR_RIGHT: fmt->dwChannelMask |= SPEAKER_BACK_RIGHT; break; - case PA_CHANNEL_POSITION_LFE: fmt->dwChannelMask |= SPEAKER_LOW_FREQUENCY; break; - case PA_CHANNEL_POSITION_SIDE_LEFT: fmt->dwChannelMask |= SPEAKER_SIDE_LEFT; break; - case PA_CHANNEL_POSITION_SIDE_RIGHT: fmt->dwChannelMask |= SPEAKER_SIDE_RIGHT; break; - case PA_CHANNEL_POSITION_TOP_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_CENTER; break; - case PA_CHANNEL_POSITION_TOP_FRONT_LEFT: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_LEFT; break; - case PA_CHANNEL_POSITION_TOP_FRONT_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_CENTER; break; - case PA_CHANNEL_POSITION_TOP_FRONT_RIGHT: fmt->dwChannelMask |= SPEAKER_TOP_FRONT_RIGHT; break; - case PA_CHANNEL_POSITION_TOP_REAR_LEFT: fmt->dwChannelMask |= SPEAKER_TOP_BACK_LEFT; break; - case PA_CHANNEL_POSITION_TOP_REAR_CENTER: fmt->dwChannelMask |= SPEAKER_TOP_BACK_CENTER; break; - case PA_CHANNEL_POSITION_TOP_REAR_RIGHT: fmt->dwChannelMask |= SPEAKER_TOP_BACK_RIGHT; break; - } + fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map); } static HRESULT pulse_connect(void) @@ -492,6 +504,14 @@ fail: return E_FAIL; } +/* For default Pulseaudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) +{ + if (i) + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); +} + /* some poorly-behaved applications call audio functions during DllMain, so we * have to do as much as possible without creating a new thread. this function * sets up a synchronous connection to verify the server is running and query @@ -501,6 +521,7 @@ static HRESULT pulse_test_connect(void) int len, ret; WCHAR path[PATH_MAX], *name; char *str; + pa_operation *o; pulse_ml = pa_mainloop_new(); @@ -549,6 +570,15 @@ static HRESULT pulse_test_connect(void) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + g_phys_speakers_mask = 0; + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -3203,5 +3233,13 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + + if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { + out->vt = VT_UI4; + out->u.ulVal = g_phys_speakers_mask; + + return out->u.ulVal ? S_OK : E_FAIL; + } + return E_NOTIMPL; }

1 0