Commit Graph

516 Commits

Author SHA1 Message Date
Maarten Lankhorst
c38bcb96d7 dsound: Use an inline for ring buffer pointer difference calculation. 2007-02-22 11:26:42 +01:00
Maarten Lankhorst
0036298a14 dsound: Add some comments from earlier patch that makes code a little better understandable. 2007-02-22 11:25:35 +01:00
Robert Reif
2e44a3b2a2 dsound: Fix tests for old versions of windows. 2007-01-16 11:19:30 +01:00
Francois Gouget
3327c5f6ff dsound/tests: Replace some '#if 0's with 'if (0)'s. 2007-01-12 11:25:11 +01:00
Francois Gouget
42d25ef95d dsound/tests: The tests link with dsound.dll so use GetModuleHandle() instead of LoadLibrary(). 2007-01-12 11:25:06 +01:00
Francois Gouget
e48d86308d dsound/tests: Replace some '#if 0's with 'if (0)'s. 2007-01-12 11:24:49 +01:00
Michael Stefaniuc
3cf9f84561 dsound: Remove stray '\' at end of lines. 2007-01-09 12:03:46 +01:00
Andrew Talbot
6a9d6ef275 dsound: Remove unused function. 2007-01-09 12:03:38 +01:00
Alexandre Julliard
6addb22017 dsound: The dsconf.h GUIDs are now in libdxguid. 2007-01-08 22:01:56 +01:00
Patrik Stridvall
6e062a4e08 dsound: The GUID:s defined in dsconf.h should be exported by dxguid. 2007-01-08 21:14:31 +01:00
Marcus Meissner
f0280cbd1e made functions and variables static in some testcases. 2006-12-11 12:18:29 +01:00
Dmitry Timoshkov
616b65532b dsound: Make some data const. 2006-11-29 12:44:40 +01:00
Francois Gouget
cc1cb0ad8e dsound/tests: Remove unneeded NONAMELESS* macros. 2006-11-24 11:48:50 +01:00
Francois Gouget
1ccf944900 Assorted spelling fixes. 2006-11-13 13:01:53 +01:00
Michael Stefaniuc
26bd2ec9c3 dsound: Win64 printf format warning fixes. 2006-11-13 12:49:04 +01:00
Michael Stefaniuc
0f08667c8a dsound: Fix the declaration/definition of DSOUND_timer(). 2006-11-13 12:48:27 +01:00
Francois Gouget
30e44c85c8 Assorted spelling fixes. 2006-11-07 15:25:24 +01:00
Michael Stefaniuc
15765dd953 The Data1 member of the GUID struct needs to be an unsigned int too for Win64 compatibility. 2006-10-16 10:53:04 +02:00
Michael Stefaniuc
65aac34c56 dsound/tests: Win64 printf format warning fixes. 2006-10-10 11:56:56 +02:00
Francois Gouget
be87fe8c7c dsound: Don't use state.buffer_size before it has been initialized. 2006-09-29 17:53:31 +02:00
Michael Stefaniuc
85ce5117c5 Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD/LONG/ULONG from long to int. 2006-09-29 16:08:30 +02:00
Alexandre Julliard
32ab895e46 makefiles: Generate the dependencies line to avoid some code duplication. 2006-09-14 09:38:16 +02:00
Alexandre Julliard
5cf75e615a makefiles: Only run test and documentation targets in directories that need them. 2006-08-28 13:37:44 +02:00
Robert Reif
02bd4ad437 dsound: Remove unused parameter from propset functions. 2006-08-23 11:58:38 +02:00
Robert Reif
425608a120 dsound: Add class factory tests. 2006-08-18 12:04:54 +02:00
Robert Reif
595d6aa6fb dsound: Class factory cleanup.
Consolidate all class factories into a single implementation.
Fixes a problem discovered by oleview.
2006-08-18 12:04:49 +02:00
Alexandre Julliard
179a4e0a2e dsound: Make some functions static. 2006-08-02 13:26:14 +02:00
Andrew Talbot
70642e2511 dsound/tests: Write-strings warning fix. 2006-07-31 21:57:54 +02:00
Alexandre Julliard
77dc0d9be5 .gitignore: Added wildcards to ignore generated resource files. 2006-07-10 21:39:00 +02:00
Alexandre Julliard
0fa8baafcb make_dlls: Recursively ignore .ok files in all tests directories. 2006-07-10 21:26:50 +02:00
Alexandre Julliard
edd100b899 make_dlls: Recursively ignore testlist.c in all tests directories. 2006-07-10 21:19:42 +02:00
Alexandre Julliard
5258e061dc make_dlls: Ignore generated import libraries from the top-level .gitignore. 2006-07-10 20:55:58 +02:00
Alexandre Julliard
cc2b3b48e6 Take advantage of the recursive nature of .gitignore for Makefile entries.
Prefix other entries with '/' to make them non-recursive.
2006-07-10 20:47:54 +02:00
Paul Vriens
8f143f190c Use the return value of register_key_guid. 2006-06-30 21:08:07 +02:00
Alexandre Julliard
bc99ac09d3 dsound: Don't use sizeof in traces to avoid printf format warnings. 2006-06-13 14:10:32 +02:00
Alexandre Julliard
bbeeea4b88 dsound: Make the virtual table functions static where possible. 2006-06-10 11:57:48 +02:00
Jonathan Ernst
360a3f9142 Update the address of the Free Software Foundation. 2006-05-23 14:11:13 +02:00
Vitaliy Margolen
4054c06e55 directx: Update file versions to dx9c (compared to win2k). 2006-05-22 11:32:17 +02:00
Robert Shearman
74407105d2 Check the return value from register_key_guid in all the DLL registering code. 2006-05-10 19:38:04 +02:00
Robert Reif
a15ef7b18a dsound: Add DirectSoundBuffer_Lock tests. 2006-05-05 17:29:23 +02:00
Robert Reif
b06a06090a dsound: Check DirectSoundBuffer_Lock parameters.
Check DirectSoundBuffer_Lock parameters and return an error (like 
Windows) rather than fixing up the parameters.
2006-05-05 17:29:13 +02:00
Robert Reif
1f882cd68d dsound: Fix 2 bugs in ds3d tests.
Fix 2 bugs in the error paths of the ds3d.c test (coverity).
2006-04-10 12:22:08 +02:00
Robert Reif
208b0c2e72 dsound: Remove NULL This pointer checks. 2006-04-08 15:53:00 +02:00
Robert Reif
2c4c204371 dsound: Remove unnecessary NULL pointer check. 2006-04-08 15:50:08 +02:00
Robert Reif
44b7760e6a dsound: Set default primary buffer sample rate and bits per sample.
Programs that are written specifically for 2000 and xp don't bother to
set the primary buffer format because it's a noop.  However wine is
patterned after win9x and DirectX 7 or earlier which has a real
primary buffer and expects the program to change the primary buffer
format if necessary.
2006-04-08 15:48:59 +02:00
Robert Reif
ba62608996 dsound: Fix capture test.
Remove bogus release of NULL pointer code found by Coverity.
2006-04-07 20:01:40 +02:00
Robert Reif
c460d9becf dsound: Add info to failed tests.
Print format for failed SetFormat calls.
2006-03-15 11:30:17 +01:00
Robert Reif
919ee6b699 dsound: Fix duplex create bug. 2006-02-28 12:40:16 +01:00
Robert Reif
64841caba8 dsound: Fix duplex test. 2006-02-09 12:08:05 +01:00
Robert Reif
6255936c83 dsound: Duplex test fix. 2006-01-25 13:15:25 +01:00
Robert Reif
c82a63ba97 dsound: Primary buffer size change tests.
It looks like Windows doesn't change the primary buffer length when
changing formats so make the tests fail now.
This means the current ALSA implementation is broken when hardware
acceleration is set to full and the primary buffer format is changed.
2006-01-17 16:19:54 +01:00
Robert Reif
03b8fca7e2 dsound: Add full duplex tests. 2006-01-17 16:19:14 +01:00
Robert Reif
27e591959f dsound: Add full duplex support. 2006-01-17 16:13:58 +01:00
Robert Reif
3a4e11cd24 dsound: Convert IDirectSoundImpl from a COM class to a regular class
and move most of the COM functions to the DirectSoundDevice class.
2006-01-17 16:10:15 +01:00
Robert Reif
eb919b5263 dsound: Make dumpCooperativeLevel global.
Remove extern from some function prototypes.
2006-01-16 20:39:52 +01:00
Robert Reif
34ec3a633a dsound: Make some capture functions global. 2006-01-16 20:39:14 +01:00
Robert Reif
52e384f9fb dsound: Rename some functions, make some functions global, and move
some code around.
2006-01-14 17:06:52 +01:00
Robert Reif
2d82fc42f0 dsound: Add DSOUND_PrimarySetFormat and use it to set primary format. 2006-01-14 17:06:22 +01:00
Robert Reif
54cf8ea1ac dsound: Add primary buffer change tests.
Add tests to figure out whether Windows can change the primary buffer
capabilities after setting the buffer format. Based on a patch by Alex
Villacís Lasso.
2006-01-11 12:12:46 +01:00
Robert Reif
e49a5c22fb dsound: Refactor playback.
Replace references of IDirectSoundImpl with DirectSoundDevice to
remove one level of indirection and remove the problem of a three
object circular reference.
2006-01-06 12:35:20 +01:00
Robert Reif
b2d604a9da dsound: Fix double free bug in tests.
Fix double free in tests.  Only happens in interactive mode when
testing duplicated 3D buffers.
2006-01-06 12:16:41 +01:00
Robert Reif
5070268711 dsound: Capture refactoring.
Move initialization code from DirectSoundCapture to
DirectSoundCaptureDevice.
Make DirectSoundCaptureBuffer directly reference
DirectSoundCaptureDevice rather than DirectSoundCapture to eliminate
one level of indirection.
Rename DSOUND_CreateDirectSoundCaptureBuffer to
IDirectSoundCaptureBufferImpl_Create to be consistent.
2006-01-05 13:37:15 +01:00
Robert Reif
7643df49d7 dsound: Capture cleanup.
Move code and function prototypes around to eliminate forward
declarations.  No code is changed.
2006-01-04 14:49:34 +01:00
Robert Reif
0265676a27 dsound: Remove WINAPI from internal functions. 2006-01-03 17:32:50 +01:00
Robert Reif
88ff432164 dsound Add uninitialized check. 2006-01-03 12:11:27 +01:00
Alexandre Julliard
0ec7e1a591 Renamed all .cvsignore files to .gitignore. 2005-11-26 13:10:33 +01:00
Robert Reif
efff88b834 Handle failure on Windows 95 properly.
Make two functions available to all files.
Make format_string() const correct.
2005-11-18 12:04:36 +00:00
Francois Gouget
0edbaf7e80 Remove spaces before '\n' in traces. 2005-11-10 12:14:56 +00:00
Davin McCall
a9a689c592 PhaseCancel subtracts secondary buffer from primary buffer, not the
other way around.
2005-11-01 10:18:55 +00:00
Robert Reif
0c488e76b1 Remove unused variable from IDirectSoundFullDuplexImpl.
Move DirectSoundFullDuplexCreate to get rid of forward declarations.
2005-10-27 10:18:51 +00:00
Robert Reif
669b79b8f5 Change secondary buffer variable name to secondary.
Fix AddRef and Release to use proper class.
2005-10-19 19:21:38 +00:00
Robert Reif
6727c52f3b Include winuser.h so the code compiles cleanly on windows using
windows headers.
2005-10-17 09:24:50 +00:00
Mike O'Regan
5fd4aa6fc4 Tests commented out and FIXME-ed long ago now pass. 2005-10-11 19:57:17 +00:00
Robert Reif
57444565e6 Fix PrimaryBufferImpl pointer to deleted DirectSoundImpl. 2005-10-11 19:26:37 +00:00
Robert Reif
0966d61344 DirectSoundDevice reference count cleanup. 2005-10-10 10:29:13 +00:00
Robert Reif
b6dd5de03f Fix dsound8 test to deal with an installed but unregistered
IDirectSound8.
2005-10-10 10:27:50 +00:00
Alexandre Julliard
7e22be4d84 We are no longer generating .dbg.c files. 2005-09-29 10:35:58 +00:00
Robert Reif
594b7f26e4 Fix capture test to not fail when IDirectSoundCapture class is not
registered.
2005-09-23 10:05:40 +00:00
Marcus Meissner
bd7ec9aca5 The last argument to MultiByteToWideChar is wide character count and
not the buffer size in bytes. Fixed all places where it was wrong.
2005-09-12 22:07:53 +00:00
Alexandre Julliard
261e376495 Fixed a number of pointer to integer conversions that wouldn't work
right on a 64-bit platform.
2005-09-12 15:14:06 +00:00
Alexandre Julliard
c6b005ac69 Fixed some more traces to use the right printf format and avoid
typecasts.
2005-09-12 14:12:46 +00:00
Alexandre Julliard
f8ee161a1b Fixed some traces to use the right printf format and avoid typecasts. 2005-09-12 10:30:05 +00:00
Alexandre Julliard
20a1a203c6 Use a more portable scheme for storing the name of a critical
section.
2005-09-09 10:19:44 +00:00
Alexandre Julliard
7f67b35a0d Replace a few more direct lpVtbl accesses by the proper macros. 2005-09-07 13:28:25 +00:00
Mike McCormack
6dc69f5f54 Fix gcc 4.0 warnings. 2005-09-02 12:26:21 +00:00
Mike McCormack
4a5378efcd Fix some gcc 4.0 warnings. 2005-08-30 08:56:35 +00:00
Vincent Béron
7160af007c Uniformize DllMain TRACEing across dlls. 2005-08-15 10:48:51 +00:00
Alex Villacís Lasso
5577cc739d Correction to earlier assertion patch to allow for buf_mixpos ==
buflen in non-looping case, fixes looping of one-off mixed samples
introduced by previous patch.
2005-08-03 19:13:58 +00:00
Alex Villacís Lasso
7840becd3f Prevent dsb->buf_mixpos from ever remaining past dsb->buflen even if
not in DSBPLAY_LOOPING case, to prevent assertion failure in
DSOUND_MixInBuffer.
2005-08-02 09:47:32 +00:00
Stefan Huehner
aed3fb612d Fix some sign-compare warnings by choosing correct datatypes. 2005-07-15 16:34:04 +00:00
Stefan Huehner
06822b8977 Fix some write-strings warnings. 2005-07-15 09:58:36 +00:00
Mike McCormack
0791d06215 Interlocked LONG* gcc warning fixes. 2005-07-12 19:21:36 +00:00
Mike McCormack
257c337c19 gcc 4.0 -Wpointer-sign fixes (Reg* functions). 2005-07-07 12:08:42 +00:00
Stefan Huehner
863a4b1488 Fix some more -Wstrict-prototypes warnings. 2005-06-21 20:53:13 +00:00
Felix Nawothnig
12168fe749 Accept DSERR_NODRIVER from IDirectSoundCapture_CreateCaptureBuffer. 2005-06-21 20:21:39 +00:00
Robert Reif
0043504155 Fix a typo. 2005-06-21 09:43:29 +00:00
Stefan Huehner
ac6f562b52 Fix more -Wstrict-prototypes warnings. 2005-06-20 14:18:03 +00:00
Robert Reif
e5208ca7a3 Fix roundoff error to prevent negative length. 2005-06-20 14:12:03 +00:00
Francois Gouget
9769816b6e Fix winapi_check documentation warnings. 2005-06-17 20:58:33 +00:00
Alexandre Julliard
2e5cc85dcf Moved config parameters to HKCU\Software\Wine\DirectSound. 2005-06-14 12:34:00 +00:00
Alexandre Julliard
2e4bca9db5 Added magic comments to all Wine-specific registry accesses to make
them easier to grep.
2005-06-13 18:56:00 +00:00
Robert Reif
6b3dc57b5f Make dsound tests loadable on NT4. 2005-06-12 10:41:49 +00:00
Michael Jung
e483b0cf9b Fixed confusing indentation. 2005-06-08 18:32:19 +00:00
Robert Reif
7d9340b864 Fix tests to work with drivers that don't support a primary buffer. 2005-06-05 17:55:08 +00:00
Robert Reif
4c315db1a6 Add tests to check DirectSoundCapture creation.
Fix dsound/capture.c to pass tests.
2005-06-05 17:44:30 +00:00
Robert Reif
5c8fb16893 Finish DirectSoundCapture/DirectSoundCapture8 split.
Add tests to verify split.
2005-06-04 09:38:14 +00:00
Robert Reif
f46e5ce13c Move FullDuplex code from capture.c to duplex.c. 2005-06-02 10:28:34 +00:00
Robert Reif
48da1d52ad Fix property set description for more than one capture device bug.
Add better traces messages.
2005-06-01 20:04:06 +00:00
Dmitry Timoshkov
b67da5b946 Make more of the OLE interface vtables const. 2005-06-01 19:57:42 +00:00
Robert Reif
a2f1fd3aca Add multiple DIRECTSOUND object support (multiple sound cards can play
at the same time).
Fix CoCreateInstance when no sound card is present.
Fix create bug found by Mike Hearn.
2005-05-31 09:31:37 +00:00
Robert Shearman
54160222a0 Rename MODULENAME_Dll* functions to Dll* for better consistency and
type checking.
2005-05-17 14:41:37 +00:00
Alexandre Julliard
34fa35dc99 Added rules for building import libraries in the individual dll
makefiles, and added support for building a .def.a static import
library too.
2005-05-09 14:42:30 +00:00
Robert Reif
70fe39e42c Remove dead code and redundant variables from DSOUND_CalcPlayPosition
and callers.
2005-05-09 09:23:54 +00:00
Alexandre Julliard
d62356aa1e Added rules to build import libraries in the individual dll makefiles.
Generate import libraries with the right name right away instead of
using an intermediate .spec.def file.
2005-05-07 12:39:52 +00:00
Robert Reif
6ec5b351bb Move initialization to IDirectSound_Initialize.
Fix error paths to handle a failed IDirectSound_Initialize.
Add tests for IDirectSound_Initialize.
2005-05-06 19:33:32 +00:00
Francois Gouget
f5c9da6860 Assorted spelling fixes. 2005-05-06 15:44:31 +00:00
Robert Reif
ed2a6e4aae Set driver type properly. 2005-05-04 09:46:41 +00:00
Robert Reif
bc3ad87998 Fully implement WAVEDEVICEMAPPING property set. 2005-04-13 14:39:49 +00:00
Robert Reif
ff77f1343e Initialize primary buffer on open. 2005-04-11 13:00:00 +00:00
James Hawkins
fd6d3567de Remove nonstandard type LPLPVOID. 2005-04-11 12:52:00 +00:00
Robert Reif
2a438aa033 Keep dsound8.c and dsound.c in sync. 2005-03-30 10:21:44 +00:00
Peter Berg Larsen
e732fc023d Janitorial: Get rid of strncpy/strncpyW. 2005-03-28 14:17:51 +00:00
Jakob Eriksson
e4fea46b94 Test fix. 2005-03-22 21:16:04 +00:00
Robert Reif
1e17a784c6 Fix block align error message to show length before fix up. 2005-03-19 17:09:33 +00:00
Robert Reif
c90c9c7473 waveInPrepareHeader and waveInUnprepareHeader are not really needed
because the contents don't change.
2005-03-16 11:30:17 +00:00
Robert Reif
9329e8f831 Unconditionally free memory. Should make smatch happy. 2005-03-15 19:31:55 +00:00
Robert Reif
7f6536c504 Change some global variable names.
Cleanup usage of global dsound variable to not use local variable of
same name.
Almost ready to add support for more than one sound card at the same
time.
2005-03-15 15:40:35 +00:00
Robert Reif
1a843b93b6 Private property sets do not exist in early versions of Direct Sound
so skip tests if not supported.
Add tests for A, W and 1 variations of data.
2005-03-14 10:04:07 +00:00
Robert Reif
ea7fa3c7db Add missing functionality.
Add more and better error messages.
Add checks for failed HeapAlloc.
2005-03-14 10:03:54 +00:00
Robert Reif
aa35787dc7 Don't consider no sound device a failure. 2005-03-05 11:15:27 +00:00
Robert Reif
c3f06fb2e6 Print dsound.dll version from file versioninfo resource. 2005-03-05 10:49:08 +00:00
Robert Reif
3b78212f1d Add secondary buffer SetFrequency test. 2005-02-25 19:17:11 +00:00
Robert Reif
2a052044fe Use nBlockAlign rather than calculating it.
Add a buffer length alignment error message.
2005-02-25 19:16:57 +00:00
Robert Reif
f1d4443435 Change SetCooperativeLevel FIXME to WARN. 2005-02-25 16:50:57 +00:00
Robert Reif
c9e7bad85b Try old buffer description structure on failure with new one. 2005-02-24 17:02:42 +00:00
Robert Reif
3cab60997f Fix tests for win9x and old versions of DirectX. 2005-02-23 12:43:38 +00:00
Robert Reif
99faf74774 Fix capture test to pass on windows 98 when no sound card present or
device already in use.
2005-02-18 12:52:14 +00:00
Robert Reif
2b30370796 Fix block align test. 2005-02-18 12:51:43 +00:00
Robert Reif
c50038542a Some block align cleanups. 2005-02-16 16:26:13 +00:00
Robert Reif
b8d6b310f9 Fixed invalid buffer size by rounding up to next multiple of
nBlockAlign.
Added test to verify buffer rounding behavior.
2005-02-16 16:09:02 +00:00
Robert Reif
f8833daef1 Removed printing of thread id for AddRef and Release because
WINEDEBUG=+tid gives the same result.
General consistency cleanup.
2005-02-11 11:49:05 +00:00
Francois Gouget
9ee0586cfb Don't link with DirectSoundCreate8 as this prevents running with older
versions of DirectX.
2005-02-10 21:21:13 +00:00
Robert Reif
50dc513b0f Print info about primary buffer format. 2005-02-10 20:26:20 +00:00
Robert Reif
0e0544aa72 Signed/unsigned fix and code cleanup. 2005-02-10 17:10:54 +00:00
Robert Reif
249bc5caea Always allocate an empty buffer. 2005-02-10 17:09:20 +00:00
Robert Reif
098817950d Fill new software buffers with silence. 2005-02-09 14:05:00 +00:00
Robert Reif
e70f3e85d8 Fix primary buffer memory leak. 2005-02-01 18:47:23 +00:00
Robert Reif
7d92b5d8b4 Fix structure member name to match windows headers and fix up all
uses.
Nameless struct fix for dsound/propset.c to compile on both windows
and wine.
2005-01-28 17:21:07 +00:00
Robert Reif
47f55d6a28 Don't allow other threads to access the primary buffer while the
format is being changed.
2005-01-24 13:35:57 +00:00
Robert Reif
364c0d53f9 Remove unused includes. 2005-01-24 13:31:27 +00:00