October 2015 - Wine-commits

Józef Kucia : d3d11/tests: Port test_create_predicate () from d3d10core.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 63b120234ec9a03a8e084596a66120271d059f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b120234ec9a03a8e084596a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:33 2015 +0100 d3d11/tests: Port test_create_predicate() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7adea47..22bf187 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2176,6 +2176,77 @@ static void test_create_rasterizer_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_predicate(void) +{ + static const D3D11_QUERY other_queries[] = + { + D3D11_QUERY_EVENT, + D3D11_QUERY_OCCLUSION, + D3D11_QUERY_TIMESTAMP, + D3D11_QUERY_TIMESTAMP_DISJOINT, + D3D11_QUERY_PIPELINE_STATISTICS, + D3D11_QUERY_SO_STATISTICS, + D3D11_QUERY_SO_STATISTICS_STREAM0, + D3D11_QUERY_SO_STATISTICS_STREAM1, + D3D11_QUERY_SO_STATISTICS_STREAM2, + D3D11_QUERY_SO_STATISTICS_STREAM3, + }; + + ULONG refcount, expected_refcount; + D3D11_QUERY_DESC query_desc; + ID3D11Predicate *predicate; + ID3D11Device *device, *tmp; + IUnknown *iface; + unsigned int i; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_CreatePredicate(device, NULL, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + query_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i) + { + query_desc.Query = other_queries[i]; + hr = ID3D11Device_CreatePredicate(device, &query_desc, &predicate); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x for query type %u.\n", hr, other_queries[i]); + } + + query_desc.Query = D3D11_QUERY_OCCLUSION_PREDICATE; + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreatePredicate(device, &query_desc, &predicate); + ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11Predicate_GetDevice(predicate, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + hr = ID3D11Predicate_QueryInterface(predicate, &IID_ID3D10Predicate, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Predicate should implement ID3D10Predicate.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D11Predicate_Release(predicate); + + query_desc.Query = D3D11_QUERY_SO_OVERFLOW_PREDICATE; + hr = ID3D11Device_CreatePredicate(device, &query_desc, &predicate); + todo_wine ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11Predicate_Release(predicate); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_device_removed_reason(void) { ID3D11Device *device; @@ -2391,6 +2462,7 @@ START_TEST(d3d11) test_create_blend_state(); test_create_depthstencil_state(); test_create_rasterizer_state(); + test_create_predicate(); test_device_removed_reason(); test_private_data(); }

1 0

Józef Kucia : include: Add D3D11_QUERY_MISC_FLAG declaration.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: dd2c14462e341f3488d06fa69e1e6a4bd3dd7d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2c14462e341f3488d06fa69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:34 2015 +0100 include: Add D3D11_QUERY_MISC_FLAG declaration. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 991070e..cf8d93d 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -528,6 +528,11 @@ typedef enum D3D11_QUERY D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3, } D3D11_QUERY; +typedef enum D3D11_QUERY_MISC_FLAG +{ + D3D11_QUERY_MISC_PREDICATEHINT = 0x1, +} D3D11_QUERY_MISC_FLAG; + typedef enum D3D11_ASYNC_GETDATA_FLAG { D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x0001,

1 0

Andrew Eikum : xaudio2_8: Add 3D audio function stubs.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: f9860002f45e159f704af3dd41b6b24e1879c796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9860002f45e159f704af3dd4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 14:20:43 2015 -0500 xaudio2_8: Add 3D audio function stubs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- dlls/x3daudio1_0/x3daudio1_0.spec | 4 ++-- dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- dlls/x3daudio1_2/x3daudio1_2.spec | 4 ++-- dlls/x3daudio1_3/x3daudio1_3.spec | 4 ++-- dlls/x3daudio1_4/x3daudio1_4.spec | 4 ++-- dlls/x3daudio1_5/x3daudio1_5.spec | 4 ++-- dlls/x3daudio1_6/Makefile.in | 1 - dlls/x3daudio1_6/main.c | 7 ------- dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- dlls/x3daudio1_7/Makefile.in | 2 +- dlls/x3daudio1_7/main.c | 26 +++----------------------- dlls/x3daudio1_7/x3daudio1_7.spec | 4 ++-- dlls/xaudio2_8/Makefile.in | 1 + dlls/xaudio2_8/xaudio2_8.spec | 2 ++ dlls/xaudio2_8/xaudio_dll.c | 28 ++++++++++++++++++++++++++++ 17 files changed, 55 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9860002f45e159f704af…

1 0

Ken Thomases : winemac: Reorganize copy_display_modes() to clarify that the user's default mode is always included.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 02c6676864b0af2f0d6c999aec66c9bcba9b0a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c6676864b0af2f0d6c999ae… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 23:39:05 2015 -0500 winemac: Reorganize copy_display_modes() to clarify that the user's default mode is always included. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 95 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 10ecf67..d561e68 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -312,63 +312,64 @@ static CFArrayRef copy_display_modes(CGDirectDisplayID display) BOOL better = TRUE; CGDisplayModeRef new_mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); uint32_t new_flags = CGDisplayModeGetIOFlags(new_mode); - CFStringRef pixel_encoding; - size_t width_points; - size_t height_points; - CFDictionaryRef key; - CGDisplayModeRef old_mode; + CFDictionaryRef key = create_mode_dict(new_mode); - if (!(new_flags & kDisplayModeDefaultFlag) && (pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode))) + /* If a given mode is the user's default, then always list it in preference to any similar + modes that may exist. */ + if (new_flags & kDisplayModeDefaultFlag) + better = TRUE; + else { - BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); - CFRelease(pixel_encoding); - if (bpp30) + CFStringRef pixel_encoding = CGDisplayModeCopyPixelEncoding(new_mode); + CGDisplayModeRef old_mode; + + if (pixel_encoding) { - /* This is an odd pixel encoding. It seems it's only returned - when using kCGDisplayShowDuplicateLowResolutionModes. It's - 32bpp in terms of the actual raster layout, but it's 10 - bits per component. I think that no Windows program is - likely to need it and they will probably be confused by it. - Skip it. */ - continue; + BOOL bpp30 = CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels)); + CFRelease(pixel_encoding); + if (bpp30) + { + /* This is an odd pixel encoding. It seems it's only returned + when using kCGDisplayShowDuplicateLowResolutionModes. It's + 32bpp in terms of the actual raster layout, but it's 10 + bits per component. I think that no Windows program is + likely to need it and they will probably be confused by it. + Skip it. */ + CFRelease(key); + continue; + } } - } - - width_points = CGDisplayModeGetWidth(new_mode); - height_points = CGDisplayModeGetHeight(new_mode); - key = create_mode_dict(new_mode); - old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); - if (old_mode) - { - uint32_t old_flags = CGDisplayModeGetIOFlags(old_mode); - - /* If a given mode is the user's default, then always list it in preference to any similar - modes that may exist. */ - if ((new_flags & kDisplayModeDefaultFlag) && !(old_flags & kDisplayModeDefaultFlag)) - better = TRUE; - else if (!(new_flags & kDisplayModeDefaultFlag) && (old_flags & kDisplayModeDefaultFlag)) - better = FALSE; - else + old_mode = (CGDisplayModeRef)CFDictionaryGetValue(modes_by_size, key); + if (old_mode) { - /* Otherwise, prefer a mode whose pixel size equals its point size over one which - is scaled. */ - size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); - size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); - size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); - size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); - BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); - BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); - - if (new_size_same && !old_size_same) - better = TRUE; - else if (!new_size_same && old_size_same) + uint32_t old_flags = CGDisplayModeGetIOFlags(old_mode); + + if (old_flags & kDisplayModeDefaultFlag) better = FALSE; else { - /* Otherwise, prefer the mode with the smaller pixel size. */ - if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + /* Otherwise, prefer a mode whose pixel size equals its point size over one which + is scaled. */ + size_t width_points = CGDisplayModeGetWidth(new_mode); + size_t height_points = CGDisplayModeGetHeight(new_mode); + size_t new_width_pixels = CGDisplayModeGetPixelWidth(new_mode); + size_t new_height_pixels = CGDisplayModeGetPixelHeight(new_mode); + size_t old_width_pixels = CGDisplayModeGetPixelWidth(old_mode); + size_t old_height_pixels = CGDisplayModeGetPixelHeight(old_mode); + BOOL new_size_same = (new_width_pixels == width_points && new_height_pixels == height_points); + BOOL old_size_same = (old_width_pixels == width_points && old_height_pixels == height_points); + + if (new_size_same && !old_size_same) + better = TRUE; + else if (!new_size_same && old_size_same) better = FALSE; + else + { + /* Otherwise, prefer the mode with the smaller pixel size. */ + if (old_width_pixels < new_width_pixels || old_height_pixels < new_height_pixels) + better = FALSE; + } } } }

1 0

Ken Thomases : winemac: Fix how the user' s default display mode is determined.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: dbb0bacf6731304f074f492438982949449a5266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb0bacf6731304f074f49243… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 23:39:06 2015 -0500 winemac: Fix how the user's default display mode is determined. The code had been checking the kDisplayModeDefaultFlag in the mode's IOFlags, but that doesn't do what I thought. That indicates which mode the driver considers to be the default for the hardware. It turns out there's no way to query the user's default mode. So, at the first opportunity during a given Wine session, the Mac driver queries the current display mode and assumes that's the user's default mode. It records that in a volatile registry key for use by subsequent processes during that same session. This doesn't use the existing registry key under HKEY_CURRENT_CONFIG\System\CurrentControlSet\Control\Video that records the mode when CDS_UPDATEREGISTRY is used with ChangeDisplaySettingsEx() -- which explorer.exe does during start-up -- because a) that doesn't support the distinction between pixel size and point size for Retina modes, and b) in theory, apps could overwrite that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 282 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 278 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb0bacf6731304f074f4…

1 0

Gerald Pfeifer : ntdll: Avoid a case of shift overflow in get_cpuinfo.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: a7f124ae31698248ef76af57af32822baffebd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f124ae31698248ef76af57a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 26 23:00:14 2015 +0100 ntdll: Avoid a case of shift overflow in get_cpuinfo. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0bcc8b0..d2ed9c5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1002,7 +1002,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 2) & 1; user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1; - if(regs2[3] & (1 << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; + if (regs2[3] >> 31) info->FeatureSet |= CPU_FEATURE_3DNOW; } } else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL)

1 0

Francois Gouget : oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant().
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: be3fea546d2c0c99726074326e0189ddd829e792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3fea546d2c0c99726074326… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:14 2015 +0100 oleaut32: Add V_RECORD() and V_RECORDINFO() and use them for wine_dbgstr_variant(). This fixes the wine_dbgstr_variant() compatibility with non __STDC__ compilers and source code that defines _FORCENAMELESSUNION. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleauto.h | 12 ++++++++---- include/wine/debug.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/oleauto.h b/include/oleauto.h index f9862e7..07c46ad 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -105,11 +105,15 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn /* Macros for accessing the fields of the VARIANT type */ #if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -#define V_UNION(A,B) ((A)->n1.n2.n3.B) -#define V_VT(A) ((A)->n1.n2.vt) +#define V_VT(A) ((A)->n1.n2.vt) +#define V_UNION(A,B) ((A)->n1.n2.n3.B) +#define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) +#define V_RECORDINFO(A) (V_UNION(A,brecVal).pRecInfo) #else -#define V_UNION(A,B) ((A)->B) -#define V_VT(A) ((A)->vt) +#define V_VT(A) ((A)->vt) +#define V_UNION(A,B) ((A)->B) +#define V_RECORD(A) ((A)->pvRecord) +#define V_RECORDINFO(A) ((A)->pRecInfo) #endif #define V_ISBYREF(A) (V_VT(A) & VT_BYREF) diff --git a/include/wine/debug.h b/include/wine/debug.h index 241e79b..af5483c 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -331,7 +331,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_VOID: return wine_dbg_sprintf( "%p {VT_VOID}", v ); case VT_RECORD: - return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_RECORD(v), V_RECORDINFO(v) ); default: return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); }

1 0

Francois Gouget : oleview: Remove an unneeded NONAMELESSUNION define.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: a96f7f13ced34c693c94a2b18f26c2188a3fa9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96f7f13ced34c693c94a2b18… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 27 11:58:32 2015 +0100 oleview: Remove an unneeded NONAMELESSUNION define. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 3a60348..04b9067 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "main.h" #include "wine/debug.h"

1 0

Nikolay Sivov : dwrite/tests: Some tests for GetRecommendedRenderingMode() with different ppdip values.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: 5e1c0315a174396a17b84deae3178414f5871f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1c0315a174396a17b84deae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 20:38:56 2015 +0300 dwrite/tests: Some tests for GetRecommendedRenderingMode() with different ppdip values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 56572f9..ae45e8b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4278,7 +4278,7 @@ static void test_GetGdiCompatibleGlyphAdvances(void) IDWriteFactory_Release(factory); } -static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize) +static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize, FLOAT ppdip) { WORD num_recs, version; const WORD *ptr; @@ -4288,6 +4288,8 @@ static WORD get_gasp_flags(IDWriteFontFace *fontface, FLOAT emsize) void *ctxt; HRESULT hr; + emsize *= ppdip; + exists = FALSE; hr = IDWriteFontFace_TryGetFontTable(fontface, MS_GASP_TAG, (const void**)&ptr, &size, &ctxt, &exists); @@ -4436,18 +4438,52 @@ if (0) /* crashes on native */ g_is_vista = fontface1 == NULL; for (emsize = 1.0; emsize < 500.0; emsize += 1.0) { - WORD gasp = get_gasp_flags(fontface, emsize); DWRITE_RENDERING_MODE expected; + WORD gasp; int i; for (i = 0; i < sizeof(recmode_tests)/sizeof(recmode_tests[0]); i++) { + FLOAT ppdip; + + ppdip = 1.0f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + /* some ppdip variants */ + ppdip = 0.5f; mode = 10; - expected = get_expected_rendering_mode(emsize, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); - hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, 1.0, recmode_tests[i].measuring, params, &mode); + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, flags 0x%04x, expected %d\n", emsize, i, mode, gasp, expected); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; + Win8 and Win10 handle this as expected. */ + if (emsize > 20.0f) { + ppdip = 1.5f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + + ppdip = 2.0f; + mode = 10; + gasp = get_gasp_flags(fontface, emsize, ppdip); + expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); + hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + } } + gasp = get_gasp_flags(fontface, emsize, 1.0f); /* IDWriteFontFace1 offers another variant of this method */ if (fontface1) { for (i = 0; i < sizeof(recmode_tests1)/sizeof(recmode_tests1[0]); i++) {

1 0

Francois Gouget : hidclass.sys: Make a few functions static.
by Alexandre Julliard 27 Oct '15

27 Oct '15

Module: wine Branch: master Commit: af0288d419dce9584e480cd8240dc00ed2198b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0288d419dce9584e480cd82… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 19:02:40 2015 +0100 hidclass.sys: Make a few functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 13ac99b..822de3d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -401,7 +401,9 @@ static int getValue(int bsize, int source) return value; } -void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) +static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, + unsigned int *feature_index, + struct feature *feature) { if (bSize <= 0) { @@ -430,7 +432,8 @@ void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *f } } -void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) +static void parse_collection(unsigned int bSize, int itemVal, + struct collection *collection) { if (bSize <= 0) return; @@ -772,7 +775,7 @@ static void count_elements(struct feature* feature, USHORT *buttons, USHORT *val } } -WINE_HIDP_PREPARSED_DATA* build_PreparseData( +static WINE_HIDP_PREPARSED_DATA* build_PreparseData( struct feature **features, int feature_count, struct feature **input_features, int i_count, struct feature **output_features, int o_count,

1 0