wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Jacek Caban : include: Add corecrt_wstring.h header.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: e52ca3d68b53ad03ac472d62c2970efe40142f2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e52ca3d68b53ad03ac472d62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 16:51:37 2020 +0100 include: Add corecrt_wstring.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wstring.h | 88 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 74 +-------------------------------- include/msvcrt/wchar.h | 59 +-------------------------- 4 files changed, 91 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e52ca3d68b53ad03ac47…

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wscanf and wscanf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 6b6c3ec7289bc8e631e4917bd6705c115e15acaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6c3ec7289bc8e631e4917b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:31 2020 +0100 corecrt_wstdio.h: Add ucrt wscanf and wscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 91b65b9397..3951a1c829 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,8 +79,6 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int WINAPIV wscanf(const wchar_t*,...); -int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT @@ -319,6 +317,28 @@ static inline int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int WINAPIV wscanf(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV wscanf_s(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -361,6 +381,8 @@ _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); _ACRTIMP int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); +_ACRTIMP int WINAPIV wscanf(const wchar_t*,...); +_ACRTIMP int WINAPIV wscanf_s(const wchar_t*,...); #endif /* _UCRT */

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wprintf_s and vwprintf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 2a74488f4741c6cd007fca87039ba20b87b2a5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a74488f4741c6cd007fca87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:18 2020 +0100 corecrt_wstdio.h: Add ucrt wprintf_s and vwprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 2dac0f9fa3..91b65b9397 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,8 +79,6 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); -int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); int WINAPIV wscanf_s(const wchar_t*,...); @@ -261,6 +259,22 @@ static inline int WINAPIV wprintf(const wchar_t *format, ...) return ret; } +static inline int vwprintf_s(const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV wprintf_s(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = vfwprintf_s(stdout, format, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) { int ret; @@ -322,7 +336,9 @@ _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); _ACRTIMP int WINAPIV wprintf(const wchar_t*,...); +_ACRTIMP int WINAPIV wprintf_s(const wchar_t*,...); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt wprintf and vwprintf declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 364baf5deb7a0559a5d56bd0af1582eb33b57780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364baf5deb7a0559a5d56bd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:28:08 2020 +0100 corecrt_wstdio.h: Add ucrt wprintf and vwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 0a574ad8e0..2dac0f9fa3 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -79,9 +79,7 @@ wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); -int WINAPIV wprintf(const wchar_t*,...); int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); int WINAPIV wscanf_s(const wchar_t*,...); @@ -247,6 +245,22 @@ static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int __cdecl vwprintf(const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV wprintf(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) { int ret; @@ -307,6 +321,8 @@ _ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int WINAPIV wprintf(const wchar_t*,...); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt swscanf and swscanf_s declarations.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 77be811dee24300021af89d43c0dea131923fd9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=77be811dee24300021af89d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 25 08:27:58 2020 +0100 corecrt_wstdio.h: Add ucrt swscanf and swscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 5b751b47f9..0a574ad8e0 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -78,8 +78,6 @@ wchar_t* __cdecl getws(wchar_t*); wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); -int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); -int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); @@ -98,6 +96,7 @@ _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t _ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswscanf(unsigned __int64,const wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { @@ -248,6 +247,28 @@ static inline int WINAPIV fwprintf_s(FILE *file, const wchar_t *format, ...) return ret; } +static inline int WINAPIV swscanf(const wchar_t *buffer, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV swscanf_s(const wchar_t *buffer, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...) { int ret; @@ -282,8 +303,10 @@ _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va _ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...); @@ -304,8 +327,8 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); -_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); -_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); +_ACRTIMP int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); #endif /* _UCRT */

1 0

Daniel Lehman : wintrust: Set last error in WinVerifyTrust.
by Alexandre Julliard 25 Feb '20

25 Feb '20

Module: wine Branch: master Commit: 95a80d3585f7bc843edc902d2e9172ad5772af26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a80d3585f7bc843edc902d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 24 22:22:01 2020 -0800 wintrust: Set last error in WinVerifyTrust. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 10 ++++++++++ dlls/wintrust/wintrust_main.c | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5a150e684d..25d458faad 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -845,7 +845,9 @@ static void test_wintrust(void) file.pcwszFilePath = pathW; /* Test with an empty file */ file.hFile = create_temp_file(pathW); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); CloseHandle(file.hFile); @@ -853,18 +855,26 @@ static void test_wintrust(void) file.hFile = NULL; /* Test with a known file path, which we expect not have a signature */ getNotepadPath(pathW, MAX_PATH); + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); wtd.dwStateAction = WTD_STATEACTION_VERIFY; + SetLastError(0xdeadbeef); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(hr == GetLastError(), "expected %08x, got %08x\n", GetLastError(), hr); ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); wtd.dwStateAction = WTD_STATEACTION_CLOSE; + SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index a0b8a137ed..768522ea4a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -732,6 +732,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) } } + if (err) SetLastError(err); TRACE("returning %08x\n", err); return err; }

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

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: 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::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

← Newer
1
...
9
10
11
12
13
14
15
...
88
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 February 2020