May 2017 - Wine-Commits - list.winehq.org

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: master Commit: 3fef1e1cf6bceec8b93c9f3879a08adea88354fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fef1e1cf6bceec8b93c9f387… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 26 01:00:14 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 1e77cbc..bcf1254 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11758,11 +11758,8 @@ msgid "&About Registry Editor" msgstr "&Om Registerredigering" #: regedit.rc:91 regedit.rc:98 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "utvidet" +msgstr "Utvid" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -12245,11 +12242,8 @@ msgid "" msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "kollapset" +msgstr "Kollaps" #: regsvr32.rc:32 msgid ""

1 0

André Hentschel : cryptnet: Fix CryptGetObjectUrl spec file entry.
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: master Commit: 9a4739810c18c9ba63fb44396e56933ac94a5c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4739810c18c9ba63fb44396… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:30 2017 +0200 cryptnet: Fix CryptGetObjectUrl spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptnet/cryptnet.spec b/dlls/cryptnet/cryptnet.spec index 6fca711..92d5c40 100644 --- a/dlls/cryptnet/cryptnet.spec +++ b/dlls/cryptnet/cryptnet.spec @@ -4,7 +4,7 @@ @ stub LdapProvOpenStore @ stub CryptCancelAsyncRetrieval @ stub CryptFlushTimeValidObject -@ stdcall CryptGetObjectUrl(ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall CryptGetObjectUrl(str ptr long ptr ptr ptr ptr ptr) @ stub CryptGetTimeValidObject @ stub CryptInstallCancelRetrieval @ stdcall CryptRetrieveObjectByUrlA(str str long long ptr ptr ptr ptr ptr)

1 0

Józef Kucia : d3d11/tests: Do not recreate SO buffer in test_quad_tessellation().
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 57d813c6e4ead3eeac8f5521bfc0cbe14c3d410c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d813c6e4ead3eeac8f5521b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:57 2017 +0200 d3d11/tests: Do not recreate SO buffer in test_quad_tessellation(). 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7f34fbd..895225d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18647,8 +18647,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11HullShader_Release(hs); hr = ID3D11Device_CreateHullShader(device, hs_quad_cw_code, sizeof(hs_quad_cw_code), NULL, &hs); @@ -18661,8 +18660,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); query_desc.Query = D3D11_QUERY_SO_STATISTICS_STREAM0;

1 0

Józef Kucia : wined3d: Implement hull shader vocp register.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: aff0cbb9c707f05d6c67b0c42084b4b1a43c3f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0cbb9c707f05d6c67b0c42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:12 2017 +0200 wined3d: Implement hull shader vocp register. 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/wined3d/glsl_shader.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cfc0e6..73ab7a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3066,6 +3066,31 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "gl_TessCoord"); break; + case WINED3DSPR_OUTCONTROLPOINT: + if (reg->idx[0].rel_addr) + { + if (reg->idx[1].rel_addr) + sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", + rel_param0.param_str, reg->idx[0].offset, + rel_param1.param_str, reg->idx[1].offset); + else + sprintf(register_name, "shader_out[%s + %u].reg[%u]", + rel_param0.param_str, reg->idx[0].offset, + reg->idx[1].offset); + } + else if (reg->idx[1].rel_addr) + { + sprintf(register_name, "shader_out[%u].reg[%s + %u]", + reg->idx[0].offset, rel_param1.param_str, + reg->idx[1].offset); + } + else + { + sprintf(register_name, "shader_out[%u].reg[%u]", + reg->idx[0].offset, reg->idx[1].offset); + } + break; + case WINED3DSPR_PATCHCONST: if (version->type == WINED3D_SHADER_TYPE_HULL) sprintf(register_name, "hs_out[%u]", reg->idx[0].offset);

1 0

Henri Verbeet : d3d11/tests: Add a test for constant buffer alignment.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 5d4b5d731c136489dbf257dd9d5284799260895c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4b5d731c136489dbf257dd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:04 2017 +0200 d3d11/tests: Add a test for constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9e3f695..7f34fbd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2322,12 +2322,12 @@ static void test_texture3d_interfaces(void) static void test_create_buffer(void) { ID3D10Buffer *d3d10_buffer; + HRESULT expected_hr, hr; D3D11_BUFFER_DESC desc; ID3D11Buffer *buffer; ID3D11Device *device; unsigned int i; ULONG refcount; - HRESULT hr; static const struct test { @@ -2531,7 +2531,6 @@ static void test_create_buffer(void) D3D11_BUFFER_DESC obtained_desc; D3D10_BUFFER_DESC d3d10_desc; ID3D10Device *d3d10_device; - HRESULT expected_hr; desc.ByteWidth = 1024; desc.Usage = D3D11_USAGE_DEFAULT; @@ -2605,6 +2604,18 @@ static void test_create_buffer(void) ID3D10Buffer_Release(d3d10_buffer); } + memset(&desc, 0, sizeof(desc)); + desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + for (i = 0; i <= 32; ++i) + { + desc.ByteWidth = i; + expected_hr = !i || i % 16 ? E_INVALIDARG : S_OK; + hr = ID3D11Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(hr == expected_hr, "Got unexpected hr %#x for constant buffer size %u.\n", hr, i); + if (SUCCEEDED(hr)) + ID3D11Buffer_Release(buffer); + } + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Henri Verbeet : wined3d: Validate constant buffer alignment.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: cb77e188d118ae52a24c22d485cf05aa0740c576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb77e188d118ae52a24c22d48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:03 2017 +0200 wined3d: Validate constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3cf153b..ab2fea3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1380,8 +1380,14 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!size) { - WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; + WARN("Size 0 requested, returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER && size & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) + { + WARN("Size %#x is not suitably aligned for constant buffers.\n", size); + return E_INVALIDARG; } if (data && !data->data) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 321f4d5..1da788e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2894,6 +2894,7 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 +#define WINED3D_CONSTANT_BUFFER_ALIGNMENT 16 struct gl_texture {

1 0

Sven Hesse : d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 01a83b5bbd24c5161c1f15a49495005a17ba92e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a83b5bbd24c5161c1f15a49… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:28 2017 +0200 d3d11/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f60208a..3dcdfdf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2088,6 +2088,9 @@ static void test_create_texture3d(void) {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, }; if (!(device = create_device(NULL)))

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: d7a2ad024af795a4fb8bb069ffcd0a4369a5c950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a2ad024af795a4fb8bb069f… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:24 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b63ba87..29f3e5f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1334,6 +1334,9 @@ static void test_create_texture2d(void) FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Józef Kucia : wined3d: Try harder to keep the current context.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: 1eb642aaf23bfa7f13af4e9d9207e87e39b8c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb642aaf23bfa7f13af4e9d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:10:00 2017 +0200 wined3d: Try harder to keep the current context. 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/wined3d/context.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e0c51f9..49b9186 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3956,6 +3956,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context; + BOOL swapchain_texture; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -3964,6 +3965,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, if (current_context && current_context->destroyed) current_context = NULL; + swapchain_texture = texture && texture->swapchain; if (!texture) { if (current_context @@ -3989,7 +3991,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { context = current_context; } - else if (texture->swapchain) + else if (swapchain_texture) { TRACE("Rendering onscreen.\n"); @@ -4010,7 +4012,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, context_enter(context); context_update_window(context); context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) return context; + if (!context->valid) + return context; if (context != current_context) {

1 0

Józef Kucia : wined3d: Implement SO statistics queries.
by Alexandre Julliard May 25, 2017

May 25, 2017

Module: wine Branch: master Commit: dfa3be5c9da87bf0a58f0ebe7af5647eeff2b15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa3be5c9da87bf0a58f0ebe7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:59 2017 +0200 wined3d: Implement SO statistics queries. 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/wined3d/context.c | 64 ++++++++++++- dlls/wined3d/directx.c | 16 ++++ dlls/wined3d/query.c | 200 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 3 +- dlls/wined3d/wined3d_private.h | 31 +++++++ include/wine/wined3d.h | 49 ++++++---- 6 files changed, 343 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfa3be5c9da87bf0a58f0…

1 0