---<br> dlls/dsound/primary.c |   22 ----------------------<br> 1 files changed, 0 insertions(+), 22 deletions(-)<br><br>diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c<br>index aa8450f..11eb003 100644<br>--- a/dlls/dsound/primary.c<br>
+++ b/dlls/dsound/primary.c<br>@@ -200,16 +200,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)<br>             device-&gt;prebuf = device-&gt;helfrags;<br>     }<br> <br>-    device-&gt;mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device-&gt;buflen);<br>
-    device-&gt;mix_buffer = HeapAlloc(GetProcessHeap(), 0, device-&gt;mix_buffer_len);<br>-    if (!device-&gt;mix_buffer)<br>-    {<br>-        if (device-&gt;hwbuf)<br>-            IDsDriverBuffer_Release(device-&gt;hwbuf);<br>
-        device-&gt;hwbuf = NULL;<br>-        return DSERR_OUTOFMEMORY;<br>-    }<br>-<br>     if (device-&gt;state == STATE_PLAYING) device-&gt;state = STATE_STARTING;<br>     else if (device-&gt;state == STATE_STOPPING) device-&gt;state = STATE_STOPPED;<br>
 <br>@@ -278,10 +268,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)<br> <br>         TRACE(&quot;fraglen=%d, overshot=%d\n&quot;, device-&gt;fraglen, overshot);<br>     }<br>-    device-&gt;mixfunction = mixfunctions[device-&gt;pwfx-&gt;wBitsPerSample/8 - 1];<br>
-    device-&gt;normfunction = normfunctions[device-&gt;pwfx-&gt;wBitsPerSample/8 - 1];<br>     FillMemory(device-&gt;buffer, device-&gt;buflen, (device-&gt;pwfx-&gt;wBitsPerSample == 8) ? 128 : 0);<br>-    FillMemory(device-&gt;mix_buffer, device-&gt;mix_buffer_len, 0);<br>
     device-&gt;pwplay = device-&gt;pwqueue = device-&gt;playpos = device-&gt;mixpos = 0;<br>     return err;<br> }<br>@@ -581,22 +568,13 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE<br>
         }<br>     }<br> <br>-    device-&gt;mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device-&gt;buflen);<br>-    device-&gt;mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device-&gt;mix_buffer, device-&gt;mix_buffer_len);<br>
-    FillMemory(device-&gt;mix_buffer, device-&gt;mix_buffer_len, 0);<br>-    device-&gt;mixfunction = mixfunctions[device-&gt;pwfx-&gt;wBitsPerSample/8 - 1];<br>-    device-&gt;normfunction = normfunctions[device-&gt;pwfx-&gt;wBitsPerSample/8 - 1];<br>
-<br>     if (nSamplesPerSec != device-&gt;pwfx-&gt;nSamplesPerSec || bpp != device-&gt;pwfx-&gt;wBitsPerSample || chans != device-&gt;pwfx-&gt;nChannels) {<br>         IDirectSoundBufferImpl** dsb = device-&gt;buffers;<br>
         for (i = 0; i &lt; device-&gt;nrofbuffers; i++, dsb++) {<br>             /* **** */<br>             RtlAcquireResourceExclusive(&amp;(*dsb)-&gt;lock, TRUE);<br> <br>-            (*dsb)-&gt;freqAdjust = ((DWORD64)(*dsb)-&gt;freq &lt;&lt; DSOUND_FREQSHIFT) / device-&gt;pwfx-&gt;nSamplesPerSec;<br>
             DSOUND_RecalcFormat((*dsb));<br>-            DSOUND_MixToTemporary((*dsb), 0, (*dsb)-&gt;buflen, FALSE);<br>-            (*dsb)-&gt;primary_mixpos = 0;<br> <br>             RtlReleaseResource(&amp;(*dsb)-&gt;lock);<br>
             /* **** */<br>-- <br>1.7.2.3<br><br><br>