April 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d11/tests: Tests creating 2D array texture views.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: aca6182469f66aff9e54c3c9a2f6e3f1044e80c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca6182469f66aff9e54c3c9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:41 2016 +0200 d3d11/tests: Tests creating 2D array texture views. 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 | 87 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 33c26d4..8ba6a77 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1673,16 +1673,18 @@ static void test_create_depthstencil_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D11Device_Release(tmp); + memset(&dsv_desc, 0, sizeof(dsv_desc)); ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); dsv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); @@ -1692,10 +1694,33 @@ static void test_create_depthstencil_view(void) ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); + ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(dsv_desc).Texture2DArray.MipSlice); + ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(dsv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + + ID3D11DepthStencilView_Release(dsview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device); @@ -1858,11 +1883,12 @@ static void test_create_rendertarget_view(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + memset(&rtv_desc, 0, sizeof(rtv_desc)); ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", rtv_desc.ViewDimension); - ok(U(rtv_desc).Texture2D.MipSlice == 0, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(rtv_desc).Texture2D.MipSlice); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -1872,6 +1898,7 @@ static void test_create_rendertarget_view(void) ID3D11RenderTargetView_Release(rtview); rtv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); @@ -1880,10 +1907,32 @@ static void test_create_rendertarget_view(void) todo_wine ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", rtv_desc.ViewDimension); - ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(rtv_desc).Texture2D.MipSlice); ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(texture); + texture_desc.ArraySize = 4; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); + ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(!U(rtv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(rtv_desc).Texture2DArray.MipSlice); + ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(rtv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + U(rtv_desc).Texture2DArray.ArraySize); + + ID3D11RenderTargetView_Release(rtview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device); @@ -1979,6 +2028,7 @@ static void test_create_shader_resource_view(void) "Shader resource view should implement ID3D10ShaderResourceView1.\n"); if (SUCCEEDED(hr)) IUnknown_Release(iface); + memset(&srv_desc, 0, sizeof(srv_desc)); ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2D, @@ -1990,6 +2040,8 @@ static void test_create_shader_resource_view(void) ID3D11ShaderResourceView_Release(srview); srv_desc.Format = DXGI_FORMAT_UNKNOWN; + U(srv_desc).Texture2D.MipLevels = -1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srview); ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); @@ -2000,10 +2052,35 @@ static void test_create_shader_resource_view(void) "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", U(srv_desc).Texture2D.MostDetailedMip); - ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + todo_wine ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2D.MipLevels); ID3D11ShaderResourceView_Release(srview); + ID3D11Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(!U(srv_desc).Texture2DArray.MostDetailedMip, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2DArray.MostDetailedMip); + ok(U(srv_desc).Texture2DArray.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2DArray.MipLevels); + ok(!U(srv_desc).Texture2DArray.FirstArraySlice, "Got unexpected FirstArraySlice %u.\n", + U(srv_desc).Texture2DArray.FirstArraySlice); + ok(U(srv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected ArraySize %u.\n", + U(srv_desc).Texture2DArray.ArraySize); + + ID3D11ShaderResourceView_Release(srview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Henri Verbeet : wined3d: Don' t evict mapped resources in wined3d_device_evict_managed_resources().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: bcb1ee82449d8e56caa4268118c7590e0385162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb1ee82449d8e56caa426811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:26 2016 +0200 wined3d: Don't evict mapped resources in wined3d_device_evict_managed_resources(). We would skip evicting the specific mapped sub-resource, but then go on to evict the texture itself. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/texture.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 619ad1e..b1d8631 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4503,6 +4503,10 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); + /* These are handled by the texture they're part of. */ + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0a89665..393c2f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1408,6 +1408,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); } + ++resource->map_count; ++sub_resource->resource->map_count; TRACE("Returning memory %p, row pitch %u, slice pitch %u.\n", @@ -1473,6 +1474,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso } --sub_resource->resource->map_count; + --resource->map_count; return WINED3D_OK; } @@ -2263,6 +2265,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i context_release(context); surface->flags |= SFLAG_DCINUSE; + ++texture->resource.map_count; surface->resource.map_count++; *dc = surface->hDC; @@ -2302,6 +2305,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign } surface->resource.map_count--; + --texture->resource.map_count; surface->flags &= ~SFLAG_DCINUSE; if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY

1 0

Henri Verbeet : wined3d: Store sub-resource map counts in the sub-resource structure.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 2a2554ee59745b6d5713d9f14ef0556c70e36b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2554ee59745b6d5713d9f14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:27 2016 +0200 wined3d: Store sub-resource map counts in the sub-resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 34 +++++++++++++++++++++------------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 31 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a2554ee59745b6d5713d…

1 0

Henri Verbeet : ddraw/tests: Rewrite GetDCFormatTest().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 77e6d98819079fa85bbe46a37478f864acc97aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e6d98819079fa85bbe46a37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:28 2016 +0200 ddraw/tests: Rewrite GetDCFormatTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 116 +++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 116 +++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 117 +++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 117 +++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 240 -------------------------------------------- 5 files changed, 466 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77e6d98819079fa85bbe4…

1 0

Henri Verbeet : ddraw/tests: Add some more surface GetDC() tests to test_getdc().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 31999bafda5672c788d8e66af957d156ff6a156a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31999bafda5672c788d8e66af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:29 2016 +0200 ddraw/tests: Add some more surface GetDC() tests to test_getdc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 159 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 161 +++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/dsurface.c | 51 -------------- 5 files changed, 624 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31999bafda5672c788d8e…

1 0

Henri Verbeet : d3d9/tests: Add some more surface GetDC() tests to test_getdc().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: b8ffc4df1c0652201f4787bef2fa8f6df46ac811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffc4df1c0652201f4787bef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:30 2016 +0200 d3d9/tests: Add some more surface GetDC() tests to test_getdc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8ffc4df1c0652201f478…

1 0

Stefan Dösinger : wined3d: Discard default pool surfaces on unload.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: e55754bf740b34e63ca3ae7f6522eb57632614c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55754bf740b34e63ca3ae7f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 10 18:09:31 2016 +0200 wined3d: Discard default pool surfaces on unload. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bbf05db..aab5d73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -887,27 +887,10 @@ static void surface_unload(struct wined3d_resource *resource) if (resource->pool == WINED3D_POOL_DEFAULT) { - /* Default pool resources are supposed to be destroyed before Reset is called. - * Implicit resources stay however. So this means we have an implicit render target - * or depth stencil. The content may be destroyed, but we still have to tear down - * opengl resources, so we cannot leave early. - * - * Put the surfaces into sysmem, and reset the content. The D3D content is undefined, - * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain - * or the depth stencil into an FBO the texture or render buffer will be removed - * and all flags get lost */ - if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL) - { - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); - } - else - { - surface_prepare_system_memory(surface); - memset(surface->resource.heap_memory, 0, surface->resource.size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_SYSMEM); - } + /* We should only get here on device reset/teardown for implicit + * resources. */ + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); } else {

1 0

Nikolay Sivov : dwrite/tests: Test underline/ strikethrough metrics for all system fonts.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: f94447526aaff46a638c7407bd6519c1382a7b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94447526aaff46a638c7407b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 10 23:59:10 2016 +0300 dwrite/tests: Test underline/strikethrough metrics for all system fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 224 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 217 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ec631bd..0c060b8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -40,6 +40,16 @@ #define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') #define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') +#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') +#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') +#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') +#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#endif #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -100,6 +110,90 @@ static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; +/* PANOSE is 10 bytes in size, need to pack the structure properly */ +#include "pshpack2.h" +typedef struct +{ + ULONG version; + ULONG revision; + ULONG checksumadj; + ULONG magic; + USHORT flags; + USHORT unitsPerEm; + ULONGLONG created; + ULONGLONG modified; + SHORT xMin; + SHORT yMin; + SHORT xMax; + SHORT yMax; + USHORT macStyle; + USHORT lowestRecPPEM; + SHORT direction_hint; + SHORT index_format; + SHORT glyphdata_format; +} TT_HEAD; + +typedef struct +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; + /* version 2 (OpenType 1.2) */ + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} TT_OS2_V2; + +typedef struct { + ULONG Version; + ULONG italicAngle; + SHORT underlinePosition; + SHORT underlineThickness; + ULONG fixed_pitch; + ULONG minmemType42; + ULONG maxmemType42; + ULONG minmemType1; + ULONG maxmemType1; +} TT_POST; + +#include "poppack.h" + static IDWriteFactory *create_factory(void) { IDWriteFactory *factory; @@ -1425,9 +1519,92 @@ todo_wine DELETE_FONTFILE(path); } +static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS *metrics) +{ + void *os2_context, *head_context, *post_context; + const TT_OS2_V2 *tt_os2; + const TT_HEAD *tt_head; + const TT_POST *tt_post; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(metrics, 0, sizeof(*metrics)); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_head) + metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + + if (tt_os2) { + metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); + metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); + } + + if (tt_post) { + metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); + metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); + } + + if (metrics->strikethroughThickness || metrics->underlineThickness) { + if (!metrics->strikethroughThickness) + metrics->strikethroughThickness = metrics->underlineThickness; + if (!metrics->underlineThickness) + metrics->underlineThickness = metrics->strikethroughThickness; + } + else { + metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + metrics->underlineThickness = metrics->designUnitsPerEm / 14; + } + + if (tt_os2) + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + if (tt_head) + IDWriteFontFace_ReleaseFontTable(fontface, head_context); + if (tt_post) + IDWriteFontFace_ReleaseFontTable(fontface, post_context); +} + +static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *got, const DWRITE_FONT_METRICS *expected) +{ + ok(got->designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", + wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); + ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", + wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); +todo_wine_if(got->underlineThickness == 0) + ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); + ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", + wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); +todo_wine_if(got->strikethroughThickness == 0) + ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); +} + +static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) +{ + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + BOOL exists = FALSE; + UINT32 index; + HRESULT hr; + + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void test_GetMetrics(void) { DWRITE_FONT_METRICS metrics, metrics2; + IDWriteFontCollection *syscollection; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; @@ -1436,7 +1613,7 @@ static void test_GetMetrics(void) IDWriteFont1 *font1; IDWriteFont *font; LOGFONTW logfont; - UINT32 count; + UINT32 count, i; HRESULT hr; HDC hdc; HFONT hfont; @@ -1607,6 +1784,44 @@ if (0) /* crashes on native */ IDWriteFontFile_Release(file); IDWriteFont_Release(font); + /* test metrics for whole system collection */ + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + DWRITE_FONT_METRICS expected_metrics; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + IDWriteFontFace_GetMetrics(fontface, &metrics); + get_expected_font_metrics(fontface, &expected_metrics); + check_font_metrics(nameW, &metrics, &expected_metrics); + + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + IDWriteFontCollection_Release(syscollection); IDWriteFactory_Release(factory); } @@ -4036,11 +4251,6 @@ struct VDMX_vTable SHORT yMin; }; -#ifdef WORDS_BIGENDIAN -#define GET_BE_WORD(x) (x) -#else -#define GET_BE_WORD(x) RtlUshortByteSwap(x) -#endif static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) {

1 0

Nikolay Sivov : dwrite: Always return non-zero metrics for strikethrough/ underline thickness.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 137030bf7781a1ae9797667e555d2df46ab59920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137030bf7781a1ae9797667e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 10 23:59:11 2016 +0300 dwrite: Always return non-zero metrics for strikethrough/underline thickness. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 12 ++++++++++++ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 97a786d..b9bddea 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1204,6 +1204,18 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } + /* use any of thickness values if another one is zero, if both are zero use estimate */ + if (metrics->strikethroughThickness || metrics->underlineThickness) { + if (!metrics->strikethroughThickness) + metrics->strikethroughThickness = metrics->underlineThickness; + if (!metrics->underlineThickness) + metrics->underlineThickness = metrics->strikethroughThickness; + } + else { + metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + metrics->underlineThickness = metrics->designUnitsPerEm / 14; + } + /* estimate missing metrics */ if (metrics->xHeight == 0) metrics->xHeight = metrics->designUnitsPerEm / 2; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0c060b8..5591913 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1576,12 +1576,10 @@ static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *go wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); -todo_wine_if(got->underlineThickness == 0) ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); -todo_wine_if(got->strikethroughThickness == 0) ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); }

1 0

Rodrigo Rivas Costa : user32: Make DeferWindowPos() fail on invalid window handles.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 5e65b65219bd56a5991c2c54df99b524e379846a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65b65219bd56a5991c2c54d… Author: Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> Date: Sat Apr 9 09:09:20 2016 +0300 user32: Make DeferWindowPos() fail on invalid window handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 957e8a1d..918e1ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8821,6 +8821,40 @@ static void test_winproc_limit(void) ok(i == 1, "winproc should be called once (%d)\n", i); } +static void test_deferwindowpos(void) +{ + HDWP hdwp, hdwp2; + BOOL ret; + + hdwp = BeginDeferWindowPos(0); + ok(hdwp != NULL, "got %p\n", hdwp); + + ret = EndDeferWindowPos(NULL); + ok(!ret, "got %d\n", ret); + + hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, NULL, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, (HWND)0xdead, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + ret = EndDeferWindowPos(hdwp); + ok(ret, "got %d\n", ret); +} + START_TEST(win) { char **argv; @@ -8963,6 +8997,7 @@ START_TEST(win) test_GetMessagePos(); test_activateapp(hwndMain); test_winproc_handles(argv[0]); + test_deferwindowpos(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f92a3dc..4915aad 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2348,7 +2348,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); hwnd = WIN_GetFullHandle( hwnd ); - if (is_desktop_window( hwnd )) return 0; + if (is_desktop_window( hwnd ) || !IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; if (pDWP == OBJ_OTHER_PROCESS)

1 0