Two winejack fixes

[Francois Gouget]

For some reason the winejack driver seems to think that there is 16 bits 
in a byte. I think the confusion comes from the fact that Jack does not 
support 8 bit sound (or so it seems from the winejack driver). But 
unless I missed something subtle that still does not make a byte any larger.


Changelog:

  * dlls/winmm/winejack/audio.c
    dlls/winmm/winejack/jack.c

    Francois Gouget <fgouget at codeweavers.com>
    Fix the computation of wBitsPerSample.
    Fix a warning in JACK_drvLoad().


-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: dlls/winmm/winejack/audio.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/winejack/audio.c,v
retrieving revision 1.8
diff -u -r1.8 audio.c
--- a/dlls/winmm/winejack/audio.c	20 Feb 2004 20:19:23 -0000	1.8
+++ b/dlls/winmm/winejack/audio.c	17 Apr 2004 11:57:40 -0000
@@ -1319,8 +1327,8 @@
     /* check for an invalid number of bits per sample */
     if (wwo->format.wBitsPerSample == 0)
     {
-      WARN("Resetting zeroed wBitsPerSample to 16\n");
-      wwo->format.wBitsPerSample = 16 *
+      WARN("Resetting zeroed wBitsPerSample\n");
+      wwo->format.wBitsPerSample = 8 *
       (wwo->format.wf.nAvgBytesPerSec /
        wwo->format.wf.nSamplesPerSec) /
        wwo->format.wf.nChannels;
@@ -2183,8 +2192,8 @@
     /* check for an invalid number of bits per sample */
     if (wwi->format.wBitsPerSample == 0)
     {
-      WARN("Resetting zeroed wBitsPerSample to 16\n");
-      wwi->format.wBitsPerSample = 16 *
+      WARN("Resetting zeroed wBitsPerSample\n");
+      wwi->format.wBitsPerSample = 8 *
       (wwi->format.wf.nAvgBytesPerSec /
        wwi->format.wf.nSamplesPerSec) /
        wwi->format.wf.nChannels;
Index: dlls/winmm/winejack/jack.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/winejack/jack.c,v
retrieving revision 1.3
diff -u -r1.3 jack.c
--- a/dlls/winmm/winejack/jack.c	5 Sep 2003 23:08:27 -0000	1.3
+++ b/dlls/winmm/winejack/jack.c	20 Apr 2004 15:00:41 -0000
@@ -60,7 +60,7 @@
   {
     jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0);
     TRACE("JACK_drvLoad: SONAME_LIBJACK == %s\n", SONAME_LIBJACK);
-    TRACE("JACK_drvLoad: jackhandle == 0x%x\n", jackhandle);
+    TRACE("JACK_drvLoad: jackhandle == %p\n", jackhandle);
     if(!jackhandle)
     {
       FIXME("JACK_drvLoad: error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK);