wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Ziqing Hui : d3dx10: Add D3DX10GetImageInfoFromFile{A, W}() stub implementation.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 4d0f38b86cc806691cafe447bde288040f8f27b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0f38b86cc806691cafe447… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 4 09:31:04 2020 +0800 d3dx10: Add D3DX10GetImageInfoFromFile{A, W}() stub implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/d3dx10_43_main.c | 16 ++++++++++++++++ include/d3dx10tex.h | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 36c7633d8e..0ce059dc5e 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -49,8 +49,8 @@ @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) @ stdcall D3DX10GetFeatureLevel1(ptr ptr) -@ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) -@ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 005b234437..aa5c961d0e 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -297,6 +297,22 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); } +HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result) +{ + FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_a(src_file), pump, info, result); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result) +{ + FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), pump, info, result); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) { diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 98cb82c0c9..6efd6b0734 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -140,8 +140,16 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter); + +HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result); +HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, + HRESULT *result); +#define D3DX10GetImageInfoFromFile WINELIB_NAME_AW(D3DX10GetImageInfoFromFile) + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); + HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, ID3D10Resource *dst_texture);

1 0

Paul Gofman : d3dcompiler: Fill texture fields in D3D11_SHADER_VARIABLE_DESC with default values.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 56aeb4591b053b5d4ff26ecd698138f1c8f80d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56aeb4591b053b5d4ff26ecd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 23:39:05 2020 +0300 d3dcompiler: Fill texture fields in D3D11_SHADER_VARIABLE_DESC with default values. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 6 ++++++ dlls/d3dcompiler_43/tests/reflection.c | 13 +++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3c4a94f8e5..10558283dd 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -857,6 +857,12 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( desc->uFlags = This->flags; desc->DefaultValue = This->default_value; + /* TODO test and set proper values for texture. */ + desc->StartTexture = 0xffffffff; + desc->TextureSize = 0; + desc->StartSampler = 0xffffffff; + desc->SamplerSize = 0; + return S_OK; } diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index c37a9709c2..f856aee43d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1783,13 +1783,10 @@ static void test_reflection_constant_buffer(void) ok(vdesc.uFlags == pvdesc->uFlags, "Got unexpected uFlags %#x, i %u.\n", vdesc.uFlags, i); ok(vdesc.DefaultValue == pvdesc->DefaultValue, "Got unexpected DefaultValue %p, i %u.\n", vdesc.DefaultValue, i); - todo_wine_if(D3D_COMPILER_VERSION) - { - ok(vdesc.StartTexture == 0xffffffff, "Got unexpected StartTexture %#x, i %u.\n", vdesc.StartTexture, i); - ok(!vdesc.TextureSize, "Got unexpected TextureSize %u, i %u.\n", vdesc.TextureSize, i); - ok(vdesc.StartSampler == 0xffffffff, "Got unexpected StartSampler %u, i %u.\n", vdesc.StartSampler, i); - ok(!vdesc.SamplerSize, "Got unexpected SamplerSize %u, i %u.\n", vdesc.SamplerSize, i); - } + ok(vdesc.StartTexture == 0xffffffff, "Got unexpected StartTexture %#x, i %u.\n", vdesc.StartTexture, i); + ok(!vdesc.TextureSize, "Got unexpected TextureSize %u, i %u.\n", vdesc.TextureSize, i); + ok(vdesc.StartSampler == 0xffffffff, "Got unexpected StartSampler %u, i %u.\n", vdesc.StartSampler, i); + ok(!vdesc.SamplerSize, "Got unexpected SamplerSize %u, i %u.\n", vdesc.SamplerSize, i); if (ref12) { @@ -1798,7 +1795,7 @@ static void test_reflection_constant_buffer(void) hr = v12->lpVtbl->GetDesc(v12, &vdesc12); ok(hr == S_OK, "Got unexpected hr %#x, i %u.\n", hr, i); ok(!strcmp(vdesc12.Name, pvdesc->Name), "Got unexpected name \"%s\", i %u", vdesc12.Name, i); - todo_wine ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, + ok(!memcmp(&vdesc12.StartOffset, &vdesc.StartOffset, sizeof(vdesc) - offsetof(D3D11_SHADER_VARIABLE_DESC, StartOffset)), "D3D11 and D3D12 descs do not match.\n"); }

1 0

Paul Gofman : d3dcompiler/tests: Test d3d12 interface in test_reflection_constant_buffer().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e92adb98be0a26e9f470f056145cc3c8330014dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92adb98be0a26e9f470f056… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 8 22:41:45 2020 +0200 d3dcompiler/tests: Test d3d12 interface in test_reflection_constant_buffer(). Signed-off-by: Paul Gofman <pgofman(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/reflection.c | 287 ++++++++++++++++++++++++--------- 1 file changed, 211 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e92adb98be0a26e9f470…

1 0

Paul Gofman : d3dcompiler: Set range id to bind point for sm < 5.1.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e7a499f8eff0d1aa329c754948f07c5f645ed465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a499f8eff0d1aa329c7549… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:47 2020 +0300 d3dcompiler: Set range id to bind point for sm < 5.1. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3b45161510..3c4a94f8e5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1544,7 +1544,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c else { desc->Space = 0; - desc->uID = 0; + desc->uID = desc->BindPoint; } } }

1 0

Paul Gofman : d3dcompiler/tests: Test d3d12 interface in test_reflection_desc_vs().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e446aee65292e4ba6081fd0efca25712dab5b4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e446aee65292e4ba6081fd0e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:46 2020 +0300 d3dcompiler/tests: Test d3d12 interface in test_reflection_desc_vs(). Signed-off-by: Paul Gofman <pgofman(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/reflection.c | 140 ++++++++++++++++++++++----------- 1 file changed, 94 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e446aee65292e4ba6081…

1 0

Paul Gofman : d3dcompiler/tests: Add test for reflection interfaces.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 97c472523799772378b742b4d554f4a003b77a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c472523799772378b742b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:45 2020 +0300 d3dcompiler/tests: Add test for reflection interfaces. Signed-off-by: Paul Gofman <pgofman(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/reflection.c | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index dee88776fa..1fc02d82bb 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -157,6 +157,66 @@ static void test_reflection_references(void) } #endif +#if D3D_COMPILER_VERSION +static void test_reflection_interfaces(void) +{ + ID3D12ShaderReflection *ref12 = NULL; + ID3D11ShaderReflection *ref11; + HRESULT hr, expected_hr; + IUnknown *iface, *iunk; + ULONG count; + + expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; + hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); + /* Broken with older d3dcompiler_47. */ + ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + + if (hr != S_OK) + return; + + hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D11ShaderReflection, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (void *)ref12, "Got unexpected interfaces %p, %p.\n", iface, ref12); + hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == iunk, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iunk); + iface->lpVtbl->Release(iface); + + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_IUnknown, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (IUnknown *)ref12, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D12ShaderReflection, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (void *)ref11, "Got unexpected interfaces %p, %p.\n", iface, ref11); + hr = iface->lpVtbl->QueryInterface(iface, &IID_IUnknown, (void **)&iunk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == iunk, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iunk); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_IUnknown, (void **)&iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(iface == (IUnknown *)ref11, "Got unexpected iface %p.\n", iface); + iface->lpVtbl->Release(iface); + + hr = ref11->lpVtbl->QueryInterface(ref11, &IID_ID3D10ShaderReflection, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + hr = ref12->lpVtbl->QueryInterface(ref12, &IID_ID3D10ShaderReflection, (void **)&iface); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + count = ref12->lpVtbl->Release(ref12); + ok(!count, "Got unexpected ref count %u.\n", count); + count = ref11->lpVtbl->Release(ref11); + ok(!count, "Got unexpected ref count %u.\n", count); +} +#endif + /* * fxc.exe /E VS /Tvs_4_1 /Fx */ @@ -1802,6 +1862,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); + test_reflection_interfaces(); #endif test_reflection_desc_vs(); test_reflection_desc_ps();

1 0

Paul Gofman : d3dcompiler: Support ID3D12ShaderReflection interface in D3DReflect().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 602e0485275aee4574cb32c7bca15c753cfd304e URL: https://source.winehq.org/git/wine.git/?a=commit;h=602e0485275aee4574cb32c7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 2 22:28:44 2020 +0300 d3dcompiler: Support ID3D12ShaderReflection interface in D3DReflect(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a081b20d68..3b45161510 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -93,6 +93,13 @@ struct d3dcompiler_shader_reflection_constant_buffer struct d3dcompiler_shader_reflection_variable *variables; }; +enum D3DCOMPILER_REFLECTION_VERSION +{ + D3DCOMPILER_REFLECTION_VERSION_D3D10, + D3DCOMPILER_REFLECTION_VERSION_D3D11, + D3DCOMPILER_REFLECTION_VERSION_D3D12, +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -100,6 +107,8 @@ struct d3dcompiler_shader_reflection ID3D10ShaderReflection ID3D10ShaderReflection_iface; LONG refcount; + enum D3DCOMPILER_REFLECTION_VERSION interface_version; + DWORD target; char *creator; UINT flags; @@ -332,7 +341,8 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection) - || IsEqualGUID(riid, &IID_IUnknown)) + || IsEqualGUID(riid, &IID_IUnknown) + || (D3D_COMPILER_VERSION >= 47 && IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { IUnknown_AddRef(iface); *object = iface; @@ -486,7 +496,9 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - memcpy(desc, &reflection->bound_resources[index], sizeof(*desc)); + memcpy(desc, &reflection->bound_resources[index], + reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } @@ -583,7 +595,7 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName( ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); unsigned int i; TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc); @@ -594,14 +606,15 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin return E_INVALIDARG; } - for (i = 0; i < This->bound_resource_count; ++i) + for (i = 0; i < reflection->bound_resource_count; ++i) { - D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i]; + D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i]; if (!strcmp(d->Name, name)) { TRACE("Returning D3D11_SHADER_INPUT_BIND_DESC %p.\n", d); - memcpy(desc, d, sizeof(*desc)); + memcpy(desc, d, reflection->interface_version == D3DCOMPILER_REFLECTION_VERSION_D3D12 + ? sizeof(D3D12_SHADER_INPUT_BIND_DESC) : sizeof(D3D11_SHADER_INPUT_BIND_DESC)); return S_OK; } } @@ -2308,6 +2321,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad } object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; + object->interface_version = D3DCOMPILER_REFLECTION_VERSION_D3D10; object->refcount = 1; hr = d3dcompiler_shader_reflection_init(object, data, data_size); @@ -2350,7 +2364,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void #endif } - if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) + if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection) + && (D3D_COMPILER_VERSION < 47 || !IsEqualGUID(riid, &IID_ID3D12ShaderReflection))) { WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection)); #if D3D_COMPILER_VERSION >= 46 @@ -2366,6 +2381,8 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; object->refcount = 1; + object->interface_version = IsEqualGUID(riid, &IID_ID3D12ShaderReflection) + ? D3DCOMPILER_REFLECTION_VERSION_D3D12 : D3DCOMPILER_REFLECTION_VERSION_D3D11; hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr))

1 0

Nikolay Sivov : evr/mixer: Return initial mixing preferences.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 8827eb6a83348057293f89be535ccb74607db608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8827eb6a83348057293f89be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:06:01 2020 +0300 evr/mixer: Return initial mixing preferences. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 24 ++++++++++++++++++++---- dlls/evr/tests/evr.c | 15 ++++++++++++++- include/evr.idl | 10 ++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 7e08beae35..c7dbf8ff97 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -73,6 +73,7 @@ struct video_mixer IDirect3DDeviceManager9 *device_manager; IMediaEventSink *event_sink; IMFAttributes *attributes; + unsigned int mixing_flags; CRITICAL_SECTION cs; }; @@ -1008,16 +1009,31 @@ static HRESULT WINAPI video_mixer_control_GetStreamOutputRect(IMFVideoMixerContr static HRESULT WINAPI video_mixer_control_SetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD flags) { - FIXME("%p, %#x.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, flags); + + EnterCriticalSection(&mixer->cs); + mixer->mixing_flags = flags; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_control_GetMixingPrefs(IMFVideoMixerControl2 *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFVideoMixerControl2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (!flags) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + *flags = mixer->mixing_flags; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static const IMFVideoMixerControl2Vtbl video_mixer_control_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ba97eba53d..92810b516a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -414,6 +414,7 @@ static void test_default_mixer(void) { DWORD input_min, input_max, output_min, output_max; IMFAttributes *attributes, *attributes2; + IMFVideoMixerControl2 *mixer_control2; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; DWORD input_count, output_count; @@ -424,12 +425,12 @@ static void test_default_mixer(void) IMFTransform *transform; DXVA2_ValueRange range; DXVA2_Fixed32 value; + DWORD flags, count; IMFGetService *gs; COLORREF color; unsigned int i; DWORD ids[16]; IUnknown *unk; - DWORD count; GUID *guids; HRESULT hr; IID iid; @@ -455,6 +456,18 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + if (SUCCEEDED(IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, (void **)&mixer_control2))) + { + hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMixerControl2_GetMixingPrefs(mixer_control2, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + + IMFVideoMixerControl2_Release(mixer_control2); + } + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); diff --git a/include/evr.idl b/include/evr.idl index 6369a39b2f..77c46a075f 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -184,6 +184,16 @@ interface IMFVideoMixerControl : IUnknown ); } +typedef enum _MFVideoMixPrefs +{ + MFVideoMixPrefs_ForceHalfInterlace = 0x00000001, + MFVideoMixPrefs_AllowDropToHalfInterlace = 0x00000002, + MFVideoMixPrefs_AllowDropToBob = 0x00000004, + MFVideoMixPrefs_ForceBob = 0x00000008, + MFVideoMixPrefs_EnableRotation = 0x00000010, + MFVideoMixPrefs_Mask = 0x0000001f, +} MFVideoMixPrefs; + [ object, uuid(8459616d-966e-4930-b658-54fa7e5a16d3)

1 0

Nikolay Sivov : mf/evr: Add GetMajorType() for the stream sink.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 3d8d05dbeb373bc2189d74bb48a433618c62e90f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8d05dbeb373bc2189d74bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:06:00 2020 +0300 mf/evr: Add GetMajorType() for the stream sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 13 +++++++++++-- dlls/mf/tests/mf.c | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index b27610e073..31bc110ea4 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -385,9 +385,18 @@ static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { - FIXME("%p, %p.\n", iface, type); + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + if (!type) + return E_POINTER; + + memcpy(type, &MFMediaType_Video, sizeof(*type)); + return S_OK; } static const IMFMediaTypeHandlerVtbl video_stream_type_handler_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7013939ab0..2c02b1d8e5 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3236,16 +3236,19 @@ todo_wine static void test_evr(void) { IMFMediaEventGenerator *ev_generator; + IMFMediaTypeHandler *type_handler; IMFVideoRenderer *video_renderer; IMFClockStateSink *clock_sink; IMFMediaSinkPreroll *preroll; IMFMediaSink *sink, *sink2; + IMFStreamSink *stream_sink; IMFActivate *activate; DWORD flags, count; IMFGetService *gs; IUnknown *unk; UINT64 value; HRESULT hr; + GUID guid; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -3267,6 +3270,23 @@ static void test_evr(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + /* Primary stream type handler. */ + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + + IMFStreamSink_Release(stream_sink); + IMFMediaTypeHandler_Release(type_handler); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags);

1 0

Nikolay Sivov : mf/evr: Add a IMFMediaTypeHandler stub for input video streams.
by Alexandre Julliard 08 Sep '20

08 Sep '20

Module: wine Branch: master Commit: 3625f762500970d1ae3d4b21a6fd23cf4a0f0c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3625f762500970d1ae3d4b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 8 11:05:59 2020 +0300 mf/evr: Add a IMFMediaTypeHandler stub for input video streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 161c0d9b73..b27610e073 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -37,6 +37,7 @@ struct video_renderer; struct video_stream { IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; unsigned int id; struct video_renderer *parent; @@ -114,6 +115,11 @@ static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); } +static struct video_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct video_stream, IMFMediaTypeHandler_iface); +} + static void video_renderer_release_services(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; @@ -137,12 +143,26 @@ static void video_renderer_release_services(struct video_renderer *renderer) static HRESULT WINAPI video_stream_sink_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { + struct video_stream *stream = impl_from_IMFStreamSink(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + *obj = NULL; + if (IsEqualIID(riid, &IID_IMFStreamSink) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFStreamSink_AddRef(iface); + } + else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) + { + *obj = &stream->IMFMediaTypeHandler_iface; + } + + if (*obj) + { + IUnknown_AddRef((IUnknown *)*obj); return S_OK; } @@ -252,9 +272,20 @@ static HRESULT WINAPI video_stream_sink_GetIdentifier(IMFStreamSink *iface, DWOR static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - FIXME("%p, %p.\n", iface, handler); + struct video_stream *stream = impl_from_IMFStreamSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, handler); + + if (!handler) + return E_POINTER; + + if (!stream->parent) + return MF_E_STREAMSINK_REMOVED; + + *handler = &stream->IMFMediaTypeHandler_iface; + IMFMediaTypeHandler_AddRef(*handler); + + return S_OK; } static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) @@ -296,6 +327,82 @@ static const IMFStreamSinkVtbl video_stream_sink_vtbl = video_stream_sink_Flush, }; +static HRESULT WINAPI video_stream_typehandler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, + void **obj) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI video_stream_typehandler_AddRef(IMFMediaTypeHandler *iface) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) +{ + struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + FIXME("%p, %p.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_stream_typehandler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + FIXME("%p, %p.\n", iface, type); + + return E_NOTIMPL; +} + +static const IMFMediaTypeHandlerVtbl video_stream_type_handler_vtbl = +{ + video_stream_typehandler_QueryInterface, + video_stream_typehandler_AddRef, + video_stream_typehandler_Release, + video_stream_typehandler_IsMediaTypeSupported, + video_stream_typehandler_GetMediaTypeCount, + video_stream_typehandler_GetMediaTypeByIndex, + video_stream_typehandler_SetCurrentMediaType, + video_stream_typehandler_GetCurrentMediaType, + video_stream_typehandler_GetMajorType, +}; + static HRESULT video_renderer_stream_create(struct video_renderer *renderer, unsigned int id, struct video_stream **ret) { @@ -306,6 +413,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; + stream->IMFMediaTypeHandler_iface.lpVtbl = &video_stream_type_handler_vtbl; stream->refcount = 1; if (FAILED(hr = MFCreateEventQueue(&stream->event_queue)))

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020