June 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : evr: Add IMFTopologyServiceLookupClient stub for default mixer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 186ed57ba5c9dc9e791d234372e2318e3a1f8628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186ed57ba5c9dc9e791d2343… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:35 2020 +0300 evr: Add IMFTopologyServiceLookupClient stub for default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 97eaf976fc..3101d17ffd 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -30,6 +30,7 @@ struct video_mixer { IMFTransform IMFTransform_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; + IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; LONG refcount; }; @@ -43,6 +44,11 @@ static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoDeviceID_iface); } +static struct video_mixer *impl_from_IMFTopologyServiceLookupClient(IMFTopologyServiceLookupClient *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFTopologyServiceLookupClient_iface); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -58,6 +64,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoDeviceID_iface; } + else if (IsEqualIID(riid, &IID_IMFTopologyServiceLookupClient)) + { + *obj = &mixer->IMFTopologyServiceLookupClient_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -328,6 +338,49 @@ static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl = video_mixer_device_id_GetDeviceID, }; +static HRESULT WINAPI video_mixer_service_client_QueryInterface(IMFTopologyServiceLookupClient *iface, + REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_service_client_AddRef(IMFTopologyServiceLookupClient *iface) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_service_client_Release(IMFTopologyServiceLookupClient *iface) +{ + struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, + IMFTopologyServiceLookup *service_lookup) +{ + FIXME("%p, %p.\n", iface, service_lookup); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFTopologyServiceLookupClientVtbl video_mixer_service_client_vtbl = +{ + video_mixer_service_client_QueryInterface, + video_mixer_service_client_AddRef, + video_mixer_service_client_Release, + video_mixer_service_client_InitServicePointers, + video_mixer_service_client_ReleaseServicePointers, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -352,6 +405,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; + object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_mixer_service_client_vtbl; object->refcount = 1; *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7fa6136b0e..56fb1680b0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -350,10 +350,8 @@ static void test_default_mixer(void) ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

André Hentschel : winedbg: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 4ebba430202e6120f26aaf81d44d082dec91911e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ebba430202e6120f26aaf81… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:25 2020 +0200 winedbg: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_ppc.c | 305 ------------------------------------------ programs/winedbg/gdbproxy.c | 4 - programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ebba430202e6120f26a…

1 0

André Hentschel : winetest: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: c0e3a265b5c37cad4ea8e63b40c1bd900b170595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e3a265b5c37cad4ea8e63b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:26 2020 +0200 winetest: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 9d6a318e9c..1731850bfd 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -344,8 +344,6 @@ static void print_version (void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__powerpc__) - static const char platform[] = "powerpc"; #elif defined(__arm__) static const char platform[] = "arm"; #elif defined(__aarch64__)

1 0

André Hentschel : libport: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: e7017c4a5617943903cfe1f1bdac897fe7b88e95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7017c4a5617943903cfe1f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:27 2020 +0200 libport: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index fb749bb75e..618b280881 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -114,23 +114,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -#elif defined(__powerpc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "mflr 0\n\t" /* get return address */ - "stw 0, 4(1)\n\t" /* save return address */ - "subi 5, 5, 16\n\t" /* reserve space on new stack */ - "stw 1, 12(5)\n\t" /* store old sp */ - "mtctr 3\n\t" /* func -> ctr */ - "mr 3,4\n\t" /* args -> function param 1 (r3) */ - "mr 1,5\n\t" /* stack */ - "li 0, 0\n\t" /* zero */ - "stw 0, 0(1)\n\t" /* bottom of stack */ - "stwu 1, -16(1)\n\t" /* create a frame for this function */ - "bctrl\n\t" /* call ctr */ - "lwz 1, 28(1)\n\t" /* fetch old sp */ - "lwz 0, 4(1)\n\t" /* fetch return address */ - "mtlr 0\n\t" /* return address -> lr */ - "blr") /* return */ #elif defined(__arm__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, "push {r4,LR}\n\t" /* save return address on stack */

1 0

André Hentschel : dbghelp: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 30f17befaf216a42a4e2cfbca3ed7bdce43e476a URL: https://source.winehq.org/git/wine.git/?a=commit;h=30f17befaf216a42a4e2cfbc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:28 2020 +0200 dbghelp: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/cpu_ppc.c | 100 ----------------------------------------------- dlls/dbghelp/dbghelp.c | 6 +-- 3 files changed, 2 insertions(+), 105 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 076c50323d..a370b94e7c 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -10,7 +10,6 @@ C_SRCS = \ cpu_arm.c \ cpu_arm64.c \ cpu_i386.c \ - cpu_ppc.c \ cpu_x86_64.c \ dbghelp.c \ dwarf.c \ diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c deleted file mode 100644 index 80db2be704..0000000000 --- a/dlls/dbghelp/cpu_ppc.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - * File cpu_ppc.c - * - * Copyright (C) 2009-2009, Eric Pouech. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -static BOOL ppc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) -{ - switch (ca) - { -#if defined(__powerpc__) - case cpu_addr_pc: - addr->Mode = AddrModeFlat; - addr->Segment = 0; /* don't need segment */ - addr->Offset = ctx->Iar; - return TRUE; -#endif - default: - case cpu_addr_stack: - case cpu_addr_frame: - FIXME("not done\n"); - } - return FALSE; -} - -static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, STACKFRAME64 *frame, - union ctx *ctx) -{ - FIXME("not done\n"); - return FALSE; -} - -static unsigned ppc_map_dwarf_register(unsigned regno, const struct module* module, BOOL eh_frame) -{ - FIXME("not done\n"); - return 0; -} - -static void *ppc_fetch_context_reg(union ctx *ctx, unsigned regno, unsigned *size) -{ - FIXME("NIY\n"); - return NULL; -} - -static const char* ppc_fetch_regname(unsigned regno) -{ - FIXME("Unknown register %x\n", regno); - return NULL; -} - -static BOOL ppc_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) -{ - FIXME("NIY\n"); - return FALSE; -} - -static BOOL ppc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) -{ - FIXME("NIY\n"); - return FALSE; -} - -DECLSPEC_HIDDEN struct cpu cpu_ppc = { - IMAGE_FILE_MACHINE_POWERPC, - 4, - CV_REG_NONE, /* FIXME */ - ppc_get_addr, - ppc_stack_walk, - NULL, - ppc_map_dwarf_register, - ppc_fetch_context_reg, - ppc_fetch_regname, - ppc_fetch_minidump_thread, - ppc_fetch_minidump_module, -}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 67e249f6a0..a2dba4cfe3 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -147,16 +147,14 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64; +extern struct cpu cpu_i386, cpu_x86_64, cpu_arm, cpu_arm64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_arm, &cpu_arm64, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_arm, &cpu_arm64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 #elif defined(__x86_64__) &cpu_x86_64 -#elif defined(__powerpc__) - &cpu_ppc #elif defined(__arm__) &cpu_arm #elif defined(__aarch64__)

1 0

André Hentschel : kernel32/tests: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: d96fe8e1f73b18ededd99be594320b97b4c0efdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96fe8e1f73b18ededd99be5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:29 2020 +0200 kernel32/tests: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 -- dlls/kernel32/tests/loader.c | 2 -- dlls/kernel32/tests/module.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7001baa173..0f2c00d75a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2309,8 +2309,6 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #elif defined __x86_64__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; -#elif defined __powerpc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4bafd0f634..59965984a6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -105,8 +105,6 @@ static const IMAGE_NT_HEADERS nt_header_template = IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ -#elif defined __powerpc__ - IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 59510442fe..6eb2fc804d 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -68,8 +68,6 @@ static const struct IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ IMAGE_FILE_MACHINE_AMD64, /* Machine */ -#elif defined __powerpc__ - IMAGE_FILE_MACHINE_POWERPC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__

1 0

André Hentschel : setupapi: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: e9f030876b8ffd646ced481b2bf33cb2ad760cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f030876b8ffd646ced481b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:30 2020 +0200 setupapi: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8cb80a9ef1..e83bbb2512 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -280,8 +280,6 @@ static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARM64; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; -#elif defined __powerpc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; #else nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #endif

1 0

Alexandre Julliard : ntdll: Remove support for PPC32.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 2ec86fc20a49020a52cbec2727aca966642f9fac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec86fc20a49020a52cbec27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:34:26 2020 +0200 ntdll: Remove support for PPC32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 - dlls/ntdll/nt.c | 36 -- dlls/ntdll/process.c | 4 - dlls/ntdll/signal_powerpc.c | 170 ------- dlls/ntdll/unix/process.c | 4 - dlls/ntdll/unix/server.c | 2 - dlls/ntdll/unix/signal_powerpc.c | 999 --------------------------------------- 7 files changed, 1217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ec86fc20a49020a52cb…

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for struct field semantics.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: f26a58a61b3d65e3b0c4c894c0fb18769dc95f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26a58a61b3d65e3b0c4c894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:17 2020 -0500 d3dcompiler/tests: Add a test for struct field semantics. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 24829235a5..edff59b633 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -900,6 +900,54 @@ static void test_struct_assignment(void) release_test_context(&test_context); } +static void test_struct_semantics(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "struct input\n" + "{\n" + " struct\n" + " {\n" + " float4 texcoord : TEXCOORD0;\n" + " } m;\n" + "};\n" + "struct output\n" + "{\n" + " struct\n" + " {\n" + " float4 color : COLOR;\n" + " } m;\n" + "};\n" + "struct output main(struct input i)\n" + "{\n" + " struct output o;\n" + " o.m.color = i.m.texcoord;\n" + " return o;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 64, 48); + todo_wine ok(compare_vec4(&v, 0.1f, 0.1f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 320, 240); + todo_wine ok(compare_vec4(&v, 0.5f, 0.5f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) { @@ -1208,6 +1256,7 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_majority(); test_struct_assignment(); + test_struct_semantics(); test_constant_table(); test_fail();

1 0

Zebediah Figura : d3dcompiler/tests: Add a couple of extra tests for struct declaration syntax.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 549fa04cbd4020aeb6690200d70b684732a90c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=549fa04cbd4020aeb6690200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:18 2020 -0500 d3dcompiler/tests: Add a couple of extra tests for struct declaration syntax. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index edff59b633..d82a0b015a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -968,7 +968,7 @@ static void test_constant_table(void) { static const char *source = "typedef float3x3 matrix_t;\n" - "struct matrix_record { float3x3 a; };\n" + "struct matrix_record { float3x3 a; } dummy;\n" "uniform float4 a;\n" "uniform float b;\n" "uniform float unused;\n" @@ -1193,6 +1193,12 @@ static void test_fail(void) " o = float4(1, 1, 1, 1);\n" " return float4(0, 0, 0, 0);\n" "}", + + "struct {float4 a;};\n" + "float4 test() : SV_TARGET\n" + "{\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"};

1 0