January 2019 - Wine-commits

Sven Baars : gdiplus/tests: Add some font family pointer tests.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 5f25d7a9a9f2ed626e5342adef8879fee26a73e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f25d7a9a9f2ed626e5342ad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jan 26 15:23:04 2019 +0100 gdiplus/tests: Add some font family pointer tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 03e7a04..33b75c5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -141,6 +141,8 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); +todo_wine + ok (fontfamily == fontfamily2, "Unexpected family instance.\n"); ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); @@ -343,6 +345,8 @@ static void test_fontfamily (void) ZeroMemory (itsName, sizeof(itsName)); stat = GdipCloneFontFamily(family, &clonedFontFamily); expect (Ok, stat); +todo_wine + ok (family == clonedFontFamily, "Unexpected family instance.\n"); GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); @@ -1187,8 +1191,9 @@ todo_wine static void test_GdipGetFontCollectionFamilyList(void) { - GpFontFamily *family, *family2; + GpFontFamily *family, *family2, **families; GpFontCollection *collection; + UINT i; INT found, count; GpStatus status; @@ -1228,15 +1233,32 @@ static void test_GdipGetFontCollectionFamilyList(void) ok(found == 1, "Unexpected list count %d.\n", found); ok(family != NULL, "Expected family instance.\n"); - family = NULL; + family2 = NULL; found = 0; status = GdipGetFontCollectionFamilyList(collection, 1, &family2, &found); ok(status == Ok, "Failed to get family list, status %d.\n", status); ok(found == 1, "Unexpected list count %d.\n", found); - ok(family2 != family, "Unexpected family instance.\n"); +todo_wine + ok(family2 == family, "Unexpected family instance.\n"); - GdipDeleteFontFamily(family); - GdipDeleteFontFamily(family2); + status = GdipDeleteFontFamily(family); + expect(Ok, status); + + status = GdipDeleteFontFamily(family2); + expect(Ok, status); + + families = GdipAlloc((count + 1) * sizeof(*families)); + found = 0; + status = GdipGetFontCollectionFamilyList(collection, count + 1, families, &found); + ok(status == Ok, "Failed to get family list, status %d.\n", status); + ok(found == count, "Unexpected list count %d, extected %d.\n", found, count); + + for (i = 0; i < found; i++) + { + status = GdipDeleteFontFamily(families[i]); + expect(Ok, status); + } + GdipFree(families); } static void test_GdipGetFontCollectionFamilyCount(void)

1 0

Matteo Bruni : d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 4ee4b35cb274cfecbeff7d3452f85f7b38d33696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4b35cb274cfecbeff7d34… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:03 2019 +0100 d3d9/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 218 +++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ee4b35cb274cfecbeff…

1 0

Matteo Bruni : d3d9/tests: Test D3D9Ex vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 2feea1a4b1fb582fbb0c383e05b7da1c4a5f95dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2feea1a4b1fb582fbb0c383e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:04 2019 +0100 d3d9/tests: Test D3D9Ex vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 3e94c2b..5260fcd 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -33,6 +33,7 @@ static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -178,6 +179,8 @@ static IDirect3DDevice9Ex *create_device(HWND focus_window, const struct device_ present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; } mode.Size = sizeof(mode); @@ -4753,6 +4756,99 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_pinned_buffers(void) +{ + static const struct + { + DWORD device_flags; + DWORD usage; + D3DPOOL pool; + } + tests[] = + { + {CREATE_DEVICE_SWVP_ONLY, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DPOOL_DEFAULT}, + {0, 0, D3DPOOL_SYSTEMMEM}, + }; + static const unsigned int vertex_count = 1024; + struct device_desc device_desc; + IDirect3DVertexBuffer9 *buffer; + IDirect3DDevice9Ex *device; + D3DVERTEXBUFFER_DESC desc; + unsigned int i, test; + struct vec3 + { + float x, y, z; + } *ptr, *ptr2; + UINT refcount; + HWND window; + HRESULT hr; + + window = create_window(); + + for (test = 0; test < ARRAY_SIZE(tests); ++test) + { + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = tests[test].device_flags; + if (!(device = create_device(window, &device_desc))) + { + skip("Test %u: failed to create a D3D device.\n", test); + continue; + } + + hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), + tests[test].usage, 0, tests[test].pool, &buffer, NULL); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(desc.Pool == tests[test].pool, "Test %u: got unexpected pool %#x.\n", test, desc.Pool); + ok(desc.Usage == tests[test].usage, "Test %u: got unexpected usage %#x.\n", test, desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DDevice9Ex_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_BeginScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + hr = IDirect3DDevice9Ex_EndScene(device); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + ok(ptr2 == ptr, "Test %u: got unexpected ptr2 %p, expected %p.\n", test, ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Test %u: got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + test, i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Test %u: got unexpected hr %#x.\n", test, hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Test %u: device has %u references left.\n", test, refcount); + } + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4806,4 +4902,5 @@ START_TEST(d3d9ex) test_frame_latency(); test_resource_access(); test_sysmem_draw(); + test_pinned_buffers(); }

1 0

Matteo Bruni : d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 8384452d199f234bf2fb61ca64e1c87571e28f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8384452d199f234bf2fb61ca… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:05 2019 +0100 d3d8/tests: Test D3DPOOL_SYSTEMMEM vertex buffer lock address stability. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 213 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8384452d199f234bf2fb…

1 0

Matteo Bruni : d3d9: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: f891bb847b67505cb8e22d8e5d8b0ac6ffc0ff68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f891bb847b67505cb8e22d8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:06 2019 +0100 d3d9: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed1fedf..83db304 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2856,7 +2856,7 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2961,7 +2961,7 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : d3d8: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 955744e0c9749210f8dc379a979dad6c2acaf868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955744e0c9749210f8dc379a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:07 2019 +0100 d3d8: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ab34d..a113e57 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2385,7 +2385,7 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -2480,7 +2480,7 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : ddraw: Drop map read access from the internal buffers used for user-pointer draws.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 3c87df0bc06761be4fa12ff8f64674b5c078311c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c87df0bc06761be4fa12ff8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 25 18:15:08 2019 +0100 ddraw: Drop map read access from the internal buffers used for user-pointer draws. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 48803f8..4b58b75 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3471,7 +3471,7 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -3663,7 +3663,7 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m desc.byte_width = size; desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2ba29a7..4b4af63 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -131,8 +131,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, desc.byte_width = new_size * sizeof(*indices); desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -639,7 +638,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer)))

1 0

Nikolay Sivov : d3dx9: Use wincodecs directly without initializing COM system.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 77c3761ad4e557f9fa311299e77746bf225a575a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77c3761ad4e557f9fa311299… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 28 15:51:46 2019 +0300 d3dx9: Use wincodecs directly without initializing COM system. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 1 + dlls/d3dx9_25/Makefile.in | 1 + dlls/d3dx9_26/Makefile.in | 1 + dlls/d3dx9_27/Makefile.in | 1 + dlls/d3dx9_28/Makefile.in | 1 + dlls/d3dx9_29/Makefile.in | 1 + dlls/d3dx9_30/Makefile.in | 1 + dlls/d3dx9_31/Makefile.in | 1 + dlls/d3dx9_32/Makefile.in | 1 + dlls/d3dx9_33/Makefile.in | 1 + dlls/d3dx9_34/Makefile.in | 1 + dlls/d3dx9_35/Makefile.in | 1 + dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/surface.c | 37 +++++++++++++------------------------ dlls/d3dx9_37/Makefile.in | 1 + dlls/d3dx9_38/Makefile.in | 1 + dlls/d3dx9_39/Makefile.in | 1 + dlls/d3dx9_40/Makefile.in | 1 + dlls/d3dx9_41/Makefile.in | 1 + dlls/d3dx9_42/Makefile.in | 1 + dlls/d3dx9_43/Makefile.in | 1 + 21 files changed, 33 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77c3761ad4e557f9fa31…

1 0

Andrey Gusev : d3dcompiler: Add support for two other versions of ID3D11ShaderReflection.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: d52b53d151cc2862bf3396298916da693d80198f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52b53d151cc2862bf339629… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 28 19:40:02 2019 +0100 d3dcompiler: Add support for two other versions of ID3D11ShaderReflection. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 9 +++++++++ include/d3d11shader.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5a59c64..b36631b 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -665,6 +665,14 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( return 0; } +static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( + ID3D11ShaderReflection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = { /* IUnknown methods */ @@ -690,6 +698,7 @@ static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtb d3dcompiler_shader_reflection_GetNumInterfaceSlots, d3dcompiler_shader_reflection_GetMinFeatureLevel, d3dcompiler_shader_reflection_GetThreadGroupSize, + d3dcompiler_shader_reflection_GetRequiresFlags, }; /* ID3D11ShaderReflectionConstantBuffer methods */ diff --git a/include/d3d11shader.h b/include/d3d11shader.h index f9c3b95..479020a 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -174,7 +174,13 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) }; #undef INTERFACE +#if D3D_COMPILER_VERSION <= 42 +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x17f27486, 0xa342, 0x4d10, 0x88, 0x42, 0xab, 0x08, 0x74, 0xe7, 0xf6, 0x70); +#elif D3D_COMPILER_VERSION == 43 DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, 0x20, 0x3b, 0x8b, 0x1d, 0x9c, 0xc1); +#else +DEFINE_GUID(IID_ID3D11ShaderReflection, 0x8d536ca1, 0x0cca, 0x4956, 0xa8, 0x37, 0x78, 0x69, 0x63, 0x75, 0x55, 0x84); +#endif #define INTERFACE ID3D11ShaderReflection DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) @@ -202,6 +208,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(UINT, GetNumInterfaceSlots)(THIS) PURE; STDMETHOD(GetMinFeatureLevel)(THIS_ enum D3D_FEATURE_LEVEL *level) PURE; STDMETHOD_(UINT, GetThreadGroupSize)(THIS_ UINT *sizex, UINT *sizey, UINT *sizez) PURE; + STDMETHOD_(UINT64, GetRequiresFlags)(THIS) PURE; }; #undef INTERFACE

1 0

David Adam : d3dx9/tests: Add more tests for D3DXMatrixTransformation().
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 956d7356e0559a07aac68bcaf73a5005e0600fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=956d7356e0559a07aac68bca… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Jan 28 19:40:03 2019 +0100 d3dx9/tests: Add more tests for D3DXMatrixTransformation(). Most of those new tests were written by Rico Schüller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33456 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 705 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 705 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=956d7356e0559a07aac6…

1 0