Commit Graph

128 Commits

Author SHA1 Message Date
Ove Kaaven ed80878377 Reading joystick 5 when we only support 4 should fail instead of
hang.
1999-01-03 12:28:03 +00:00
Ove Kaaven d4fb05707a Playing a non-existent CD should fail instead of crash. 1999-01-03 12:27:28 +00:00
Michael Veksler ca1bc866cf Moves more stuff from windows.h.
- include/winuser.h - interface relevant to user32.spec
- include/wine/winuser16.h - the old 16 bit interface (internal use)
- include/winbase.h - some minor updates to keep things coherent.
- Lot of other files made to include wine/winuser16.h, which is no
  longer included from windows.h
1999-01-01 18:57:33 +00:00
Marcus Meissner 73458b03cd Changed // comments to /* */ so WINE compiles with non-gcc compilers
again.
1998-12-26 12:54:29 +00:00
Peter Hunnisett 92cbc1d343 Added macros to header file for easier function calling.
Changed implementation a little bit.
Added stubs for dplay3. Still need to break into A and W versions.
1998-12-24 16:27:46 +00:00
Alexandre Julliard fe4038ab3c #elif -> #else 1998-12-24 14:26:41 +00:00
Eric Pouech 4d6248baf1 Changed error values MCI_INTERNAL to their correct values. 1998-12-18 15:13:57 +00:00
Eric Pouech 024d194d5a Removed warning. 1998-12-18 15:08:39 +00:00
Eric Pouech 007a2d6525 No longer sending directly messages to DriverProc but rather go through
MCI layer (required for open/close).
1998-12-18 15:07:18 +00:00
Eric Pouech fdae503e63 Removed incorrect patch for MCI_OPEN anc MCI_CLOSE parameters (thanks to Robert Riggs
for pointing out the bug, see the fix in mcistring.c)
Fixed MCI seeking on CD audio.
1998-12-18 15:05:25 +00:00
Todd Vierling ecc7669dfc - add -lossaudio if needed, and a check for <soundcard.h>, to configure.in
(run autoconf after this).  Note that the check has been altered to break
  out of the AC_CHECK_HEADERS after the first match - this is so
  <sys/soundcard.h>, if found on NetBSD (a `real' OSS), will not conflict
  with the emulated ossaudio.
- check for <soundcard.h> along with the other two in a mutually-exclusive
  manner in the various *.c files that need it; change include of
  "mmsystem.h" to "multimedia.h" so this logic is all in one place
- change mcicda.c to allow for CD audio manipulation on NetBSD.  This
  includes:
  * changing ioctl() calls to be NON-SPLIT with exactly 3 args; on NetBSD
    ossaudio, ioctl() is #defined to be _oss_ioctl by <soundcard.h>, and
    neither splitting with #-directives nor a two-arg ioctl work;
  * changing the #if logic to allow both FreeBSD and NetBSD to share the
    appropriate code blocks
- block out MIDI code for NetBSD (init.c) and/or missing SNDCTL_MIDI_INFO
  (midi.c, mcimidi.c).  NetBSD's OSS emulation does not (yet) support MIDI.
Thanks go to mycroft@netbsd.org for the 99% bulk of this work.
1998-12-15 17:49:02 +00:00
Robert Riggs 4751a509e8 Accept MCI_OPEN and MCI_CLOSE messages in MCICDAUDIO_DriverProc32(). 1998-12-10 09:03:00 +00:00
Marcus Meissner d5e7c7927c Some unnecessary #include and messages removed. 1998-12-09 11:06:00 +00:00
Brian Gerst 33839e9963 Properly implement MCI_CDA_STATUS_TYPE_TRACK.
Fix an off-by-one bug with MCI_STATUS_LENGTH.
1998-12-08 10:34:58 +00:00
Robert Riggs f0fa956384 More general code cleanup for readability.
A few more parameter validation checks.
Return DS_OK rather than 0 in a number of functions.
Fixed primary buffer ref count bug in CreateSoundBuffer().
Handle 1-3 byte sound fragments that would cause buffer overruns.
Clear primary buffer with a neutral value instead of always 0
(because 128 is neutral for 8-bit sound).
Fix bug with mixing 8-bit sound into the primary buffer.
Broke out the main block in DSOUND_thread() to another function for
readability.
Handle "no audio" and "audio busy" cases properly when initializing
dsound. Rename DllCanUnloadNow() to DSOUND_DllCanUnloadNow().
1998-12-07 12:13:01 +00:00
Andreas Mohr 59ae7d94ea Fixed a heap bug. 1998-12-07 10:56:40 +00:00
Robert Riggs b9950124a1 Fixed 8-bit WAV format handling (it is unsigned data).
Fixed off-by-one checks for buffer wrap.
Increment ref count for primary buffer in CreateSoundBuffer().
Added DSBPN_OFFSETSTOP support to position notification code.
Lots of minor parameter validation checks.
Stubs for: IDirectSound_initialize(), IDirectSound_Compact(),
and IDirectSound_GetSpeakerConfig().
Fixed freq shifting with 16-bit data problem, fixed 8bit<->16bit
conversion.
Lots of thread locking for DirectSound buffers.
Dealloc primary buffer when dsound is deallocated.
1998-12-01 12:57:31 +00:00
Eric Pouech 40c7c4f371 Fixed memory/status recovery when error occured in MIDI_mciOpen.
Fixed support for RMID files in MIDI_mciOpen.
Fixed bug for playing MIDI files with tempo changes. Sound output is
now correct, but length of tracks (and therefore of whole file) is not
correct.
Changed error values (INTERNAL => INVALID_FILE) when file cannot be read.
1998-12-01 08:28:43 +00:00
Eric Pouech 95bce834ca Fixed memory/status recovery when error occured in WAVE_mciOpen.
Changed error values (INTERNAL => INVALID_FILE) when file cannot
be read.
1998-12-01 08:27:22 +00:00
Juergen Schmied c8a213a2b6 Stubs for MCIWndCreate[A|W]. 1998-12-01 08:26:45 +00:00
Marcus Meissner 1ff1f7d15f Implemented class factory for dsound. 1998-11-30 11:07:11 +00:00
Eric Pouech 4fa77ce4a1 Moved MCI part to mcimidi.c ; added DriverProc. 1998-11-24 18:31:43 +00:00
Eric Pouech f33f7d2b4c Moved MCI part to mciwave.c ; added some error checking ; added
DriverProc
1998-11-24 18:24:47 +00:00
Eric Pouech 221a0b8d06 Added mcimidi and mciwave. 1998-11-24 18:13:12 +00:00
Eric Pouech 41274f0ce5 Fixed bug in MCI_INFO command ; fixed pause/resume commands ; fixed
seek command.
1998-11-24 17:30:37 +00:00
Eric Pouech b0a64e3a4b Starting writing MCI part ; fixed bug in MCI_INFO command. 1998-11-24 16:36:18 +00:00
Eric Pouech c6d65e06d2 Added some missing stubs in 32 bit part. 1998-11-24 15:27:43 +00:00
Eric Pouech 22c339fdff Made use of new 16/32 MCI message handling in mmsystem.c. 1998-11-24 15:08:41 +00:00
Eric Pouech 210ef5f67d Added some error checking ; made use of new 16/32 MCI message handling
in mmsystem.c ; fixed bug in MCI_INFO command.
1998-11-24 14:34:29 +00:00
Eric Pouech dd49344e58 Added some error checking ; made use of new 16/32 MCI message
handling in mmsystem.c.
Added Win95 command to handle cd-rom with both data and audio ; fixed
bug in MCI_INFO command ; shadowing MCI status for devices that can't
get current status ; fixed status not being updated on cd change.
1998-11-24 14:12:13 +00:00
Eric Pouech ddfecd8c61 Factorized 16/32 bit MCI function by using message mapping from 16
to 32 bits ; added some new prototypes mciSendCommand, mciSendString,
mci(Set/Get)YieldProc ; started writing midiStreamXXX functions - not
yet working. Fixed some issues regarding asynchronous MCI commands ;
fixed MCI_SYSINFO command.
1998-11-24 14:10:21 +00:00
Robert Riggs b0fc58cd13 DirectSound3DListener and DirectSound3DBuffer stubs, new mixer code,
primary buffer is implemented closer to what the SDK docs specify,
other SDK documented behaviour enforced. Completed the devcaps list.
1998-11-22 15:08:48 +00:00
Lionel Ulmer 690d37967e Added correct implementation of GetCaps, changed Play and Stop handling
of positions indexes, suppressed warnings.
1998-11-14 11:28:24 +00:00
Marcus Meissner e0e248eaee Solaris redefines ERR and CS, fixed occurances.
Solaris has TRAPNO in its sigcontext, added to sig_context.h
1998-11-06 16:30:41 +00:00
Eric Pouech 46b68f091c Made mmioSetBuffer callable from 16 and 32 bit code. 1998-11-06 16:04:09 +00:00
Jesper Skov 5c3e457b16 egcs 'ambiguous else' warnings fixes. 1998-11-01 19:27:22 +00:00
Marcus Meissner 1e319975d7 Small fixes. 1998-10-31 12:20:55 +00:00
Marcus Meissner d1165095dc Stub for midiOpenStream (helps hexen2demo). 1998-10-27 15:22:26 +00:00
NF Stevens 1410cdd0c4 A couple of TRACE messages are missing a newline at the end. 1998-10-26 11:04:12 +00:00
Marcus Meissner 07244a5647 Another missing WINAPI. 1998-10-22 16:04:07 +00:00
Marcus Meissner 7c3046dbd8 Some programs (quake2 et al) do check for DSCAPS_EMULDRIVER and stop
to work. 'Adjust' caps flags accordingly.
1998-10-22 15:44:23 +00:00
Brian Litzinger f64e274f86 Fixes for FreeBSD. 1998-10-22 14:47:41 +00:00
Turchanov Sergey 86f5d82f2f Implemented DefDriverProc32 from winmm.dll. 1998-10-18 11:22:36 +00:00
Patrik Stridvall 1e1cf48107 Compile fix for Solaris. 1998-10-17 12:56:00 +00:00
Patrik Stridvall 4b774ca8e1 Compile fix for non OSS systems. 1998-10-17 12:54:39 +00:00
Peter Hunnisett 2abe47bdcc Small, suboptimal, fix for 32 bit cdaudio open routines. Needs proper
32bit cdaudio bit support before it can be removed...
1998-10-17 12:23:22 +00:00
Marcus Meissner f4f1719ca5 Fixed some more missing WINAPIs (hopefully correct). 1998-10-17 12:10:19 +00:00
Turchanov Sergey 8db79c2c57 Fixed PlaySound to start its thread the right way. 1998-10-15 12:13:39 +00:00
Eric Pouech 9f65a719fb Started coding 32 bit MCI handling.
Added Open/Close to low-level MCI drivers (audio, midi, anim, cda).
Wrote MCI MIDI support.
1998-10-11 14:14:24 +00:00
Ove Kaaven 5ce602aeb0 Fixed comments. 1998-10-11 12:31:02 +00:00