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

Michael Stefaniuc : avifil32/tests: Add some basic COM tests for AVIEditStream.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 06744904dddce9a9875aaeb91a04448481631a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06744904dddce9a9875aaeb91… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:25:00 2016 +0200 avifil32/tests: Add some basic COM tests for AVIEditStream. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/tests/api.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 137062ad8..b3d822d 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -705,6 +705,35 @@ static void test_COM_wavfile(void) while (IAVIFile_Release(avif)); } +static void test_COM_editstream(void) +{ + IAVIEditStream *edit; + IAVIStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* Same refcount for all AVIEditStream interfaces */ + hr = CreateEditableStream(&stream, NULL); + ok(hr == S_OK, "AVIEditStream create failed: %08x, expected S_OK\n", hr); + refcount = IAVIStream_AddRef(stream); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IAVIStream_QueryInterface(stream, &IID_IAVIEditStream, (void**)&edit); + ok(hr == S_OK, "QueryInterface for IID_IAVIEditStream failed: %08x\n", hr); + refcount = IAVIEditStream_AddRef(edit); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IAVIEditStream_Release(edit); + + hr = IAVIEditStream_QueryInterface(edit, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IUnknown_Release(unk); + + while (IAVIEditStream_Release(edit)); +} + START_TEST(api) { @@ -717,6 +746,7 @@ START_TEST(api) test_ash1_corruption2(); test_COM(); test_COM_wavfile(); + test_COM_editstream(); AVIFileExit(); }

1 0

Michael Stefaniuc : avifil32: Avoid casts from COM objects to ifaces.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: d13dde18fa19a38bb4e66673d5c9d05cbd3e9492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13dde18fa19a38bb4e66673d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:26:16 2016 +0200 avifil32: Avoid casts from COM objects to ifaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 4 ++-- dlls/avifil32/tmpfile.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 815283b..2e0fa2f 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -404,11 +404,11 @@ static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, if (pEdit == NULL) return AVIERR_MEMORY; - hr = IAVIEditStream_Paste((PAVIEDITSTREAM)pEdit, &start, plLength, &This->IAVIStream_iface, + hr = IAVIEditStream_Paste(&pEdit->IAVIEditStream_iface, &start, plLength, &This->IAVIStream_iface, *plStart, *plStart + *plLength); *plStart = start; if (FAILED(hr)) - IAVIEditStream_Release((PAVIEDITSTREAM)pEdit); + IAVIEditStream_Release(&pEdit->IAVIEditStream_iface); else *ppResult = &This->IAVIStream_iface; diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 62d283b..ee7e772 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -274,5 +274,5 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) } } - return (PAVIFILE)tmpFile; + return &tmpFile->IAVIFile_iface; }

1 0

Hugh McMaster : regedit: Use output_message() in regproc.c for better internationalization.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 8dfc25ea9eb19164c23f758b1511df743f2f2673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfc25ea9eb19164c23f758b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 15 07:49:48 2016 +0000 regedit: Use output_message() in regproc.c for better internationalization. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/bg.po | 64 +++++++++++++++++++++++++++++++++ po/ca.po | 86 +++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/da.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/de.po | 85 ++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 62 ++++++++++++++++++++++++++++++++ po/en.po | 62 ++++++++++++++++++++++++++++++++ po/en_US.po | 62 ++++++++++++++++++++++++++++++++ po/eo.po | 65 ++++++++++++++++++++++++++++++++++ po/es.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/fa.po | 60 +++++++++++++++++++++++++++++++ po/fi.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 85 ++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 77 ++++++++++++++++++++++++++++++++++++++++ po/hi.po | 59 +++++++++++++++++++++++++++++++ po/hr.po | 77 ++++++++++++++++++++++++++++++++++++++++ po/hu.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/it.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/ja.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/lt.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 59 +++++++++++++++++++++++++++++++ po/nb_NO.po | 83 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/or.po | 59 +++++++++++++++++++++++++++++++ po/pa.po | 59 +++++++++++++++++++++++++++++++ po/pl.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 86 +++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/rm.po | 60 +++++++++++++++++++++++++++++++ po/ro.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/ru.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 75 +++++++++++++++++++++++++++++++++++++++ po/sl.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 69 ++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 69 ++++++++++++++++++++++++++++++++++++ po/sv.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/te.po | 59 +++++++++++++++++++++++++++++++ po/th.po | 60 +++++++++++++++++++++++++++++++ po/tr.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 60 +++++++++++++++++++++++++++++++ po/wine.pot | 59 +++++++++++++++++++++++++++++++ po/zh_CN.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 78 ++++++++++++++++++++++++++++++++++++++++ programs/regedit/regedit.c | 3 +- programs/regedit/regedit.rc | 14 ++++++++ programs/regedit/regproc.c | 76 ++++++++++----------------------------- programs/regedit/regproc.h | 4 +++ programs/regedit/resource.h | 14 ++++++++ 51 files changed, 3438 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dfc25ea9eb19164c23f7…

1 0

Iván Matellanes : msvcirt: Implement istream::isfx.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 3a4dd04b1152de1919831dfd6aaa32bb4c5b3147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4dd04b1152de1919831dfd6… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 15 10:26:56 2016 +0100 msvcirt: Implement istream::isfx. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 32c4698..6c0b9a4 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3097,7 +3097,12 @@ int __thiscall istream_ipfx(istream *this, int need) DEFINE_THISCALL_WRAPPER(istream_isfx, 4) void __thiscall istream_isfx(istream *this) { - FIXME("(%p) stub\n", this); + ios *base = istream_get_ios(this); + + TRACE("(%p)\n", this); + + ios_unlockbuf(base); + ios_unlock(base); } /* ?get(a)istream@@IAEAAV1(a)PADHH@Z */

1 0

Huw Davies : gdi32: Copy 1-bpp pixels one byte at a time.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 778faedbaecdab5bba377861ddece0d110eab747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778faedbaecdab5bba377861d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 15 08:59:29 2016 +0100 gdi32: Copy 1-bpp pixels one byte at a time. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 288 +++++++++++++++++++++++++++++++++++++---- dlls/gdi32/tests/dib.c | 42 +++--- 2 files changed, 292 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=778faedbaecdab5bba377…

1 0

Nikolay Sivov : dwrite: Ignore fonts with dot-prefixed names.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 3fa7ff671cc2129d3a895537db81603ad026fa8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa7ff671cc2129d3a895537d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 11:05:37 2016 +0300 dwrite: Ignore fonts with dot-prefixed names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a80861b..d1a04db 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3593,6 +3593,14 @@ HRESULT create_font_collection(IDWriteFactory3 *factory, IDWriteFontFileEnumerat fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR)); + /* ignore dot named faces */ + if (familyW[0] == '.') { + WARN("Ignoring face %s\n", debugstr_w(familyW)); + IDWriteLocalizedStrings_Release(family_name); + release_font_data(font_data); + continue; + } + index = collection_find_family(collection, familyW); if (index != ~0u) hr = fontfamily_add_font(collection->family_data[index], font_data);

1 0

Józef Kucia : d3d11/tests: Add test for writing floating-point specials to render target.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: eda1fd79909ae5c5c54ef63062eb9bd6e8738704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda1fd79909ae5c5c54ef6306… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:16 2016 +0200 d3d11/tests: Add test for writing floating-point specials to render target. 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 | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 69cf5cd..a83f622 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -52,6 +52,11 @@ struct vec4 float x, y, z, w; }; +struct uvec4 +{ + unsigned int x, y, z, w; +}; + struct device_desc { const D3D_FEATURE_LEVEL *feature_level; @@ -106,6 +111,11 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) +{ + return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) @@ -658,6 +668,11 @@ static const struct vec4 *get_readback_vec4(struct texture_readback *rb, unsigne return &((const struct vec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct vec4) + x]; } +static const struct uvec4 *get_readback_uvec4(struct texture_readback *rb, unsigned int x, unsigned int y) +{ + return &((const struct uvec4 *)rb->map_desc.pData)[rb->map_desc.RowPitch * y / sizeof(struct uvec4) + x]; +} + static void release_texture_readback(struct texture_readback *rb) { ID3D11DeviceContext_Unmap(rb->immediate_context, rb->texture, rb->sub_resource_idx); @@ -9262,6 +9277,76 @@ static void test_immediate_constant_buffer(void) release_test_context(&test_context); } +static void test_fp_specials(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + struct texture_readback rb; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int x, y; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_Target + { + return float4(0.0f / 0.0f, 1.0f / 0.0f, -1.0f / 0.0f, 1.0f); + } +#endif + 0x43425844, 0x86d7f319, 0x14cde598, 0xe7ce83a8, 0x0e06f3f0, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xffc00000, + 0x7f800000, 0xff800000, 0x3f800000, 0x0100003e, + }; + const struct uvec4 expected_result = {0xffc00000, 0x7f800000, 0xff800000, 0x3f800000}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + const struct uvec4 *value = get_readback_uvec4(&rb, x, y); + ok(compare_uvec4(value, &expected_result), + "Got unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value->x, value->y, value->z, value->w, x, y); + } + } + release_texture_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -9312,4 +9397,5 @@ START_TEST(d3d11) test_check_feature_support(); test_create_unordered_access_view(); test_immediate_constant_buffer(); + test_fp_specials(); }

1 0

Józef Kucia : d3d10core/tests: Add test for writing floating-point specials to render target.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 5c3114ab8ebadca0d658d539eb190c63b99b41d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3114ab8ebadca0d658d539e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:17 2016 +0200 d3d10core/tests: Add test for writing floating-point specials to render target. 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 | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 26e525c..edfe27b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -38,6 +38,11 @@ struct vec4 float x, y, z, w; }; +struct uvec4 +{ + unsigned int x, y, z, w; +}; + static void set_box(D3D10_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -78,6 +83,11 @@ static BOOL compare_vec4(const struct vec4 *v1, const struct vec4 *v2, unsigned && compare_float(v1->w, v2->w, ulps); } +static BOOL compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) +{ + return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; +} + static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) @@ -508,6 +518,11 @@ static const struct vec4 *get_readback_vec4(struct texture_readback *rb, unsigne return &((const struct vec4 *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(struct vec4) + x]; } +static const struct uvec4 *get_readback_uvec4(struct texture_readback *rb, unsigned int x, unsigned int y) +{ + return &((const struct uvec4 *)rb->mapped_texture.pData)[rb->mapped_texture.RowPitch * y / sizeof(struct uvec4) + x]; +} + static void release_texture_readback(struct texture_readback *rb) { ID3D10Texture2D_Unmap(rb->texture, rb->sub_resource_idx); @@ -8600,6 +8615,74 @@ static void test_immediate_constant_buffer(void) release_test_context(&test_context); } +static void test_fp_specials(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + struct texture_readback rb; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int x, y; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_Target + { + return float4(0.0f / 0.0f, 1.0f / 0.0f, -1.0f / 0.0f, 1.0f); + } +#endif + 0x43425844, 0x86d7f319, 0x14cde598, 0xe7ce83a8, 0x0e06f3f0, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xffc00000, + 0x7f800000, 0xff800000, 0x3f800000, 0x0100003e, + }; + const struct uvec4 expected_result = {0xffc00000, 0x7f800000, 0xff800000, 0x3f800000}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + const struct uvec4 *value = get_readback_uvec4(&rb, x, y); + ok(compare_uvec4(value, &expected_result), + "Got unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x} at (%u, %u).\n", + value->x, value->y, value->z, value->w, x, y); + } + } + release_texture_readback(&rb); + + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -8645,4 +8728,5 @@ START_TEST(device) test_input_assembler(); test_null_sampler(); test_immediate_constant_buffer(); + test_fp_specials(); }

1 0

Józef Kucia : wined3d: Recognize SM5 vocp register.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: dee9d1403a4df348639454ed6ed57696af47f586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee9d1403a4df348639454ed6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:18 2016 +0200 wined3d: Recognize SM5 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d671ad0..6d4155b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1779,6 +1779,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vicp"); break; + case WINED3DSPR_OUTCONTROLPOINT: + shader_addline(buffer, "vocp"); + break; + case WINED3DSPR_PATCHCONST: shader_addline(buffer, "vpc"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c8fdb32..24af95d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -259,6 +259,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, + WINED3D_SM5_RT_OUTPUT_CONTROL_POINT = 0x1a, WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, @@ -877,7 +878,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_INPUT_CONTROL_POINT */ WINED3DSPR_INCONTROLPOINT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_OUTPUT_CONTROL_POINT */ WINED3DSPR_OUTCONTROLPOINT, /* WINED3D_SM5_RT_PATCH_CONSTANT_DATA */ WINED3DSPR_PATCHCONST, /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41c127b..b5c10a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -385,6 +385,7 @@ enum wined3d_shader_register_type WINED3DSPR_OUTPOINTID, WINED3DSPR_FORKINSTID, WINED3DSPR_INCONTROLPOINT, + WINED3DSPR_OUTCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM,

1 0

Józef Kucia : wined3d: Implement SM4 umin instruction.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 4a5146a7e7005cda37a105908e016495e86399b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5146a7e7005cda37a105908… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:19 2016 +0200 wined3d: Implement SM4 umin instruction. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 24c1194..179785d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5397,6 +5397,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_ULT */ NULL, /* WINED3DSIH_UMAX */ NULL, + /* WINED3DSIH_UMIN */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5e23920..3a6af83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3538,6 +3538,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; case WINED3DSIH_UMAX: instruction = "max"; break; + case WINED3DSIH_UMIN: instruction = "min"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; @@ -8814,6 +8815,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop, /* WINED3DSIH_UMAX */ shader_glsl_map2gl, + /* WINED3DSIH_UMIN */ shader_glsl_map2gl, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6d4155b..01482ad 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -227,6 +227,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_ULT */ "ult", /* WINED3DSIH_UMAX */ "umax", + /* WINED3DSIH_UMIN */ "umin", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 24af95d..b7e9935 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -182,6 +182,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ULT = 0x4f, WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_UMAX = 0x53, + WINED3D_SM4_OP_UMIN = 0x54, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -762,6 +763,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"}, {WINED3D_SM4_OP_UMAX, WINED3DSIH_UMAX, "u", "uu"}, + {WINED3D_SM4_OP_UMIN, WINED3DSIH_UMIN, "u", "uu"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "f", "u"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "u", "uu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5c10a2..7e94193 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -743,6 +743,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UGE, WINED3DSIH_ULT, WINED3DSIH_UMAX, + WINED3DSIH_UMIN, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0