Commit Graph

278 Commits

Author SHA1 Message Date
Michael Stefaniuc 4059759ccd dmime: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-10-23 22:25:41 +02:00
Michael Stefaniuc 885bd810e2 dmime: Remove unused impl_from_ helpers.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-14 10:15:59 +02:00
Michael Stefaniuc c8e493cb0c dmime: Don't crash when DMSegment loads a MIDI file.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31829
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-17 08:41:54 +02:00
Michael Stefaniuc 3ee58034ad dmime: Reimplement the track form parser.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-12 11:29:54 +02:00
Michael Stefaniuc 23629d069a dmime: Simplify the track list parser.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-12 11:29:52 +02:00
Michael Stefaniuc 7b5668a6e7 include: Make ARRAY_SIZE() available in wine/test.h.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-05-25 12:09:17 +02:00
Francois Gouget d5784736aa dmime: Add a trailing '\n' to a FIXME().
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-19 09:23:38 +02:00
Francois Gouget c5023aea7e dmime: Make IDirectMusicUtils_IPersistStream_ParseDescGeneric() static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-18 22:03:38 +02:00
Zebediah Figura 54e27c17ef dmime: Call interface methods properly.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 20:46:01 +02:00
Michael Stefaniuc bb88427e4e dmime: Reimplement the segment form parser.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 10:47:38 +01:00
Michael Stefaniuc 117a2081d5 dmime: The descriptor is already parsed for the segment form.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 10:47:36 +01:00
Michael Stefaniuc b73c4ec440 dmime: Reimplement IPersistStream_Load() for DMSegment.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 10:47:33 +01:00
Andrey Gusev f80efd4460 dmime: Fix misplaced parenthesis.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-16 01:00:04 +01:00
Michael Stefaniuc a783d2a397 dmime/tests: Add an invalid stream test.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:18:45 +01:00
Michael Stefaniuc 83c078b0ab dmime/tests: Fix an IStream use after free and a leak.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-15 12:18:43 +01:00
Michael Stefaniuc a35d4c77ca dmime: Stop pretending to Load() the 'WAVE' form.
It doesn't make sense to forward to DirectSoundWave anyway as that would
require the totally undocumented interface
{69e934e4-97f1-4f1d-88e8-f2ac88671327}

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-14 15:27:59 +01:00
Michael Stefaniuc da4318b291 dmime: Use ParseDescriptor() instead of reimplementing it.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-13 20:35:29 +01:00
Michael Stefaniuc 387a9f7038 dmime/tests: Add ParseDescriptor NULL pointer tests.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 20:32:02 +01:00
Michael Stefaniuc 156aceebbe dmime: Reimplement ParseDescriptor for DMGraph.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 20:31:58 +01:00
Michael Stefaniuc bdbd2e188c dmime: Reimplement ParseDescriptor for DMAudioPathConfig.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 20:31:55 +01:00
Michael Stefaniuc 0fa08f4793 dmime: Add a generic ParseDescriptor helper and use it for DMSegment.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-12 20:31:51 +01:00
Michael Stefaniuc 07fd2ef372 dmusic/tests: Check forms 'DMAP' and 'DMTG' in ParseDescriptor too.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-06 04:40:48 -06:00
Michael Stefaniuc 6d74b1ebed dmime/tests: Add IDirectMusicObject::ParseDescriptor() tests.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-02 10:54:20 +01:00
Alistair Leslie-Hughes 9c949389f6 dmime: Rename IPersistStreamImpl_Load functions.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-07-05 13:42:25 +02:00
Alistair Leslie-Hughes f62a891385 dmime: Support more interfaces in IDirectMusicAudioPath.GetObjectInPath.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-28 17:15:42 +02:00
Alistair Leslie-Hughes d5380f0d00 dmime: Add TRACE to IDirectMusicSegment8 QueryInterface.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-28 11:30:33 +02:00
Michael Stefaniuc 14f899317a dmime: Initialize dmusic in InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-12 18:01:53 +02:00
Michael Stefaniuc 3505137d24 dmime: Add proper error handling to InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-12 18:01:51 +02:00
Michael Stefaniuc 01c6b4fe64 dmime: Forward Init() to InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 3236e4ccab dmime: Finish the cleanup of InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 26011d2d3e dmime: Do not use Init() from InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 3a145ac92b dmime: Finish the reindentation in CloseDown().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 9572b5f6d3 dmime: Avoid a temporary variable in IDirectMusicPerformance8Impl_InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc a2685a8bc0 dmime: Simplify the check if the performance was initialized.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 195280bee3 dmime/tests: Add refcount test for generated dmusic/dsound.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:49 -05:00
Michael Stefaniuc 36a88d2841 dmusic: Implement IDirectMusic8::SetDirectSound().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-10 09:16:00 -05:00
Michael Stefaniuc 9a90a3e8e5 dmime: Properly use SetCooperativeLevel() on the dsound ifaces we create.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-04 17:26:04 +02:00
Michael Stefaniuc f221298e61 dmime/tests: Add more InitAudio() tests.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-04 17:25:58 +02:00
Michael Stefaniuc a306577803 dmime/tests: Use simpler variable names in test_InitAudio().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-04 17:25:55 +02:00
Nikolay Sivov f0fb2f16ca dmusic/tests: Use void* instead of void** type value for outer argument.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-24 20:30:30 +02:00
Huw Davies 5864ef417e dmime/tests: Skip the tests if InitAudio fails for any reason.
Fixes failures on Windows 10.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-13 14:51:02 +01:00
Michael Stefaniuc 8788061b10 dmime: Avoid using the COM method implementations directly.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-01 20:47:47 +09:00
Michael Stefaniuc 07cee87e8f dmime: Use debugstr_guid() to trace a REFIID.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-26 20:33:18 +09:00
Michael Stefaniuc 5433a2c054 dmime: Don't set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D.
Troubleshooted by Michael Müller.
Fixes a regression caused by 0e5dcc2c84.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-11 19:54:16 +09:00
Michael Stefaniuc f78ed39b98 dmime: Use the generic IPersistStream for DMTempoTrack. 2015-07-06 14:49:41 +09:00
Michael Stefaniuc ee09310345 dmime: Remove the extraneous IUnknown from DMTempoTrack. 2015-07-06 14:49:41 +09:00
Michael Stefaniuc 3ef8e01517 dmime: COM cleanup for IDirectMusicTrack of DMTempoTrack. 2015-07-06 14:49:41 +09:00
Michael Stefaniuc cfd84f1662 dmime: Use the generic IPersistStream for DMSegTriggerTrack. 2015-07-06 14:49:41 +09:00
Michael Stefaniuc 0c0df2f8d2 dmime: Remove the extraneous IUnknown from DMSegTriggerTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-06 14:49:41 +09:00
Michael Stefaniuc 360a24670f dmime: COM cleanup for IDirectMusicTrack of DMSegTriggerTrack. 2015-07-06 14:49:40 +09:00