[PATCH] (re-)added line, which obviously has been accidently deleted, when switching from memcpy to structs in 0.9.59

Matthias Derer webmaster at tonstube.de
Mon Apr 21 13:47:05 CDT 2008

In version 0.9.59, a patch by Andrew Talbot introduced the use of structs instead of memcpy.
In the patch for dlls/winejack.drv/audio.c he obviously deleted a line which shouldn't have been deleted
resulting in buffer underruns when using the jack driver in wine.
I just "undeleted" the line (assigning wFlags to the output).

fixes http://bugs.winehq.org/show_bug.cgi?id=12680

Changelog entry:
(re-)added line, which has been deleted, when switching from memcpy to structs

 dlls/winejack.drv/audio.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c
index 0e742f4..b196e4a 100644
--- a/dlls/winejack.drv/audio.c
+++ b/dlls/winejack.drv/audio.c
@@ -1307,6 +1307,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)

     dwFlags &= ~WAVE_DIRECTSOUND;  /* direct sound not supported, ignore the flag */
+    wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
     wwo->waveDesc = *lpDesc;
     memcpy(&wwo->format,   lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));

More information about the wine-patches mailing list