TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix strict-aliasing errors (d1x r1.13)

Browse source
This commit is contained in:
Bradley Bell 2004-05-22 23:01:20 +00:00
parent ad5e1dc5c3
commit 2c9986da72
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2004-05-22 Matthew Mueller <donut@dakotacom.net>
* arch/win32/digi.c: fix strict-aliasing errors (d1x r1.13)
* arch/win32/digi.c, arch/win32/key.c: Fix mismatched arg types in
the win32 code (d1x r1.8, key_arch.c r1.2)

12
arch/win32/digi.c
View file

@ -1,4 +1,4 @@
/* $Id: digi.c,v 1.10 2004-05-22 22:58:07 btb Exp $ */
/* $Id: digi.c,v 1.11 2004-05-22 23:01:20 btb Exp $ */
#define DIGI_SOUND
#define MIDI_SOUND
@ -285,11 +285,11 @@ TryNextChannel:
}
{
char *ptr1, *ptr2;
void *ptr1, *ptr2;
DWORD len1, len2;
IDirectSoundBuffer_Lock(SoundSlots[slot].lpsb, 0, Sounddat(soundnum)->length,
(void **)&ptr1, &len1, (void **)&ptr2, &len2, 0);
&ptr1, &len1, &ptr2, &len2, 0);
memcpy(ptr1, Sounddat(soundnum)->data, MIN(len1, Sounddat(soundnum)->length));
IDirectSoundBuffer_Unlock(SoundSlots[slot].lpsb, ptr1, len1, ptr2, len2);
}
@ -365,13 +365,13 @@ int digi_start_sound_object(int obj)
}
{
char *ptr1, *ptr2;
void *ptr1, *ptr2;
DWORD len1, len2;
IDirectSoundBuffer_Lock(SoundSlots[slot].lpsb, 0, SoundSlots[slot].length,
(void **)&ptr1, &len1, (void **)&ptr2, &len2, 0);
&ptr1, &len1, &ptr2, &len2, 0);
memcpy(ptr1, SoundSlots[slot].samples, MIN(len1, (int)SoundSlots[slot].length));
IDirectSoundBuffer_Unlock(SoundSlots[slot].lpsb, (void *)ptr1, len1, (void *)ptr2, len2);
IDirectSoundBuffer_Unlock(SoundSlots[slot].lpsb, ptr1, len1, ptr2, len2);
}
IDirectSoundBuffer_SetPan(SoundSlots[slot].lpsb, ((int)(f2fl(SoundSlots[slot].pan) * 20000)) - 10000);
IDirectSoundBuffer_SetVolume(SoundSlots[slot].lpsb, D1vol2DSvol(SoundSlots[slot].volume));