Skip to content

W
wine-cw
Commit 1817d4cc authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard
Browse files
Options

winmm/tests: Use calloc instead of HeapAlloc.

Fixes: bb6bcaf8
parent 2fcbfc4c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/winmm/tests/wave.c
View file @ 1817d4cc
...@@ -1586,8 +1586,7 @@ static void test_fragmentsize(void) ...@@ -1586,8 +1586,7 @@ static void test_fragmentsize(void)
memset(hdr, 0, sizeof(hdr)); memset(hdr, 0, sizeof(hdr));
hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1;
hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2;
hdr[1].lpData = hdr[0].lpData = hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength);
HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength);
rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0]));
ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc));
...@@ -1694,8 +1693,7 @@ static void test_reentrant_callback(void) ...@@ -1694,8 +1693,7 @@ static void test_reentrant_callback(void)
memset(hdr, 0, sizeof(hdr)); memset(hdr, 0, sizeof(hdr));
hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10); hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10);
hdr[1].dwBufferLength = hdr[0].dwBufferLength; hdr[1].dwBufferLength = hdr[0].dwBufferLength;
hdr[1].lpData = hdr[0].lpData = hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength);
HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength);
rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0]));
ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment