Commit Graph

302 Commits

Author SHA1 Message Date
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
Michael Stefaniuc 3de79096aa dmime/tests: Add some basic IDirectMusicTrack8 tests. 2015-07-06 14:49:40 +09:00
Michael Stefaniuc 8e959e1203 dmime: Implement the remaining E_NOTIMPL methods of IDirectMusicTrack8. 2015-07-06 14:49:40 +09:00
Michael Stefaniuc 0789ddc322 dmime: Use the generic IPersistStream for DMWaveTrack. 2015-07-03 22:57:58 +09:00
Michael Stefaniuc f70498f121 dmime: Remove the extraneous IUnknown from DMWaveTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-03 22:57:53 +09:00
Michael Stefaniuc 861081be65 dmime: COM cleanup for IDirectMusicTrack of DMWaveTrack. 2015-07-03 22:57:49 +09:00
Michael Stefaniuc b905999761 dmime: Implement the E_NOTIMPL methods in DMWaveTrack. 2015-07-03 22:57:44 +09:00
Michael Stefaniuc 4a9eb8bfe0 dmime: Use the generic IPersistStream for DMParamControlTrack. 2015-07-03 22:57:40 +09:00
Michael Stefaniuc 22184e3694 dmime: Remove the extraneous IUnknown from DMParamControlTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-03 22:57:36 +09:00
Michael Stefaniuc 243ff86fbf dmime: COM cleanup for IDirectMusicTrack of DMParamControlTrack. 2015-07-03 22:57:32 +09:00
Michael Stefaniuc 10f3d166a9 dmime: Implement the E_NOTIMPL methods in DMParamControlTrack. 2015-07-03 22:57:28 +09:00
Michael Stefaniuc aad75398dd dmime: Use the generic IPersistStream for DMLyricsTrack. 2015-07-03 22:57:23 +09:00
Michael Stefaniuc 696168cc00 dmime: Remove the extraneous IUnknown from DMLyricsTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-03 22:57:19 +09:00
Michael Stefaniuc ac277120ba dmime: COM cleanup for IDirectMusicTrack of DMLyricsTrack. 2015-07-03 22:57:14 +09:00
Michael Stefaniuc 1637360fa8 dmime: Implement the E_NOTIMPL methods in DMLyricsTrack. 2015-07-03 22:57:09 +09:00
Michael Stefaniuc 64e8b6c03a dmime: Use the generic IPersistStream for DMSysExTrack. 2015-07-03 22:57:05 +09:00
Michael Stefaniuc b9360bd999 dmime: Remove the extraneous IUnknown from DMSysExTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-03 22:57:00 +09:00
Michael Stefaniuc 9a47a46a95 dmime: COM cleanup for IDirectMusicTrack of DMSysExTrack. 2015-07-03 22:56:54 +09:00
Michael Stefaniuc ac18130e76 dmime: Use the generic IPersistStream for DMSeqTrack. 2015-07-03 22:56:50 +09:00
Michael Stefaniuc 7da799a26f dmime: Remove the extraneous IUnknown from DMSeqTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-03 22:56:44 +09:00
Michael Stefaniuc 1b1d95e9d6 dmime: COM cleanup for IDirectMusicTrack of DMSeqTrack. 2015-07-03 22:56:39 +09:00
Michael Stefaniuc 9b4ed8858f dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSysExTrack. 2015-07-03 22:56:32 +09:00
Michael Stefaniuc 4a7664275f dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSeqTrack. 2015-07-03 22:56:26 +09:00
Michael Stefaniuc 7123c74532 dmime: Use the generic IPersistStream for DMTimeSigTrack. 2015-07-02 19:16:10 +09:00
Michael Stefaniuc ad81735d05 dmime: Remove the extraneous IUnknown from DMTimeSigTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-02 19:16:08 +09:00
Michael Stefaniuc dd1dc8cc81 dmime: COM cleanup for IDirectMusicTrack of DMTimeSigTrack. 2015-07-02 19:16:06 +09:00
Michael Stefaniuc 5bf9d04581 dmime: Use the generic IPersistStream for DMMarkerTrack. 2015-07-02 19:16:04 +09:00
Michael Stefaniuc ef6a803592 dmime: Remove the extraneous IUnknown from DMMarkerTrack.
Also lock/unlock the module only on creation/destruction of the object.
2015-07-02 19:16:02 +09:00
Michael Stefaniuc d487e5e6ce dmime: COM cleanup for IDirectMusicTrack of DMMarkerTrack. 2015-07-02 19:16:00 +09:00
Michael Stefaniuc 5525f5d0fa dmime/tests: Deal with DMTrack objects without IDirectMusicTrack8. 2015-07-02 19:15:58 +09:00
Michael Stefaniuc edfa74fe45 dmime: DMTimeSigTrack doesn't have IDirectMusicTrack8. 2015-07-02 19:15:56 +09:00
Michael Stefaniuc 724fe43db6 dmime: DMMarkerTrack doesn't have IDirectMusicTrack8. 2015-07-02 19:15:54 +09:00
Michael Stefaniuc a2a2ea0311 dmime: Pass objects instead of ifaces to helpers. 2015-07-01 19:18:25 +09:00
Michael Stefaniuc 619c697da0 dmime: Move struct definitions to the files that need them. 2015-06-26 14:14:30 +09:00
Bruno Jesus f9a83377bc dmime: Don't fake success on IDirectMusicUtils_IPersistStream_ParseReference. 2015-06-16 16:51:01 +09:00
Michael Stefaniuc 39cc9da12a dmime/tests: Add IPersistStream tests for DM*Track. 2015-06-16 16:50:47 +09:00
Michael Stefaniuc 060d8a4638 dmime: Use the generic DMObject implementation for DMGraph. 2015-06-15 15:29:05 +09:00
Michael Stefaniuc 2c66b4b235 dmime: Get rid of the extra pointer to a DMUS_OBJECTDESC. 2015-06-15 15:29:05 +09:00
Michael Stefaniuc 93e61eb4e8 dmime: Use the generic DMObject implementation for DMAudioPathConfig. 2015-06-15 15:29:05 +09:00
Michael Stefaniuc 5ba420b635 dmime: Use the generic DirectMusicObject implementation for DMSegment. 2015-06-15 15:29:05 +09:00
Michael Stefaniuc 48ce352ea1 dmime: Remove unused arguments from helper functions. 2015-06-15 15:29:04 +09:00
Michael Stefaniuc 49dd9739dd dmime: Pass objects instead of ifaces to helpers. 2015-06-15 15:29:04 +09:00
Sebastian Lackner cd5f11e941 dmime: Properly set primary dsound buffer in IDirectMusicPerformance8Impl_CreateStandardAudioPath.
Fixes a regression introduced by b3d1b1f239.
2015-05-14 19:27:00 +09:00
Marcus Meissner 59efc5ce64 dmime: Check return code of create_dmgraph (Coverity). 2015-05-06 18:14:29 +09:00
Nikolay Sivov 02ab73beb1 dmime: COM cleanup for IDirectMusicAudioPath. 2015-05-01 15:15:18 +09:00
Nikolay Sivov ef585842d6 dmime: Remove separate IUnknown vtable from IDirectMusicAudioPath impl. 2015-04-29 12:24:51 +09:00
Nikolay Sivov b3d1b1f239 dmime: Don't expose IDirectMusicAudioPath impl details. 2015-04-28 19:07:35 +09:00
Nikolay Sivov b508c85c66 dmime: No need to allocate description separately for IDirectMusicGraph. 2015-04-27 15:10:42 +09:00
Nikolay Sivov 494c674028 dmime/tests: Fix some failures on Win2k VMs. 2015-04-27 15:10:38 +09:00
Nikolay Sivov c6bc5f1a1c dmime: Implement GetClassID() for IDirectMusicGraph. 2015-04-27 15:10:35 +09:00
Nikolay Sivov 2d77891fab dmime: Fix a couple of trace messages. 2015-04-27 15:10:32 +09:00
Michael Stefaniuc 4ffcae35d2 dmime/tests: Remove unused assigments (PVS-Studio). 2015-01-15 14:05:15 +01:00
Bruno Jesus 147bf5bd6f dmime/tests: Fix a crash in Windows 2000. 2014-07-28 17:20:35 -05:00
Marcus Meissner b20365ee29 dmime: Remove useless NULL check (Coverity). 2014-07-22 12:41:22 +02:00
Michael Stefaniuc 8b9fd8939b dmime: Move a struct definition to the .c file that uses it. 2014-06-11 19:15:21 +02:00
Michael Stefaniuc 232aeb6b20 dmime/tests: Rather test for IDirectMusicObject as invalid iface. 2014-06-11 19:15:20 +02:00
Michael Stefaniuc 1a3a6d0084 dmime/tests: Test some IPersistStream methods of objects with DMObject. 2014-06-11 16:12:00 +02:00
Nikolay Sivov a596cbb847 dmime: Fix handling of NULL out pointer in QI. 2014-05-05 12:17:57 +02:00
Frédéric Delanoy 2e5cb7aac8 Assorted spelling/grammar fixes. 2014-04-30 18:34:20 +02:00
Alexandre Julliard 7d3559bfe9 dxguid: Remove some symbols that aren't exported in native. 2014-04-24 12:41:38 +02:00
Nikolay Sivov 91ee56769c dmime: COM cleanup of IDirectMusicGraph interface. 2014-03-03 17:02:11 +01:00
Nikolay Sivov 347da355ba dmime: COM cleanup of IDirectMusicSegmentState8 interface. 2014-02-27 09:27:21 -06:00
Aric Stewart fcae01672f dmime: Do not try to query a NULL direct sound buffer. 2014-02-26 13:38:06 -06:00
Frédéric Delanoy 0f2bed51bd Assorted spelling fixes. 2014-02-10 15:47:29 +01:00
Frédéric Delanoy cd4cd76614 dmime/tests: Use common wine_dbgstr_guid implementation from test.h. 2014-01-28 11:44:50 +01:00
Michael Stefaniuc 03d5b1248b dmime/tests: Fix a crash due to a missing audio driver. 2014-01-13 17:37:39 +01:00
Michael Stefaniuc edddda2374 include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as CLSID_DirectMusicAudioPath.
CLSID_DirectMusicAudioPath is private to Wine and produces the confusion
between the COM objects DirectMusicAudioPath and
DirectMusicAudioPathConfig. But those are totally different things.
2014-01-10 12:09:12 +01:00
Michael Stefaniuc a64bda5b1b dmime/tests: COM tests for DirectMusicAudioPath and DirectMusicAudioPathConfig. 2014-01-10 12:08:06 +01:00
Michael Stefaniuc 0991d3a9bc dmime/tests: COM tests for DirectMusicGraph. 2014-01-10 12:07:59 +01:00
Michael Stefaniuc 13dfc393de dmime/tests: COM tests for the different DirectMusic*Tracks. 2014-01-10 12:07:56 +01:00
Michael Stefaniuc 77bf52b8a2 dmime/tests: Add COM tests for DirectMusicSegmentState. 2014-01-10 12:07:49 +01:00
Michael Stefaniuc d4861c07c4 dmime/tests: Move the unrelated COM test out of performance.c. 2014-01-10 12:07:44 +01:00
Michael Stefaniuc 2343eeff91 dmime: None of the COM classes support COM aggregation. 2014-01-10 12:06:41 +01:00
Michael Stefaniuc a4664409ef dmime: Remove "#if 1" preprocessor directives. 2014-01-09 10:50:27 +01:00
Michael Stefaniuc 8472190aaf dmime: Fix copy and paste errors. 2014-01-08 11:11:37 +01:00
Michael Stefaniuc 996b3c87f1 dmime: Remove the extraneous IUnknown from DirectMusicSegment8.
Also lock/unlock the module only on creation/destruction of the object.
2014-01-07 12:20:30 +01:00
Michael Stefaniuc dc45b8ad06 dmime: COM cleanup for IDirectMusicSegment8. 2014-01-07 12:20:29 +01:00