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

Andrew Eikum : xaudio2: Implement IXAudio2::GetDeviceDetails.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: cc22fdaf4e790c578b8b9135866153590047e82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc22fdaf4e790c578b8b91358… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 11:22:13 2015 -0500 xaudio2: Implement IXAudio2::GetDeviceDetails. --- configure | 1 + configure.ac | 1 + dlls/xaudio2_7/tests/Makefile.in | 5 + dlls/xaudio2_7/tests/xaudio2.c | 93 ++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 197 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 289 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc22fdaf4e790c578b8b9…

1 0

Sebastian Lackner : server: Properly inherit debug_children flag when creating new process.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: c948e84189f33b9ea684b6e4eaa4e53358b352d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c948e84189f33b9ea684b6e4e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 24 10:18:49 2015 +0200 server: Properly inherit debug_children flag when creating new process. --- server/process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index d4c8adf..e00b429 100644 --- a/server/process.c +++ b/server/process.c @@ -1181,8 +1181,6 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->debug_children = (req->create_flags & DEBUG_PROCESS) - && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); if (parent->job @@ -1223,9 +1221,15 @@ DECL_HANDLER(new_process) /* attach to the debugger if requested */ if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) + { set_process_debugger( process, current ); + process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); + } else if (parent->debugger && parent->debug_children) + { set_process_debugger( process, parent->debugger ); + process->debug_children = 1; + } if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) process->group_id = parent->group_id;

1 0

Józef Kucia : d3d10core/tests: Add test for device feature level.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 66b2d96a69f5c0e74980d7d66a1f36ca4ed160ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b2d96a69f5c0e74980d7d66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:25 2015 +0200 d3d10core/tests: Add test for device feature level. --- dlls/d3d10core/tests/device.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bdceb9b..47719e4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d10.h" +#include "d3d11.h" #include "wine/test.h" #include <limits.h> @@ -171,6 +172,37 @@ static IDXGISwapChain *create_swapchain(ID3D10Device *device, HWND window, BOOL return swapchain; } +static void test_feature_level(void) +{ + D3D_FEATURE_LEVEL feature_level; + ID3D11Device *device11; + ID3D10Device *device10; + HRESULT hr; + + if (!(device10 = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_QueryInterface(device10, &IID_ID3D11Device, (void **)&device11); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Failed to query ID3D11Device interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("D3D11 is not available.\n"); + ID3D10Device_Release(device10); + return; + } + + /* Device was created by D3D10CreateDevice. */ + feature_level = ID3D11Device_GetFeatureLevel(device11); + ok(feature_level == D3D_FEATURE_LEVEL_10_0, "Got unexpected feature level %#x.\n", feature_level); + + ID3D11Device_Release(device11); + ID3D10Device_Release(device10); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -3432,6 +3464,7 @@ static void test_update_subresource(void) START_TEST(device) { + test_feature_level(); test_create_texture2d(); test_create_texture3d(); test_create_depthstencil_view();

1 0

Józef Kucia : d3d11: Allow to pass NULL as device to D3D11CreateDevice.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 4cf1bb929fad3b898050ae8d305e5c8a8948ca2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf1bb929fad3b898050ae8d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:26 2015 +0200 d3d11: Allow to pass NULL as device to D3D11CreateDevice. --- dlls/d3d11/d3d11_main.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 00634c4..e3d09a1 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -145,16 +145,17 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte } HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { IDXGIFactory *factory; + ID3D11Device *device; HRESULT hr; TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " "device %p, obtained_feature_level %p, immediate_context %p.\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, - device, obtained_feature_level, immediate_context); + device_out, obtained_feature_level, immediate_context); if (adapter) { @@ -237,7 +238,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t } } - hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, device); + hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) @@ -246,15 +247,20 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return hr; } - TRACE("Created ID3D11Device %p.\n", *device); + TRACE("Created ID3D11Device %p.\n", device); if (obtained_feature_level) - *obtained_feature_level = ID3D11Device_GetFeatureLevel(*device); + *obtained_feature_level = ID3D11Device_GetFeatureLevel(device); if (immediate_context) - ID3D11Device_GetImmediateContext(*device, immediate_context); + ID3D11Device_GetImmediateContext(device, immediate_context); - return hr; + if (device_out) + *device_out = device; + else + ID3D11Device_Release(device); + + return S_OK; } HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,

1 0

Stefan Dösinger : ddraw: Return the right error if range color keys are used.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 40c5303b62cfeb74860131a156b4e34c17f4d4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c5303b62cfeb74860131a15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 23 21:59:35 2015 +0200 ddraw: Return the right error if range color keys are used. --- dlls/ddraw/surface.c | 30 ++++++++++-- dlls/ddraw/tests/ddraw1.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/cs.c | 4 +- dlls/wined3d/texture.c | 10 +--- include/wine/wined3d.h | 1 - 8 files changed, 497 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40c5303b62cfeb7486013…

1 0

Józef Kucia : d3d11/tests: Add test for device interfaces.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 9af58dc110e9f955209f422503ed249c08c81496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af58dc110e9f955209f42250… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 24 01:04:24 2015 +0200 d3d11/tests: Add test for device interfaces. --- configure | 1 + configure.ac | 1 + dlls/d3d11/tests/Makefile.in | 5 +++ dlls/d3d11/tests/d3d11.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/configure b/configure index b12b7e3..005533d 100755 --- a/configure +++ b/configure @@ -17236,6 +17236,7 @@ wine_fn_config_dll d3d10_1 enable_d3d10_1 implib wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib +wine_fn_config_test dlls/d3d11/tests d3d11_test wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 0276a1c..004e79d 100644 --- a/configure.ac +++ b/configure.ac @@ -2837,6 +2837,7 @@ WINE_CONFIG_DLL(d3d10_1,,[implib]) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) +WINE_CONFIG_TEST(dlls/d3d11/tests) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d11/tests/Makefile.in b/dlls/d3d11/tests/Makefile.in new file mode 100644 index 0000000..d977d31 --- /dev/null +++ b/dlls/d3d11/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d11.dll +IMPORTS = d3d11 + +C_SRCS = \ + d3d11.c diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c new file mode 100644 index 0000000..0595ead --- /dev/null +++ b/dlls/d3d11/tests/d3d11.c @@ -0,0 +1,100 @@ +/* + * Copyright 2015 Józef Kucia 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 + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3d11.h" +#include "wine/test.h" + +static ID3D11Device *create_device(D3D_FEATURE_LEVEL feature_level) +{ + ID3D11Device *device; + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, + &device, NULL, NULL))) + return device; + + return NULL; +} + +static void test_device_interfaces(void) +{ + static const D3D_FEATURE_LEVEL feature_levels[] = + { + D3D_FEATURE_LEVEL_11_1, + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1 + }; + ID3D11Device *device; + IUnknown *iface; + ULONG refcount; + unsigned int i; + HRESULT hr; + + for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); i++) + { + if (!(device = create_device(feature_levels[i]))) + { + skip("Failed to create device for feature level %#x, skipping tests.\n", feature_levels[i]); + continue; + } + + hr = ID3D11Device_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); + todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); + todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device1 interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + +START_TEST(d3d11) +{ + test_device_interfaces(); +}

1 0

Stefan Dösinger : wined3d: Add a slop for color keying.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 1a965811f661b841f877df5706f5a2dc7771a89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a965811f661b841f877df570… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 23 21:59:33 2015 +0200 wined3d: Add a slop for color keying. --- dlls/wined3d/arb_program_shader.c | 62 +++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 14 +++++---- dlls/wined3d/utils.c | 66 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 113 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a965811f661b841f877d…

1 0

Nikolay Sivov : dwrite: Return advances using freetype cache system.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: b9f05239d2b7b77ebad309f50fea2b0aa78ff144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f05239d2b7b77ebad309f50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 24 10:43:19 2015 +0300 dwrite: Return advances using freetype cache system. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 41 ++++++++++++++++++----------------------- dlls/dwrite/freetype.c | 28 ++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 8 ++------ 4 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 42395ee..d1127f1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -204,6 +204,7 @@ extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT1 extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bitmap(IDWriteFontFace2*,FLOAT,UINT16,const RECT*,BYTE*) DECLSPEC_HIDDEN; extern INT freetype_get_charmap_index(IDWriteFontFace2*,BOOL*) DECLSPEC_HIDDEN; +extern INT32 freetype_get_glyph_advance(IDWriteFontFace2*,FLOAT,UINT16,DWRITE_MEASURING_MODE) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f86a908..0d5cbc0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -751,7 +751,8 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac DWRITE_GLYPH_METRICS *metrics, BOOL is_sideways) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FLOAT scale; + DWRITE_MEASURING_MODE mode; + FLOAT scale, size; HRESULT hr; UINT32 i; @@ -761,7 +762,9 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform is not supported, %s\n", debugstr_matrix(m)); - scale = emSize * ppdip / This->metrics.designUnitsPerEm; + size = emSize * ppdip; + scale = size / This->metrics.designUnitsPerEm; + mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; for (i = 0; i < glyph_count; i++) { DWRITE_GLYPH_METRICS *ret = metrics + i; @@ -771,9 +774,11 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac if (FAILED(hr)) return hr; + ret->advanceWidth = freetype_get_glyph_advance(iface, size, glyphs[i], mode); + ret->advanceWidth = round_metric(ret->advanceWidth * This->metrics.designUnitsPerEm / size); + #define SCALE_METRIC(x) ret->x = round_metric(round_metric((design.x) * scale) / scale) SCALE_METRIC(leftSideBearing); - SCALE_METRIC(advanceWidth); SCALE_METRIC(rightSideBearing); SCALE_METRIC(topSideBearing); SCALE_METRIC(advanceHeight); @@ -884,16 +889,11 @@ static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *i TRACE("(%p)->(%u %p %p %d)\n", This, glyph_count, glyphs, advances, is_sideways); - for (i = 0; i < glyph_count; i++) { - DWRITE_GLYPH_METRICS metrics = { 0 }; - HRESULT hr; - - hr = IDWriteFontFace2_GetDesignGlyphMetrics(iface, glyphs + i, 1, &metrics, is_sideways); - if (FAILED(hr)) - return hr; + if (is_sideways) + FIXME("sideways mode not supported\n"); - advances[i] = is_sideways ? metrics.advanceHeight : metrics.advanceWidth; - } + for (i = 0; i < glyph_count; i++) + advances[i] = freetype_get_glyph_advance(iface, This->metrics.designUnitsPerEm, glyphs[i], DWRITE_MEASURING_MODE_NATURAL); return S_OK; } @@ -903,8 +903,7 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF BOOL is_sideways, UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FLOAT scale; - HRESULT hr; + DWRITE_MEASURING_MODE mode; UINT32 i; TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, @@ -915,8 +914,8 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF return E_INVALIDARG; } - scale = em_size * ppdip / This->metrics.designUnitsPerEm; - if (scale == 0.0) { + em_size *= ppdip; + if (em_size == 0.0) { memset(advances, 0, sizeof(*advances) * glyph_count); return S_OK; } @@ -924,14 +923,10 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; for (i = 0; i < glyph_count; i++) { - hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); - if (FAILED(hr)) - return hr; - -#define SCALE_METRIC(x) x = round_metric(round_metric((x) * scale) / scale) - SCALE_METRIC(advances[i]); -#undef SCALE_METRIC + advances[i] = freetype_get_glyph_advance(iface, em_size, glyphs[i], mode); + advances[i] = round_metric(advances[i] * This->metrics.designUnitsPerEm / em_size); } return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3290243..ec6a13f 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -599,6 +599,29 @@ INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) return charmap_index; } +INT32 freetype_get_glyph_advance(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, DWRITE_MEASURING_MODE mode) +{ + FTC_ImageTypeRec imagetype; + FT_Glyph glyph; + INT32 advance; + + imagetype.face_id = fontface; + imagetype.width = 0; + imagetype.height = emSize; + imagetype.flags = FT_LOAD_DEFAULT; + if (mode == DWRITE_MEASURING_MODE_NATURAL) + imagetype.flags |= FT_LOAD_NO_HINTING; + + EnterCriticalSection(&freetype_cs); + if (pFTC_ImageCache_Lookup(image_cache, &imagetype, index, &glyph, NULL) == 0) + advance = glyph->advance.x >> 16; + else + advance = 0; + LeaveCriticalSection(&freetype_cs); + + return advance; +} + #else /* HAVE_FREETYPE */ BOOL init_freetype(void) @@ -667,4 +690,9 @@ INT freetype_get_charmap_index(IDWriteFontFace2 *fontface, BOOL *is_symbol) return -1; } +INT32 freetype_get_glyph_advance(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 index, DWRITE_MEASURING_MODE mode) +{ + return 0; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9ba0d18..7617dbb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3094,6 +3094,7 @@ static void test_GetDesignGlyphAdvances(void) advance = 0; hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, &index, &advance, TRUE); ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(advance == 2048, "got %i\n", advance); IDWriteFontFace1_Release(fontface1); @@ -4215,12 +4216,7 @@ static void test_GetGdiCompatibleGlyphAdvances(void) /* advance is in design units */ advance = (int)floorf(emsize * advance / fm.designUnitsPerEm + 0.5f); - - /* allow 1 pixel difference for large sizes, for Tahoma this happens for 16 sizes in [1, 2048] range */ - if (emsize > 150.0) - ok((advance - gdi_advance) <= 1, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); - else - ok(gdi_advance == advance, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + ok((advance - gdi_advance) <= 2, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); } DeleteObject(hdc);

1 0

Michael Müller : ntdll: Use helper function for NtWaitForMultipleObjects and NtWaitForSingleObject.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 75c9da68e2b9500ba12cd19d50d29bb989768de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c9da68e2b9500ba12cd19d5… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Aug 24 08:17:54 2015 +0200 ntdll: Use helper function for NtWaitForMultipleObjects and NtWaitForSingleObject. --- dlls/ntdll/sync.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b0329ab..6892732 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -990,12 +990,9 @@ NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, /* wait operations */ -/****************************************************************** - * NtWaitForMultipleObjects (NTDLL.@) - */ -NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, - BOOLEAN wait_any, BOOLEAN alertable, - const LARGE_INTEGER *timeout ) +static NTSTATUS wait_objects( DWORD count, const HANDLE *handles, + BOOLEAN wait_any, BOOLEAN alertable, + const LARGE_INTEGER *timeout ) { select_op_t select_op; UINT i, flags = SELECT_INTERRUPTIBLE; @@ -1010,11 +1007,22 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, /****************************************************************** + * NtWaitForMultipleObjects (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, + BOOLEAN wait_any, BOOLEAN alertable, + const LARGE_INTEGER *timeout ) +{ + return wait_objects( count, handles, wait_any, alertable, timeout ); +} + + +/****************************************************************** * NtWaitForSingleObject (NTDLL.@) */ NTSTATUS WINAPI NtWaitForSingleObject(HANDLE handle, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { - return NtWaitForMultipleObjects( 1, &handle, FALSE, alertable, timeout ); + return wait_objects( 1, &handle, FALSE, alertable, timeout ); }

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice::SetOutputVoices.
by Alexandre Julliard Aug. 24, 2015

Aug. 24, 2015

Module: wine Branch: master Commit: 8bf4f9068c0675facafa31ebd41c722e2ebce2dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf4f9068c0675facafa31ebd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 11:22:20 2015 -0500 xaudio2: Implement IXAudio2SourceVoice::SetOutputVoices. --- dlls/xaudio2_7/xaudio_dll.c | 52 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 39a5a79..6bb48e6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -108,10 +108,14 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(instance); } +typedef struct _IXAudio2Impl IXAudio2Impl; + typedef struct _XA2SourceImpl { IXAudio27SourceVoice IXAudio27SourceVoice_iface; IXAudio2SourceVoice IXAudio2SourceVoice_iface; + IXAudio2Impl *xa2; + BOOL in_use; CRITICAL_SECTION lock; @@ -120,6 +124,9 @@ typedef struct _XA2SourceImpl { IXAudio2VoiceCallback *cb; + DWORD nsends; + XAUDIO2_SEND_DESCRIPTOR *sends; + struct list entry; } XA2SourceImpl; @@ -148,7 +155,7 @@ XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio2SubmixVoice_iface); } -typedef struct { +struct _IXAudio2Impl { IXAudio27 IXAudio27_iface; IXAudio2 IXAudio2_iface; IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; @@ -166,7 +173,7 @@ typedef struct { WCHAR **devids; UINT32 ndevs; -} IXAudio2Impl; +}; static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { @@ -194,7 +201,38 @@ static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + int i; + XAUDIO2_VOICE_SENDS def_send; + XAUDIO2_SEND_DESCRIPTOR def_desc; + TRACE("%p, %p\n", This, pSendList); + + if(!pSendList){ + def_desc.Flags = 0; + def_desc.pOutputVoice = (IXAudio2Voice*)&This->xa2->IXAudio2MasteringVoice_iface; + + def_send.SendCount = 1; + def_send.pSends = &def_desc; + + pSendList = &def_send; + } + + if(TRACE_ON(xaudio2)){ + for(i = 0; i < pSendList->SendCount; ++i){ + XAUDIO2_SEND_DESCRIPTOR *desc = &pSendList->pSends[i]; + TRACE("Outputting to: 0x%x, %p\n", desc->Flags, desc->pOutputVoice); + } + } + + if(This->nsends < pSendList->SendCount){ + HeapFree(GetProcessHeap(), 0, This->sends); + This->sends = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sends) * pSendList->SendCount); + This->nsends = pSendList->SendCount; + }else + memset(This->sends, 0, sizeof(*This->sends) * This->nsends); + + memcpy(This->sends, pSendList->pSends, sizeof(*This->sends) * pSendList->SendCount); + return S_OK; } @@ -1114,6 +1152,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) XA2SubmixImpl *sub, *sub2; LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ + HeapFree(GetProcessHeap(), 0, src->sends); IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); DeleteCriticalSection(&src->lock); HeapFree(GetProcessHeap(), 0, src); @@ -1180,6 +1219,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); XA2SourceImpl *src; + HRESULT hr; TRACE("(%p)->(%p, %p, 0x%x, %f, %p, %p, %p)\n", This, ppSourceVoice, pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, @@ -1208,6 +1248,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, InitializeCriticalSection(&src->lock); src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); + + src->xa2 = This; } src->in_use = TRUE; @@ -1218,6 +1260,12 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->fmt = copy_waveformat(pSourceFormat); + hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); + if(FAILED(hr)){ + src->in_use = FALSE; + return hr; + } + if(This->version == 27) *ppSourceVoice = (IXAudio2SourceVoice*)&src->IXAudio27SourceVoice_iface; else

1 0