February 2020 - Wine-commits

Matteo Bruni : maintainers: Drop Józef Kucia.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 4f81c1fa9ed61c1dfc887836b39de63c2769e876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f81c1fa9ed61c1dfc887836… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 25 18:40:38 2020 +0100 maintainers: Drop Józef Kucia. Goodbye Józef, you left us too soon. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6606d30ca7..c4f5b080b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -64,7 +64,6 @@ F: dlls/d2d*/ Direct3D M: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> -P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10*/ F: dlls/d3d11/ @@ -80,7 +79,6 @@ Direct3D helper libraries M: Matteo Bruni <mbruni(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> -P: Józef Kucia <jkucia(a)codeweavers.com> F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/

1 0

Matteo Bruni : maintainers: Move d3d10 and d3d10_1 under Direct3D helper libraries.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 91985f4b5bf0e123829da8a406b73545ad855e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91985f4b5bf0e123829da8a4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 25 18:54:50 2020 +0100 maintainers: Move d3d10 and d3d10_1 under Direct3D helper libraries. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c4f5b080b2..93e89193b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -65,7 +65,7 @@ Direct3D M: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> -F: dlls/d3d10*/ +F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ F: dlls/d3d8/ @@ -79,6 +79,8 @@ Direct3D helper libraries M: Matteo Bruni <mbruni(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> +F: dlls/d3d10/ +F: dlls/d3d10_1/ F: dlls/d3dcompiler*/ F: dlls/d3dx10*/ F: dlls/d3dx11*/

1 0

Connor McAdams : d3d10: Introduce an effect buffer variable structure.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 490bc0f19be0eaeb2e7f2fe7f777c491f7de5ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=490bc0f19be0eaeb2e7f2fe7… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Tue Feb 25 18:40:36 2020 +0100 d3d10: Introduce an effect buffer variable structure. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 10 ++++++++ dlls/d3d10/effect.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 96020cd4a0..f83ff0d4c9 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,6 +114,15 @@ struct d3d10_effect_state_object_variable } object; }; +struct d3d10_effect_buffer_variable +{ + ID3D10Buffer *buffer; + ID3D10ShaderResourceView *resource_view; + + BOOL changed; + BYTE *local_buffer; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { @@ -169,6 +178,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_buffer_variable buffer; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 91e713bdf5..3ee9bf7a35 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2096,6 +2096,55 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, return S_OK; } +static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBUFFER_TYPE type) +{ + D3D10_BUFFER_DESC buffer_desc; + D3D10_SUBRESOURCE_DATA subresource_data; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D10Device *device = v->effect->device; + HRESULT hr; + + if (!(v->u.buffer.local_buffer = heap_alloc_zero(v->type->size_unpacked))) + { + ERR("Failed to allocate local constant buffer memory.\n"); + return E_OUTOFMEMORY; + } + + buffer_desc.ByteWidth = v->type->size_unpacked; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + if (type == D3D10_CT_CBUFFER) + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + else + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + + subresource_data.pSysMem = v->u.buffer.local_buffer; + subresource_data.SysMemPitch = 0; + subresource_data.SysMemSlicePitch = 0; + + if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &v->u.buffer.buffer))) + return hr; + + if (type == D3D10_CT_TBUFFER) + { + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = v->type->size_unpacked / 16; + if (v->type->size_unpacked % 16) + WARN("Unexpected texture buffer size not a multiple of 16.\n"); + + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)v->u.buffer.buffer, + &srv_desc, &v->u.buffer.resource_view))) + return hr; + } + else + v->u.buffer.resource_view = NULL; + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *l) { @@ -2282,6 +2331,12 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); + if (l->type->size_unpacked) + { + if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + return hr; + } + return S_OK; } @@ -2760,6 +2815,13 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) } heap_free(l->annotations); } + + heap_free(l->u.buffer.local_buffer); + + if (l->u.buffer.buffer) + ID3D10Buffer_Release(l->u.buffer.buffer); + if (l->u.buffer.resource_view) + ID3D10ShaderResourceView_Release(l->u.buffer.resource_view); } /* IUnknown methods */

1 0

Matteo Bruni : d3dcompiler: Get rid of now unused BWRITERVS_SWIZZLE_{SHIFT, MASK}.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: d09962a472f3693e9ad91ac731252a9d7c4cca17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d09962a472f3693e9ad91ac7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 25 18:40:37 2020 +0100 d3dcompiler: Get rid of now unused BWRITERVS_SWIZZLE_{SHIFT, MASK}. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3146f57c59..22cc41db56 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -539,9 +539,6 @@ enum bwritershader_param_srcmod_type #define BWRITERPS_VERSION(major, minor) ((BWRITER_SM1_PS << 16) | ((major) << 8) | (minor)) #define BWRITERVS_VERSION(major, minor) ((BWRITER_SM1_VS << 16) | ((major) << 8) | (minor)) -#define BWRITERVS_SWIZZLE_SHIFT 16 -#define BWRITERVS_SWIZZLE_MASK (0xFF << BWRITERVS_SWIZZLE_SHIFT) - #define BWRITERVS_X_X (0) #define BWRITERVS_X_Y (1) #define BWRITERVS_X_Z (2)

1 0

Francois Gouget : gdi32/tests: Remove unnecessary metafile handle traces.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 0e7392040c910403e3418b4670e4cc30037025ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7392040c910403e3418b46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 25 18:42:35 2020 +0100 gdi32/tests: Remove unnecessary metafile handle traces. Tracing the handle values is not useful and increases the test report size. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f1caebbc9d..5a64fe6d60 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -179,8 +179,6 @@ static void test_ExtTextOut(void) hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); - trace("hdcDisplay %p\n", hdcDisplay); - SetMapMode(hdcDisplay, MM_TEXT); memset(&orig_lf, 0, sizeof(orig_lf)); @@ -207,8 +205,6 @@ static void test_ExtTextOut(void) hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); - ok(GetDeviceCaps(hdcMetafile, TECHNOLOGY) == DT_RASDISPLAY, "GetDeviceCaps(TECHNOLOGY) has to return DT_RASDISPLAY for a display based EMF\n"); @@ -2057,7 +2053,6 @@ static void test_mf_Blank(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); /* Tests on metafile initialization */ caps = GetDeviceCaps (hdcMetafile, TECHNOLOGY); @@ -2094,7 +2089,6 @@ static void test_CopyMetaFile(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); @@ -2141,7 +2135,6 @@ static void test_SetMetaFileBits(void) METAHEADER *mh; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); type = GetObjectType(hmf); ok(type == OBJ_METAFILE, "SetMetaFileBitsEx created object with type %d\n", type); @@ -2161,7 +2154,6 @@ static void test_SetMetaFileBits(void) /* Now with zero size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(0, MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ @@ -2170,7 +2162,6 @@ static void test_SetMetaFileBits(void) /* Now with odd size */ SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS) - 1, MF_GRAPHICS_BITS); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == 0xdeadbeef /* XP SP1 */, "wrong error %d\n", GetLastError()); @@ -2184,7 +2175,6 @@ static void test_SetMetaFileBits(void) mh->mtHeaderSize = 0; SetLastError(0xdeadbeef); hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(!hmf, "SetMetaFileBitsEx should fail\n"); ok(GetLastError() == ERROR_INVALID_DATA || broken(GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ @@ -2196,7 +2186,6 @@ static void test_SetMetaFileBits(void) /* corruption of mtSize doesn't lead to a failure */ mh->mtSize *= 2; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2215,7 +2204,6 @@ static void test_SetMetaFileBits(void) /* zeroing mtSize doesn't lead to a failure */ mh->mtSize = 0; hmf = SetMetaFileBitsEx(sizeof(MF_GRAPHICS_BITS), buf); - trace("hmf %p\n", hmf); ok(hmf != 0, "SetMetaFileBitsEx error %d\n", GetLastError()); if (compare_mf_bits(hmf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2242,7 +2230,6 @@ static void test_mf_Graphics(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); ret = MoveToEx(hdcMetafile, 1, 1, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); @@ -2301,7 +2288,6 @@ static void test_mf_PatternBrush(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); hBrush = SelectObject(hdcMetafile, hBrush); ok(hBrush != 0, "SelectObject error %d.\n", GetLastError()); @@ -2385,7 +2371,6 @@ static void test_mf_ExtTextOut_on_path(void) hdcMetafile = CreateMetaFileA(NULL); ok(hdcMetafile != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); - trace("hdcMetafile %p\n", hdcMetafile); ret = BeginPath(hdcMetafile); ok(!ret, "BeginPath on metafile DC should fail\n");

1 0

Daniel Lehman : tzres: Add Aleutian Time Zone.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 6ef84f2e545a4402502d9690c39ac07453d8f374 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ef84f2e545a4402502d9690… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 24 20:26:01 2020 -0800 tzres: Add Aleutian Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 10 ++ po/ar.po | 402 ++++++++++++++++++++++++++------------------------- po/ast.po | 402 ++++++++++++++++++++++++++------------------------- po/bg.po | 398 +++++++++++++++++++++++++------------------------- po/ca.po | 402 ++++++++++++++++++++++++++------------------------- po/cs.po | 402 ++++++++++++++++++++++++++------------------------- po/da.po | 402 ++++++++++++++++++++++++++------------------------- po/de.po | 402 ++++++++++++++++++++++++++------------------------- po/el.po | 398 +++++++++++++++++++++++++------------------------- po/en.po | 398 +++++++++++++++++++++++++------------------------- po/en_US.po | 398 +++++++++++++++++++++++++------------------------- po/eo.po | 402 ++++++++++++++++++++++++++------------------------- po/es.po | 402 ++++++++++++++++++++++++++------------------------- po/fa.po | 400 +++++++++++++++++++++++++------------------------- po/fi.po | 402 ++++++++++++++++++++++++++------------------------- po/fr.po | 402 ++++++++++++++++++++++++++------------------------- po/he.po | 402 ++++++++++++++++++++++++++------------------------- po/hi.po | 398 +++++++++++++++++++++++++------------------------- po/hr.po | 402 ++++++++++++++++++++++++++------------------------- po/hu.po | 402 ++++++++++++++++++++++++++------------------------- po/it.po | 402 ++++++++++++++++++++++++++------------------------- po/ja.po | 402 ++++++++++++++++++++++++++------------------------- po/ko.po | 402 ++++++++++++++++++++++++++------------------------- po/lt.po | 402 ++++++++++++++++++++++++++------------------------- po/ml.po | 398 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 402 ++++++++++++++++++++++++++------------------------- po/nl.po | 402 ++++++++++++++++++++++++++------------------------- po/or.po | 398 +++++++++++++++++++++++++------------------------- po/pa.po | 398 +++++++++++++++++++++++++------------------------- po/pl.po | 402 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 402 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 402 ++++++++++++++++++++++++++------------------------- po/rm.po | 398 +++++++++++++++++++++++++------------------------- po/ro.po | 402 ++++++++++++++++++++++++++------------------------- po/ru.po | 398 +++++++++++++++++++++++++------------------------- po/si.po | 402 ++++++++++++++++++++++++++------------------------- po/sk.po | 402 ++++++++++++++++++++++++++------------------------- po/sl.po | 402 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 400 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 400 +++++++++++++++++++++++++------------------------- po/sv.po | 402 ++++++++++++++++++++++++++------------------------- po/ta.po | 398 +++++++++++++++++++++++++------------------------- po/te.po | 398 +++++++++++++++++++++++++------------------------- po/th.po | 400 +++++++++++++++++++++++++------------------------- po/tr.po | 402 ++++++++++++++++++++++++++------------------------- po/uk.po | 398 +++++++++++++++++++++++++------------------------- po/wa.po | 400 +++++++++++++++++++++++++------------------------- po/wine.pot | 398 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 402 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 402 ++++++++++++++++++++++++++------------------------- 51 files changed, 10089 insertions(+), 9555 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ef84f2e545a4402502d…

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetOutputType().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: b9b5560a24374f9522dbc51de960c57609fded62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b5560a24374f9522dbc51d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 23:36:12 2020 -0600 mp3dmod: Implement IMediaObject::GetOutputType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/Makefile.in | 2 +- dlls/mp3dmod/mp3dmod.c | 32 ++++++++++++++++++-- dlls/mp3dmod/tests/Makefile.in | 2 +- dlls/mp3dmod/tests/mp3dmod.c | 69 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 0ac6d9680b..56a5ef38eb 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,5 +1,5 @@ MODULE = mp3dmod.dll -IMPORTS = dmoguids msdmo uuid wmcodecdspuuid +IMPORTS = dmoguids msdmo ole32 uuid wmcodecdspuuid EXTRAINCL = $(MPG123_CFLAGS) EXTRALIBS = $(MPG123_LIBS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 50b6803ff8..c89f32e9ed 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -187,9 +187,37 @@ static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %d, %p) stub!\n", iface, index, type_index, type); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); + const WAVEFORMATEX *input_format; + WAVEFORMATEX *format; - return E_NOTIMPL; + TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + + if (!dmo->intype_set) + return DMO_E_TYPE_NOT_SET; + + input_format = (WAVEFORMATEX *)dmo->intype.pbFormat; + + if (type_index >= (2 * input_format->nChannels)) + return DMO_E_NO_MORE_ITEMS; + + type->majortype = WMMEDIATYPE_Audio; + type->subtype = WMMEDIASUBTYPE_PCM; + type->formattype = WMFORMAT_WaveFormatEx; + type->pUnk = NULL; + type->cbFormat = sizeof(WAVEFORMATEX); + if (!(type->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)))) + return E_OUTOFMEMORY; + format = (WAVEFORMATEX *)type->pbFormat; + format->wFormatTag = WAVE_FORMAT_PCM; + format->nSamplesPerSec = input_format->nSamplesPerSec; + format->nChannels = (type_index / 2) ? 1 : input_format->nChannels; + format->wBitsPerSample = (type_index % 2) ? 8 : 16; + format->nBlockAlign = format->nChannels * format->wBitsPerSample / 8; + format->nAvgBytesPerSec = format->nSamplesPerSec * format->nBlockAlign; + format->cbSize = 0; + + return S_OK; } static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in index 3cbe4feb01..f5d54e4853 100644 --- a/dlls/mp3dmod/tests/Makefile.in +++ b/dlls/mp3dmod/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mp3dmod.dll -IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid +IMPORTS = dmoguids msdmo ole32 strmiids uuid wmcodecdspuuid C_SRCS = \ mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index dcf0820afb..1e410861ee 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -21,7 +21,7 @@ #include "wingdi.h" #include "mmreg.h" #include "mmsystem.h" -#include "mediaerr.h" +#include "dmo.h" #include "wmcodecdsp.h" #include "uuids.h" #include "wine/test.h" @@ -330,9 +330,16 @@ static void test_media_types(void) .pbFormat = (BYTE *)&mp3fmt, }; + WAVEFORMATEX expect_wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nSamplesPerSec = 48000, + }; + DMO_MEDIA_TYPE mt; IMediaObject *dmo; HRESULT hr; + DWORD i; hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); @@ -355,6 +362,10 @@ static void test_media_types(void) hr = IMediaObject_GetInputType(dmo, 0, 1, &mt); ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, 0, &mt); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -385,10 +396,66 @@ static void test_media_types(void) hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); + ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); + ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&mt.formattype)); + ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); + + expect_wfx.nChannels = (i / 2) ? 1 : 2; + expect_wfx.wBitsPerSample = (i % 2) ? 8 : 16; + expect_wfx.nBlockAlign = expect_wfx.nChannels * expect_wfx.wBitsPerSample / 8; + expect_wfx.nAvgBytesPerSec = 48000 * expect_wfx.nBlockAlign; + ok(!memcmp(mt.pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + MoFreeMediaType(&mt); + } + + hr = IMediaObject_GetOutputType(dmo, 0, 4, &mt); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + mp3fmt.wfx.nChannels = 1; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 2; ++i) + { + memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); + hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); + ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); + ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&mt.formattype)); + ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); + + expect_wfx.nChannels = 1; + expect_wfx.wBitsPerSample = (i % 2) ? 8 : 16; + expect_wfx.nBlockAlign = expect_wfx.nChannels * expect_wfx.wBitsPerSample / 8; + expect_wfx.nAvgBytesPerSec = 48000 * expect_wfx.nBlockAlign; + ok(!memcmp(mt.pbFormat, &expect_wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); + + MoFreeMediaType(&mt); + } + + hr = IMediaObject_GetOutputType(dmo, 0, 2, &mt); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetInputSizeInfo().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: e89ab44068607d582f82abd6ac8742c4feb10ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89ab44068607d582f82abd6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 23:36:13 2020 -0600 mp3dmod: Implement IMediaObject::GetInputSizeInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 18 ++++++++++++---- dlls/mp3dmod/tests/mp3dmod.c | 50 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index c89f32e9ed..5e232f0443 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -52,7 +52,7 @@ struct mp3_decoder mpg123_handle *mh; DMO_MEDIA_TYPE intype, outtype; - BOOL intype_set; + BOOL intype_set, outtype_set; IMediaBuffer *buffer; REFERENCE_TIME timestamp; @@ -262,6 +262,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index if (flags & DMO_SET_TYPEF_CLEAR) { MoFreeMediaType(&This->outtype); + This->outtype_set = FALSE; return S_OK; } @@ -287,6 +288,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index return DMO_E_TYPE_NOT_ACCEPTED; } MoCopyMediaType(&This->outtype, type); + This->outtype_set = TRUE; } return S_OK; @@ -306,11 +308,19 @@ static HRESULT WINAPI MediaObject_GetOutputCurrentType(IMediaObject *iface, DWOR return E_NOTIMPL; } -static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *max_lookahead, DWORD *alignment) +static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, + DWORD index, DWORD *size, DWORD *lookahead, DWORD *alignment) { - FIXME("(%p)->(%d, %p, %p, %p) stub!\n", iface, index, size, max_lookahead, alignment); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); + + if (!dmo->intype_set || !dmo->outtype_set) + return DMO_E_TYPE_NOT_SET; + + *size = 0; + *alignment = 1; + return S_OK; } static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 1e410861ee..78471c42bc 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -288,7 +288,36 @@ static void test_aggregation(void) static void test_stream_info(void) { - DWORD input_count, output_count, flags; + static const MPEGLAYER3WAVEFORMAT input_format = + { + .wfx.nChannels = 2, + .wfx.nSamplesPerSec = 48000, + }; + DMO_MEDIA_TYPE input_mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = WMMEDIASUBTYPE_MP3, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(input_format), + .pbFormat = (BYTE *)&input_format, + }; + + static const WAVEFORMATEX output_format = + { + .nChannels = 1, + .nSamplesPerSec = 48000, + .nAvgBytesPerSec = 2 * 48000, + .nBlockAlign = 2, + .wBitsPerSample = 16, + }; + DMO_MEDIA_TYPE output_mt = + { + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(output_format), + .pbFormat = (BYTE *)&output_format, + }; + + DWORD input_count, output_count, flags, size, lookahead, alignment; IMediaObject *dmo; HRESULT hr; @@ -311,6 +340,25 @@ static void test_stream_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!flags, "Got flags %#x.\n", flags); + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = lookahead = alignment = 0xdeadbeef; + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!size, "Got size %u.\n", size); + ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); + ok(alignment == 1, "Got alignment %u.\n", alignment); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetOutputSizeInfo().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 6d55954b4695a023c215a7a757073b6d7012ada2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d55954b4695a023c215a7a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 23:36:14 2020 -0600 mp3dmod: Implement IMediaObject::GetOutputSizeInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 11 +++++++++-- dlls/mp3dmod/tests/mp3dmod.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 5e232f0443..6a904716bc 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -325,9 +325,16 @@ static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment) { - FIXME("(%p)->(%d, %p, %p) stub!\n", iface, index, size, alignment); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, size %p, alignment %p.\n", iface, index, size, alignment); + + if (!dmo->intype_set || !dmo->outtype_set) + return DMO_E_TYPE_NOT_SET; + + *size = 2 * 1152 * ((WAVEFORMATEX *)dmo->outtype.pbFormat)->wBitsPerSample / 8; + *alignment = 1; + return S_OK; } static HRESULT WINAPI MediaObject_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 78471c42bc..285b76023b 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -342,12 +342,16 @@ static void test_stream_info(void) hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -359,6 +363,12 @@ static void test_stream_info(void) ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); ok(alignment == 1, "Got alignment %u.\n", alignment); + size = alignment = 0xdeadbeef; + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size == 1152 * 4, "Got size %u.\n", size); + ok(alignment == 1, "Got alignment %u.\n", alignment); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Verify the format type in IMediaObject::SetOutputType().
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 690fbf64b85af0b11946e73e41c5335c9b97c1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=690fbf64b85af0b11946e73e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 24 23:36:15 2020 -0600 mp3dmod: Verify the format type in IMediaObject::SetOutputType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 3 +++ dlls/mp3dmod/tests/mp3dmod.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 6a904716bc..592ee5482a 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -266,6 +266,9 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index return S_OK; } + if (!IsEqualGUID(&type->formattype, &WMFORMAT_WaveFormatEx)) + return DMO_E_TYPE_NOT_ACCEPTED; + format = (WAVEFORMATEX *)type->pbFormat; if (format->wBitsPerSample == 8) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 285b76023b..99d52e6fd7 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -394,6 +394,21 @@ static void test_media_types(void) .nSamplesPerSec = 48000, }; + WAVEFORMATEX output_format = + { + .nChannels = 1, + .nSamplesPerSec = 48000, + .nAvgBytesPerSec = 48000, + .nBlockAlign = 1, + .wBitsPerSample = 8, + }; + DMO_MEDIA_TYPE output_mt = + { + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(output_format), + .pbFormat = (BYTE *)&output_format, + }; + DMO_MEDIA_TYPE mt; IMediaObject *dmo; HRESULT hr; @@ -514,6 +529,17 @@ static void test_media_types(void) hr = IMediaObject_GetOutputType(dmo, 0, 2, &mt); ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + output_mt.formattype = GUID_NULL; + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + output_mt.formattype = FORMAT_None; + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + output_mt.formattype = FORMAT_WaveFormatEx; + IMediaObject_Release(dmo); }

1 0