Re: dll/winmm/playsound.c

[Robert Shearman]

Ulrich Czekalla wrote:
> fccType may be NULL or contain non-printable characters. Show output as hex
> instead of characters.
>
> ChangeLog:
>    Ulrich Czekalla <ulrich(a)codeweavers.com>
>    Display fccType as hex instead of characters in trace output
>
> ------------------------------------------------------------------------
>
> Index: dlls/winmm/playsound.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/winmm/playsound.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 playsound.c
> --- dlls/winmm/playsound.c	13 Jul 2005 11:59:15 -0000	1.17
> +++ dlls/winmm/playsound.c	8 Sep 2005 14:42:09 -0000
> @@ -328,7 +328,7 @@ static DWORD WINAPI proc_PlaySound(LPVOI
>     if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK))
>   goto errCleanUp;
>
> -    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n",
> +    TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08lX \n",
>     (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);
>
> lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize);
> @@ -349,7 +349,7 @@ static DWORD WINAPI proc_PlaySound(LPVOI
>     if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK))
>   goto errCleanUp;
>
> -    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n",
> +    TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08lX\n",
>     (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);

I think these formats should be %04x as fccType is 2 bytes, not 4 bytes.

-- 
Rob Shearman

dll/winmm/playsound.c

[Ulrich Czekalla]

fccType is type FOURCC which is a DWORD.

/Ulrich

On Thu, Sep 08, 2005 at 11:28:56AM -0500, Robert Shearman wrote:
> I think these formats should be %04x as fccType is 2 bytes, not 4 bytes.

dll/winmm/playsound.c

[Frank Richter]

On 08.09.2005 18:28, Robert Shearman wrote:
> > -    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n",
> > +    TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08lX \n",
> >       (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);

Note that you're also printing the hex value of the  pointer to
mmckInfo.fccType ... you probably want to remove "(LPSTR)&".

-f.r.