Difference for arch/win32/digi.c from version 1.7 to 1.8

version 1.7

version 1.8

Line 4

#include <stdlib.h>

#include <stdio.h>

#include <string.h>

#define byte w32_byte

#define WIN32_LEAN_AND_MEAN

#include <windows.h>

#include <mmsystem.h>

#include <dsound.h>

#undef byte

#include <math.h>

Line 175

Line 177

//added 2000/01/15 Matt Mueller -- remove some duplication (and fix a big memory leak, in the kill=0 one case)

static int DS_release_slot(int slot,int kill){

if (SoundSlots[slot].lpsb) {

unsigned int s;

DWORD s;

IDirectSoundBuffer_GetStatus(SoundSlots[slot].lpsb, &s);

if (s & DSBSTATUS_PLAYING){

if (kill)

Line 285

Line 287

{

char *ptr1, *ptr2;

int len1, len2;

DWORD len1, len2;

IDirectSoundBuffer_Lock(SoundSlots[slot].lpsb, 0, Sounddat(soundnum)->length,

(void **)&ptr1, &len1, (void **)&ptr2, &len2, 0);

memcpy(ptr1,Sounddat(soundnum)->data, MIN(len1, Sounddat(soundnum)->length));

Line 364

Line 365

}

{

char *ptr1, *ptr2;

int len1, len2;

DWORD len1, len2;

IDirectSoundBuffer_Lock(SoundSlots[slot].lpsb, 0, SoundSlots[slot].length,

(void **)&ptr1, &len1, (void **)&ptr2, &len2, 0);

memcpy(ptr1, SoundSlots[slot].samples, MIN(len1,(int)SoundSlots[slot].length));