Commit Graph

171 Commits

Author SHA1 Message Date
Hiroki Awata d05dd4460c msgsm32.acm: Msgsm32 should not perform PCM-to-PCM conversion.
If the source and destination are both in a specific PCM format (1
channel, 16bit), acmStreamOpen will select the GSM 6.10 driver in
preference to the built-in, causing incorrect conversion.

Signed-off-by: Hiroki Awata <castaneai@by.black>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-18 18:41:54 +02:00
Michael Stefaniuc d37c304ef7 msacm32: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-25 21:39:18 +01:00
Michael Stefaniuc 31f6332f48 msacm32: Make the registry key variables global.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-25 21:39:18 +01:00
Alexandre Julliard 77872fa87d msacm32: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-12 11:44:26 +02:00
Michael Müller 99d4cdcf0b l3codeca.acm: Check input format in MPEG3_StreamOpen.
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-02 19:21:37 +02:00
Michael Stefaniuc a3af167373 msacm32: Remove redundant not-NULL check (coccinellery).
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-06 18:28:20 +01:00
Zhiyi Zhang bbdf6d5e21 msacm32: Reference count local drivers.
One local driver can be assigned to multiple driver ids.
When releasing the driver id, check if the reference count
of a local driver is one before actually releasing the local driver.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46520
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-01-28 10:22:07 +01:00
Michael Stefaniuc 077db39cec msacm32: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-14 09:44:27 +02:00
Michael Stefaniuc 756958f611 msacm32: Avoid an ARRAY_SIZE-like macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-12 16:53:39 +02:00
Nikolay Sivov f03b8a42f9 msacm32/tests: Fix a memory leak in tests (Valgrind).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-07-17 22:12:08 +02:00
Zebediah Figura 993faf576d msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-23 19:45:31 +02:00
Zebediah Figura 84e61e6a07 msacm32: Add invalid parameter checks for acmFormatChoose().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-23 19:45:31 +02:00
Zebediah Figura 5e2c243a14 msacm32: Don't add a format entry if it is decode-only.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-22 22:52:33 +02:00
Zebediah Figura cadedd73f9 msacm32: Rewrite PCM conversion functions.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-19 18:48:31 +02:00
Zebediah Figura d31d656b6f include: Pack WAVEFORMAT structs.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-13 20:56:20 +02:00
Zebediah Figura 7493364b4b msacm32: Check correct variable.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-09 16:06:41 +02:00
Zebediah Figura ab2760ec33 msacm32: Try to suggest PCM to PCM conversion first.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-08 16:44:59 +02:00
Zebediah Figura 8e88af31cd msacm32: Add more invalid parameter checks for acmFormatSuggest().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-08 16:44:59 +02:00
Zebediah Figura 1e30f79b70 msacm32: Add invalid parameter checks for acmFormatDetails().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-08 16:44:58 +02:00
Zebediah Figura c984aa5fc9 msacm32: Add more invalid parameter checks for acmFormatEnum().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-08 16:44:58 +02:00
Zebediah Figura 4e0c3707c3 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-02 11:32:20 +02:00
Thomas Faber 7966efda07 msacm32: Free session driver instance using the correct heap.
Signed-off-by: Thomas Faber <thomas.faber@reactos.org>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-02 15:46:16 +01:00
Bruno Jesus 0afcefd338 msacm32: Reduce block align condition scope to test covered drivers.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-18 15:43:52 +01:00
Francois Gouget 199af34f08 msacm32/tests: Make acm_driver_func() static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-10 19:19:16 +01:00
Andrew Eikum 55fdb03942 msacm32: Fix copy-paste error.
Spotted by Nikolay via Coverity.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-12 19:14:19 +01:00
Andrew Eikum 6cc673477d msacm32: Support conversion from 24-bit PCM.
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-06 18:56:09 +01:00
Bruno Jesus f3f49a29d5 msacm32/tests: Beginnings of a custom driver test.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-29 12:20:21 +01:00
Bruno Jesus 37f159e1cb msacm32: Use a helper to validate stream pointers.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-29 23:54:41 +09:00
Bruno Jesus d4fd43c971 msacm32: Handle invalid source length in acmStreamPrepareHeader.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-29 23:54:41 +09:00
Bruno Jesus 61eda97fd5 msacm32: Handle invalid use of reserved parameter in acmStreamPrepareHeader.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-29 23:54:41 +09:00
Bruno Jesus e8d72a0e31 msacm32: Add the 16-bit DLL version on acmGetVersion.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-26 10:38:49 +09:00
Bruno Jesus 395b9c321b msacm32/tests: Add more acmStreamPrepareHeader tests.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-01 12:43:36 +09:00
Bruno Jesus cb5ba51f94 msacm32/tests: Add some acmStreamPrepareHeader and acmStreamConvert tests.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-25 13:21:10 +09:00
Bruno Jesus cff5c73e68 msacm32: Remove dead code from acmFormatDetailsW.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-23 23:35:22 +09:00
Michael Stefaniuc baf0af67ae msacm32/tests: Remove always true condition (PVS-Studio).
dd.szShortName is an array of CHAR and not an arbitrary pointer.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-14 12:50:51 +09:00
Nikolay Sivov bc26431e94 msacm32/tests: Allow alternative product id. 2015-09-25 21:00:51 +02:00
Bruno Jesus c6afba8979 msacm32: Quit on unsupported destination format in PCM_FormatSuggest. 2015-09-09 16:19:09 +09:00
Bruno Jesus af8760e6e5 msacm32/tests: Add tests for acmFormatSuggest(). 2015-09-09 16:19:06 +09:00
Bruno Jesus d08197f92a msacm32: Catch NULL parameters in acmFormatSuggest(). 2015-09-09 16:18:59 +09:00
Andrew Eikum ab22ea74a4 msacm32: Make ACM driver details match native more closely. 2015-05-27 14:31:39 +09:00
Alexandre Julliard 9b6c203d8f msacm32: Print full flag values in traces. 2015-03-30 19:49:13 +09:00
Alexandre Julliard 99ef0d6ff0 makefiles: Get rid of the MAKE_TEST_RULES variable. 2014-01-02 12:13:16 +01:00
Alexandre Julliard 5e7416e5c8 makefiles: Get rid of the MAKE_DLL_RULES variable. 2014-01-02 12:08:18 +01:00
Alexandre Julliard 4f3d71cef3 makefiles: Get rid of the no longer used PO_SRCS variables. 2013-12-15 10:23:04 +01:00
Alexandre Julliard 5756ee09f3 makefiles: Add makedep pragmas for rc files that contain translations. 2013-11-05 20:38:19 +01:00
Andrew Eikum 3cb2ddfd09 msacm32: Don't clear DONE flag in Un,PrepareHeader. 2013-11-04 20:14:35 +01:00
André Hentschel 0a9531f9b8 msacm32/tests: Fix tests compilation with __WINESRC__ defined. 2013-10-24 10:47:03 +02:00
Michael Stefaniuc 0e681027a2 tests: Compile the tests by default with -D__WINESRC__. 2013-10-02 11:04:02 +02:00
Alexandre Julliard 3181d9130c msacm32: Don't bother to free memory at process exit. 2013-05-20 12:27:44 +02:00
Andrew Talbot bb55f47e41 msacm32: Indentation fix. 2012-12-18 12:35:26 +01:00