February 2022 - Wine-commits

Zebediah Figura : shell32: Move SHWaitForFileToOpen() flags to shellord.c.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: e1aa67132721247050f39a126e9cdfda99dbdcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1aa67132721247050f39a12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:37 2022 -0600 shell32: Move SHWaitForFileToOpen() flags to shellord.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 5 +++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2c73ce18940..a138f381a92 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -50,6 +50,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); +/* SHWaitForFileToOpen flags */ +#define SHWFF_ADD 0x01 +#define SHWFF_REMOVE 0x02 +#define SHWFF_WAIT 0x04 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 5ed8d25f234..459c51c8454 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -208,16 +208,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); * Misc Stuff */ -/* SHWaitForFileToOpen flags */ -#define SHWFF_ADD 0x01 -#define SHWFF_REMOVE 0x02 -#define SHWFF_WAIT 0x04 - -BOOL WINAPI SHWaitForFileToOpen( - LPCITEMIDLIST pidl, - DWORD dwFlags, - DWORD dwTimeout); - WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids);

1 0

Zebediah Figura : shell32: Move RegisterShellHook() definitions to shellord.c.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 6abfd74a8bb17bb27944fc796622e07f82560ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abfd74a8bb17bb27944fc79… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:38 2022 -0600 shell32: Move RegisterShellHook() definitions to shellord.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 6 ++++++ dlls/shell32/undocshell.h | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a138f381a92..57308e1c988 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -55,6 +55,12 @@ WINE_DECLARE_DEBUG_CHANNEL(pidl); #define SHWFF_REMOVE 0x02 #define SHWFF_WAIT 0x04 +/* RegisterShellHook types */ +#define RSH_DEREGISTER 0 +#define RSH_REGISTER 1 +#define RSH_REGISTER_PROGMAN 2 +#define RSH_REGISTER_TASKMAN 3 + /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ typedef struct tagCREATEMRULIST diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 459c51c8454..dd20090d7bd 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -211,16 +211,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids); -/* RegisterShellHook types */ -#define RSH_DEREGISTER 0 -#define RSH_REGISTER 1 -#define RSH_REGISTER_PROGMAN 2 -#define RSH_REGISTER_TASKMAN 3 - -BOOL WINAPI RegisterShellHook( - HWND hWnd, - DWORD dwType); - /* SHCreateDefClassObject callback function */ typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)( LPUNKNOWN pUnkOuter,

1 0

Zebediah Figura : shell32: Move SHCreateLinks() flags to shlfolder.c.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: c2f25d25b648b19481ea102530e4b245dce85104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f25d25b648b19481ea1025… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:39 2022 -0600 shell32: Move SHCreateLinks() flags to shlfolder.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfolder.c | 4 ++++ dlls/shell32/undocshell.h | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..2ea6af11271 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); +/* SHCreateLinks flags */ +#define SHCLF_PREFIXNAME 0x01 +#define SHCLF_CREATEONDESKTOP 0x02 + /*************************************************************************** * SHELL32_GetCustomFolderAttribute (internal function) * diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index dd20090d7bd..e4ed7c3630a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -226,17 +226,6 @@ HRESULT WINAPI SHCreateDefClassObject( void WINAPI SHFreeUnusedLibraries(void); -/* SHCreateLinks flags */ -#define SHCLF_PREFIXNAME 0x01 -#define SHCLF_CREATEONDESKTOP 0x02 - -HRESULT WINAPI SHCreateLinks( - HWND hWnd, - LPCSTR lpszDir, - LPDATAOBJECT lpDataObject, - UINT uFlags, - LPITEMIDLIST *lppidlLinks); - DWORD WINAPI CheckEscapesA(LPSTR string, DWORD len); DWORD WINAPI CheckEscapesW(LPWSTR string, DWORD len);

1 0

Rémi Bernon : winegstreamer: Stub implement WMA decoder DMO / MF transform.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: a7508d54db6ef67b139fe15e964c644a304e30ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7508d54db6ef67b139fe15e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:15 2022 +0100 winegstreamer: Stub implement WMA decoder DMO / MF transform. Final Fantasy XIV intro videos require media_object_GetStreamCount and property_bag_Write to return S_OK in order to not get stuck. This could be done in a separate commit but would cause a temporary regression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/winegstreamer/Makefile.in | 5 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 26 ++ dlls/winegstreamer/mfplat.c | 28 +- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/winegstreamer_classes.idl | 6 + dlls/winegstreamer/wma_decoder.c | 553 +++++++++++++++++++++++++++ dlls/wmadmod/tests/wmadmod.c | 5 - 9 files changed, 617 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7508d54db6ef67b139f…

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder IMFTransform_SetInputType.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: b1fc2a49ffe5573d20d5972a8900ef9b5cc3ae83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fc2a49ffe5573d20d5972a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:16 2022 +0100 winegstreamer: Implement WMA decoder IMFTransform_SetInputType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 5 ---- dlls/winegstreamer/wma_decoder.c | 59 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0bf81e0c878..6755853f995 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5790,22 +5790,18 @@ static void test_wma_decoder(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#x.\n", hr); init_media_type(media_type, input_type_desc, 1); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#x.\n", hr); init_media_type(media_type, input_type_desc, 2); for (i = 2; i < ARRAY_SIZE(input_type_desc) - 1; ++i) { hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#x.\n", hr); init_media_type(media_type, input_type_desc, i + 1); } hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - todo_wine ok(hr == S_OK, "SetInputType returned %#x.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); @@ -5893,7 +5889,6 @@ static void test_wma_decoder(void) hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 4003); ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - todo_wine ok(hr == S_OK, "SetInputType returned %#x.\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index f034c34395e..12ac9cee8c3 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -30,6 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmadec); +static const GUID *wma_decoder_input_types[] = +{ + &MEDIASUBTYPE_MSAUDIO1, + &MFAudioFormat_WMAudioV8, + &MFAudioFormat_WMAudioV9, + &MFAudioFormat_WMAudio_Lossless, +}; + struct wma_decoder { IUnknown IUnknown_inner; @@ -38,6 +46,7 @@ struct wma_decoder IPropertyBag IPropertyBag_iface; IUnknown *outer; LONG refcount; + IMFMediaType *input_type; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -88,7 +97,11 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) TRACE("iface %p decreasing refcount to %u.\n", decoder, refcount); if (!refcount) + { + if (decoder->input_type) + IMFMediaType_Release(decoder->input_type); free(decoder); + } return refcount; } @@ -203,8 +216,50 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("iface %p, id %u, type %p, flags %#x stub!\n", iface, id, type, flags); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MF_ATTRIBUTE_TYPE item_type; + GUID major, subtype; + HRESULT hr; + ULONG i; + + TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags); + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || + FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < ARRAY_SIZE(wma_decoder_input_types); ++i) + if (IsEqualGUID(&subtype, wma_decoder_input_types[i])) + break; + if (i == ARRAY_SIZE(wma_decoder_input_types)) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_USER_DATA, &item_type)) || + item_type != MF_ATTRIBUTE_BLOB) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_NUM_CHANNELS, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + + if (!decoder->input_type && FAILED(hr = MFCreateMediaType(&decoder->input_type))) + return hr; + + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->input_type))) + { + IMFMediaType_Release(decoder->input_type); + decoder->input_type = NULL; + } + + return hr; } static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder GetOutputAvailableType.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 22472a3feb84a1d1857a035feb9883fdce39f6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=22472a3feb84a1d1857a035f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:17 2022 +0100 winegstreamer: Implement WMA decoder GetOutputAvailableType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 -- dlls/winegstreamer/wma_decoder.c | 75 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6755853f995..683de3e5b3e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5754,7 +5754,6 @@ static void test_wma_decoder(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); i = -1; @@ -5825,9 +5824,7 @@ static void test_wma_decoder(void) ok(ret == 0, "Release returned %u\n", ret); winetest_pop_context(); } - todo_wine ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#x\n", hr); - todo_wine ok(i == 2, "%u output media types\n", i); /* check required output media type attributes */ diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 12ac9cee8c3..a99df59e8a0 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -37,6 +37,11 @@ static const GUID *wma_decoder_input_types[] = &MFAudioFormat_WMAudioV9, &MFAudioFormat_WMAudio_Lossless, }; +static const GUID *wma_decoder_output_types[] = +{ + &MFAudioFormat_Float, + &MFAudioFormat_PCM, +}; struct wma_decoder { @@ -210,8 +215,74 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %u, index %u, type %p stub!\n", iface, id, index, type); - return E_NOTIMPL; + UINT32 channel_count, sample_size, sample_rate, block_alignment; + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + IMFMediaType *media_type; + const GUID *output_type; + HRESULT hr; + + TRACE("iface %p, id %u, index %u, type %p.\n", iface, id, index, type); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + *type = NULL; + + if (index >= ARRAY_SIZE(wma_decoder_output_types)) + return MF_E_NO_MORE_TYPES; + output_type = wma_decoder_output_types[index]; + + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + + if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, output_type))) + goto done; + + if (IsEqualGUID(output_type, &MFAudioFormat_Float)) + sample_size = 32; + else if (IsEqualGUID(output_type, &MFAudioFormat_PCM)) + sample_size = 16; + else + { + FIXME("Subtype %s not implemented!\n", debugstr_guid(output_type)); + hr = E_NOTIMPL; + goto done; + } + + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, sample_size))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_NUM_CHANNELS, &channel_count))) + goto done; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, channel_count))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &sample_rate))) + goto done; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, sample_rate))) + goto done; + + block_alignment = sample_size * channel_count / 8; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, block_alignment))) + goto done; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, sample_rate * block_alignment))) + goto done; + + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1))) + goto done; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1))) + goto done; + if (FAILED(hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1))) + goto done; + +done: + if (SUCCEEDED(hr)) + IMFMediaType_AddRef((*type = media_type)); + + IMFMediaType_Release(media_type); + return hr; } static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder SetOutputType.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 1541d6b6d8877b9799219e1f56c460b4ccd4744c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1541d6b6d8877b9799219e1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:18 2022 +0100 winegstreamer: Implement WMA decoder SetOutputType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ---- dlls/winegstreamer/wma_decoder.c | 77 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 683de3e5b3e..96d8b972de7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5779,7 +5779,6 @@ static void test_wma_decoder(void) ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); init_media_type(media_type, output_type_desc, -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "SetOutputType returned %#x.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); @@ -5832,22 +5831,18 @@ static void test_wma_decoder(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#x.\n", hr); init_media_type(media_type, output_type_desc, 1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#x.\n", hr); init_media_type(media_type, output_type_desc, 2); for (i = 2; i < ARRAY_SIZE(output_type_desc) - 1; ++i) { hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "SetOutputType returned %#x.\n", hr); init_media_type(media_type, output_type_desc, i + 1); } hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == S_OK, "SetOutputType returned %#x.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); @@ -5894,7 +5889,6 @@ static void test_wma_decoder(void) init_media_type(media_type, output_type_desc, -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == S_OK, "SetInputType returned %#x.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index a99df59e8a0..4fae787679d 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -52,6 +52,7 @@ struct wma_decoder IUnknown *outer; LONG refcount; IMFMediaType *input_type; + IMFMediaType *output_type; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -105,6 +106,8 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) { if (decoder->input_type) IMFMediaType_Release(decoder->input_type); + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); free(decoder); } @@ -324,6 +327,12 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (!decoder->input_type && FAILED(hr = MFCreateMediaType(&decoder->input_type))) return hr; + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + } + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->input_type))) { IMFMediaType_Release(decoder->input_type); @@ -335,8 +344,72 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("iface %p, id %u, type %p, flags %#x stub!\n", iface, id, type, flags); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MF_ATTRIBUTE_TYPE item_type; + ULONG i, sample_size; + GUID major, subtype; + HRESULT hr; + + TRACE("iface %p, id %u, type %p, flags %#x.\n", iface, id, type, flags); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || + FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < ARRAY_SIZE(wma_decoder_output_types); ++i) + if (IsEqualGUID(&subtype, wma_decoder_output_types[i])) + break; + if (i == ARRAY_SIZE(wma_decoder_output_types)) + return MF_E_INVALIDMEDIATYPE; + + if (IsEqualGUID(&subtype, &MFAudioFormat_Float)) + sample_size = 32; + else if (IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + sample_size = 16; + else + { + FIXME("Subtype %s not implemented!\n", debugstr_guid(&subtype)); + hr = E_NOTIMPL; + return hr; + } + + if (FAILED(IMFMediaType_SetUINT32(decoder->input_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, sample_size))) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_NUM_CHANNELS, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &item_type)) || + item_type != MF_ATTRIBUTE_UINT32) + return MF_E_INVALIDMEDIATYPE; + + if (!decoder->output_type && FAILED(hr = MFCreateMediaType(&decoder->output_type))) + return hr; + + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->output_type))) + goto failed; + + return S_OK; + +failed: + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + return hr; } static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder GetOutputStreamInfo.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 177c232936dbc17cf212aed389f312d543d0c432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177c232936dbc17cf212aed3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:19 2022 +0100 winegstreamer: Implement WMA decoder GetOutputStreamInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ---------- dlls/winegstreamer/wma_decoder.c | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 96d8b972de7..72910769633 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5751,7 +5751,6 @@ static void test_wma_decoder(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#x\n", hr); @@ -5808,7 +5807,6 @@ static void test_wma_decoder(void) todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); /* check new output media types */ @@ -5864,13 +5862,10 @@ static void test_wma_decoder(void) memset(&output_info, 0xcd, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - todo_wine ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); - todo_wine ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); todo_wine ok(output_info.cbSize == 0, "got cbSize %#x\n", output_info.cbSize); - todo_wine ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); /* MF_MT_AUDIO_AVG_BYTES_PER_SECOND isn't required by SetInputType, but is needed for the transform to work */ @@ -5884,7 +5879,6 @@ static void test_wma_decoder(void) ok(hr == S_OK, "SetInputType returned %#x.\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); init_media_type(media_type, output_type_desc, -1); @@ -5895,13 +5889,9 @@ static void test_wma_decoder(void) memset(&output_info, 0xcd, sizeof(output_info)); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); - todo_wine ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); - todo_wine ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); - todo_wine ok(output_info.cbSize == sizeof(wma_decoded_data), "got cbSize %#x\n", output_info.cbSize); - todo_wine ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); ret = IMFTransform_Release(transform); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 4fae787679d..dbccd659ac0 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -174,8 +174,25 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("iface %p, id %u, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + UINT32 channel_count, block_alignment; + HRESULT hr; + + TRACE("iface %p, id %u, info %p.\n", iface, id, info); + + if (!decoder->input_type || !decoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFMediaType_GetUINT32(decoder->output_type, &MF_MT_AUDIO_NUM_CHANNELS, &channel_count))) + return hr; + if (FAILED(hr = IMFMediaType_GetUINT32(decoder->output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + return hr; + + info->dwFlags = 0; + info->cbSize = 1024 * block_alignment * channel_count; + info->cbAlignment = 1; + + return S_OK; } static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes)

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder GetInputStreamInfo.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 940110d38700808563ee17d77cd59c45c00fd716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=940110d38700808563ee17d7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 2 13:28:20 2022 +0100 winegstreamer: Implement WMA decoder GetInputStreamInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 8 -------- dlls/winegstreamer/wma_decoder.c | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 72910769633..ebf42bcad9c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5748,7 +5748,6 @@ static void test_wma_decoder(void) /* check default media types */ hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); @@ -5804,7 +5803,6 @@ static void test_wma_decoder(void) ok(ret == 0, "Release returned %u\n", ret); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#x\n", hr); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#x\n", hr); @@ -5847,17 +5845,11 @@ static void test_wma_decoder(void) memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == 0, "got dwFlags %#x\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == wma_block_size, "got cbSize %u\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); memset(&output_info, 0xcd, sizeof(output_info)); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index dbccd659ac0..a6fdbf27724 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -168,8 +168,25 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %u, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + UINT32 block_alignment; + HRESULT hr; + + TRACE("iface %p, id %u, info %p.\n", iface, id, info); + + if (!decoder->input_type || !decoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFMediaType_GetUINT32(decoder->input_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + return hr; + + info->hnsMaxLatency = 0; + info->dwFlags = 0; + info->cbSize = block_alignment; + info->cbMaxLookahead = 0; + info->cbAlignment = 1; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)

1 0

Francois Gouget : testbot/LibvirtTool: Add GetPrivilegedTA().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: tools Branch: master Commit: caafd9d1d6896b43d70762cfbf1254ead45680f1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=caafd9d1d6896b43d70762c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 3 19:26:05 2022 +0100 testbot/LibvirtTool: Add GetPrivilegedTA(). This simplifies getting a connection to the TestAgent server with elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index b186e19..51ed8e7 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -257,6 +257,28 @@ sub ChangeStatus($$;$) return 0; } +=pod +=over 12 + +=item C<GetPrivilegedTA()> + +Returns a connection to a TestAgent server with elevated privileges. + +If the server running on the regular port does not have elevated privileges +this assumes that the one on the alternate port will. It is up to the caller +to report an error if that's not the case. + +=back +=cut + +sub GetPrivilegedTA($) +{ + my ($TA) = @_; + + # Use SetTime() to detect if privileged operations are allowed. + return $TA->SetTime() ? $TA : $VM->GetAgent(1); +} + sub ShutDown() { my $Domain = $VM->GetDomain(); @@ -270,30 +292,15 @@ sub ShutDown() Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; - # Use SetTime() to detect if privileged operations are allowed. - my $TA = $VM->GetAgent(); - if (!$TA->SetTime()) - { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - $TA->Disconnect(); - $TA = $VM->GetAgent(1); - if (!$TA->SetTime()) - { - Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; - $TA->Disconnect(); - return 0; - } - } - my $Success = 1; my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? ["shutdown.exe", "/p", "/d", "00:00"] : ["/sbin/shutdown", "--poweroff", "now"]; Debug(Elapsed($Start), " Running @$Cmd\n"); - if (!$TA->Run($Cmd, 0)) + my $PTA = GetPrivilegedTA($VM->GetAgent()); + if (!$PTA->Run($Cmd, 0)) { - Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n"; $Success = 0; } else @@ -311,7 +318,8 @@ sub ShutDown() sleep(1); } } - $TA->Disconnect(); + $PTA->Disconnect(); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); LogMsg "Successfully shut down $VMKey\n"; return $Success; @@ -496,16 +504,11 @@ sub SetupTestAgentd($$$$) # This is needed not only for the tests (date is important when checking # HTTPS certificates), but also for the build (if the time moves forward # during the build some ccache versions will return a compilation error). - if (!$TA->SetTime()) + my $PTA = GetPrivilegedTA($TA); + FatalError("Cannot set the VM system time\n") if (!$PTA); + if (!$PTA->SetTime()) { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - my $PrivilegedTA = $VM->GetAgent(1); - if (!$PrivilegedTA->SetTime()) - { - FatalError("Unable to set the VM system time: ". $PrivilegedTA->GetLastError() ."\n"); - } - $PrivilegedTA->Disconnect(); + FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n"); } if ($Booting and $VM->Type eq "wine") @@ -543,6 +546,7 @@ sub SetupTestAgentd($$$$) FatalError("The VM has been rebooted too many times: start.count=$Count > 1"); } } + $PTA->Disconnect(); $TA->Disconnect(); }

1 0