October 2015 - Wine-Commits

Huw Davies : oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal ().
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 9ed47775d6a789f0c397c622279ab861a3e8425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed47775d6a789f0c397c6222… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 14:42:30 2015 +0000 oleaut32: Clear any existing interface before calling WdtpInterfacePointer_UserUnmarshal(). The code has already called VariantClear() which has released the interface yet not set it to NULL. This is to prevent a double-release after a forthcoming patch to WdtpInterfacePointer_UserUnmarshal(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 39a5f8c..303ec69 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -349,11 +349,12 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char * ptr = *(DWORD*)Buffer; Buffer += sizeof(DWORD); + /* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal() + would try to release. This has been done already with a VariantClear(). */ + *ppunk = NULL; + if(!ptr) - { - *ppunk = NULL; return Buffer; - } return WdtpInterfacePointer_UserUnmarshal(pFlags, Buffer, ppunk, riid); }

1 0

Nikolay Sivov : prntvpt: Added PTOpenProvider() stub.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 577a75d76427eb367b1acdd004d76704beb3081d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577a75d76427eb367b1acdd00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 16:06:19 2015 +0300 prntvpt: Added PTOpenProvider() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 7 +++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/Makefile.in | 1 + include/prntvpt.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index aa01252..72b1dcf 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "prntvpt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); @@ -48,3 +49,9 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) FIXME("stub:%s %p\n", debugstr_w(printer), version); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) +{ + FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 246443e..bf9a8ca 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,5 +1,5 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) -@ stub PTOpenProvider +@ stdcall PTOpenProvider(wstr long ptr) @ stub PTOpenProviderEx @ stub PTCloseProvider @ stub BindPTProviderThunk diff --git a/include/Makefile.in b/include/Makefile.in index 1d4196e..3836af2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -514,6 +514,7 @@ SRCDIR_INCLUDES = \ pktdef.h \ poppack.h \ powrprof.h \ + prntvpt.h \ profinfo.h \ propkey.h \ propkeydef.h \ diff --git a/include/prntvpt.h b/include/prntvpt.h new file mode 100644 index 0000000..55ecbbe --- /dev/null +++ b/include/prntvpt.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015 Nikolay Sivov 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 + */ + +#ifndef _PRNPTNTV_H_ +#define _PRNPTNTV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(HPTPROVIDER); + +HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); + +#ifdef __cplusplus +} +#endif + +#endif /* _PRNPTNTV_H_ */

1 0

Francois Gouget : d3d11: Make impl_from_ID3D11ShaderResourceView() static.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 26c5fcd007b17368d0c02643ef5f89f14a759d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c5fcd007b17368d0c02643e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 19:20:51 2015 +0100 d3d11: Make impl_from_ID3D11ShaderResourceView() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 91f9265..ca53764 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1189,7 +1189,7 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend /* ID3D11ShaderResourceView methods */ -struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) +static inline struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) { return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); }

1 0

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

Oct. 27, 2015

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

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

Oct. 27, 2015

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

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

Oct. 27, 2015

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

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

Oct. 27, 2015

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

Józef Kucia : d3d11: Rename d3d10_query to d3d_query.
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 9ea84e251da6d62044c1d9bd05f00e7206b7f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea84e251da6d62044c1d9bd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:28 2015 +0100 d3d11: Rename d3d10_query to d3d_query. 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/async.c | 24 ++++++++++++------------ dlls/d3d11/d3d11_private.h | 6 +++--- dlls/d3d11/device.c | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 8983321..8f691a2 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -24,16 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface) +static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) { - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -56,7 +56,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) { - struct d3d10_query *This = impl_from_ID3D10Query(iface); + struct d3d_query *This = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); ULONG refcount = InterlockedDecrement(&query->refcount); TRACE("%p decreasing refcount to %u.\n", query, refcount); @@ -88,7 +88,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -99,7 +99,7 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -110,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -121,7 +121,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_query *query = impl_from_ID3D10Query(iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -181,15 +181,15 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; -struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d10_query_vtbl); - return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e8f66e3..104b898 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -351,7 +351,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ -struct d3d10_query +struct d3d_query { ID3D10Query ID3D10Query_iface; LONG refcount; @@ -362,9 +362,9 @@ struct d3d10_query ID3D10Device1 *device; }; -HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d_device *device, +HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D10_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; -struct d3d10_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 380769d..58269d3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2212,7 +2212,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_SetPredication(ID3D10Device1 *iface, ID3D10Predicate *predicate, BOOL value) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *query; + struct d3d_query *query; TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); @@ -2946,7 +2946,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, { struct d3d_device *device = impl_from_ID3D10Device(iface); struct wined3d_query *wined3d_predicate; - struct d3d10_query *predicate_impl; + struct d3d_query *predicate_impl; TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); @@ -3712,7 +3712,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, const D3D10_QUERY_DESC *desc, ID3D10Query **query) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr; TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); @@ -3720,7 +3720,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, desc, FALSE))) + if (FAILED(hr = d3d_query_init(object, device, desc, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3737,7 +3737,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa const D3D10_QUERY_DESC *desc, ID3D10Predicate **predicate) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_query *object; + struct d3d_query *object; HRESULT hr; TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); @@ -3754,7 +3754,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_query_init(object, device, desc, TRUE))) + if (FAILED(hr = d3d_query_init(object, device, desc, TRUE))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Józef Kucia : d3d10core/tests: Extend test_create_predicate().
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: 2728569d938e7d0c393d667c7c829b4a9595c247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728569d938e7d0c393d667c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:32 2015 +0100 d3d10core/tests: Extend test_create_predicate(). 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/d3d10core/tests/device.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5606c3b..6c6d8bb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1788,25 +1788,41 @@ static void test_create_rasterizer_state(void) static void test_create_predicate(void) { + static const D3D10_QUERY other_queries[] = + { + D3D10_QUERY_EVENT, + D3D10_QUERY_OCCLUSION, + D3D10_QUERY_TIMESTAMP, + D3D10_QUERY_TIMESTAMP_DISJOINT, + D3D10_QUERY_PIPELINE_STATISTICS, + D3D10_QUERY_SO_STATISTICS, + }; + ULONG refcount, expected_refcount; D3D10_QUERY_DESC query_desc; ID3D10Predicate *predicate; ID3D10Device *device, *tmp; + IUnknown *iface; + unsigned int i; HRESULT hr; if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } hr = ID3D10Device_CreatePredicate(device, NULL, &predicate); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - query_desc.Query = D3D10_QUERY_OCCLUSION; query_desc.MiscFlags = 0; - hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i) + { + query_desc.Query = other_queries[i]; + hr = ID3D10Device_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 = D3D10_QUERY_OCCLUSION_PREDICATE; expected_refcount = get_refcount((IUnknown *)device) + 1; @@ -1821,6 +1837,10 @@ static void test_create_predicate(void) refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10Predicate_QueryInterface(predicate, &IID_ID3D11Predicate, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Predicate should implement ID3D11Predicate.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); ID3D10Predicate_Release(predicate); query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE;

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateQuery().
by Alexandre Julliard Oct. 27, 2015

Oct. 27, 2015

Module: wine Branch: master Commit: bd1bb06d84f10acf54045ff77652d08db6adaa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1bb06d84f10acf54045ff77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 27 03:02:31 2015 +0100 d3d11: Implement d3d11_device_CreateQuery(). 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/async.c | 2 +- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 25 +++++++++++++------------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 3b9bb81..1e96fb3 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -303,7 +303,7 @@ struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) return CONTAINING_RECORD(iface, struct d3d_query, ID3D10Query_iface); } -HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, +static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate) { HRESULT hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 722f266..fcd4742 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -363,8 +363,6 @@ struct d3d_query ID3D11Device *device; }; -HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device, - const D3D11_QUERY_DESC *desc, BOOL predicate) DECLSPEC_HIDDEN; HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, struct d3d_query **query) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f5aca82..5f567ab 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1583,11 +1583,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *i } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateQuery(ID3D11Device *iface, - const D3D11_QUERY_DESC *desc, ID3D11Query **query) + const D3D11_QUERY_DESC *desc, ID3D11Query **query) { - FIXME("iface %p, desc %p, query %p stub!\n", iface, desc, query); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); + + if (FAILED(hr = d3d_query_create(device, desc, FALSE, &object))) + return hr; + + *query = &object->ID3D11Query_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePredicate(ID3D11Device *iface, const D3D11_QUERY_DESC *desc, @@ -3726,17 +3735,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device1 *iface, TRACE("iface %p, desc %p, query %p.\n", iface, desc, query); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_query_init(object, device, (const D3D11_QUERY_DESC *)desc, FALSE))) - { - WARN("Failed to initialize query, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, FALSE, &object))) return hr; - } - TRACE("Created query %p.\n", object); *query = &object->ID3D10Query_iface; return S_OK;

1 0