Compilation broken in CVS

[Paul Millar]

Hi everyone,

Looks like one of the patches broke compiling last night:
  http://www.astro.gla.ac.uk/users/paulm/WRT/buildinfo.php?id=472

I get error messages like:

gcc -shared -Wl,-Bsymbolic,-z,defs,-init,__wine_spec_init,-fini,__wine_spec_fini winearts.drv.spec.o    arts.o audio.o  winearts.drv.dbg.o -o winearts.drv.so -L../../../libs/wine -lwine -L/usr/lib -ldl -lartsc -lpthread -L../../../libs/uuid -lwine_uuid -L../../../libs/port -lwine_port  -lm  -lc
audio.o: In function `wodPlayer_WriteMaxFrags':
/scratch/lilith1/paulm/wine/dlls/winmm/winearts/audio.c:722: undefined reference to `HeapRealloc'
collect2: ld returned 1 exit status
make[2]: *** [winearts.drv.so] Error 1

Anyone else get this?

Cheers,

Paul.

----
Paul Millar

[Mike Hearn]

Hi Paul,

Marcus submitted a patch for this. Should be fixed soon, it's just a silly
typo. That tinderbox type thing is realy cool by the way! :)

[Jeremy Shaw]

Ack!

I did test my patch before sending in it, but I am a doofus. I made
the changes in one copy of the source tree, but compiled and tested a
different copy of the source tree. So I didn't actually test the patch
at all!!

grr!

Here is a patch to fix things. You should use this patch instead of
Marcus' if you actually want to use the winearts driver because in
addition to the typo, I didn't realize at first that I needed to
assign the return value of HeapReAlloc() back to
wwo->sound_buffer. (But it's rather obvious once I realized it)

--- orig/dlls/winmm/winearts/audio.c
+++ mod/dlls/winmm/winearts/audio.c
@@ -719,7 +719,7 @@
     {
       if(wwo->sound_buffer)
       {
-	HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite);
+	wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite);
    wwo->buffer_size = toWrite;
       }
     }

At Fri, 09 Jan 2004 15:55:47 +0000,
Mike Hearn wrote:
> Hi Paul,
>
> Marcus submitted a patch for this. Should be fixed soon, it's just a silly
> typo. That tinderbox type thing is realy cool by the way! :)

[Jeremy Shaw]

Gah!

Correction, you should use it in addition to Marcus' patch.

Jeremy, airhead, Shaw.

At Fri, 09 Jan 2004 11:26:19 -0800,
Jeremy Shaw wrote:
> Ack!
>
> I did test my patch before sending in it, but I am a doofus. I made
> the changes in one copy of the source tree, but compiled and tested a
> different copy of the source tree. So I didn't actually test the patch
> at all!!
>
> grr!
>
> Here is a patch to fix things. You should use this patch instead of
> Marcus' if you actually want to use the winearts driver because in
> addition to the typo, I didn't realize at first that I needed to
> assign the return value of HeapReAlloc() back to
> wwo->sound_buffer. (But it's rather obvious once I realized it)
>
> --- orig/dlls/winmm/winearts/audio.c
> +++ mod/dlls/winmm/winearts/audio.c
> @@ -719,7 +719,7 @@
>      {
>        if(wwo->sound_buffer)
>        {
> - HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite);
> - wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, toWrite);
> wwo->buffer_size = toWrite;
>   }
> }
>
> At Fri, 09 Jan 2004 15:55:47 +0000,
> Mike Hearn wrote:
> > Hi Paul,
> >
> > Marcus submitted a patch for this. Should be fixed soon, it's just a silly
> > typo. That tinderbox type thing is realy cool by the way! :)

[Paul Millar]

Hi Mike,

On Fri, 9 Jan 2004, Mike Hearn wrote:
> Marcus submitted a patch for this. Should be fixed soon, it's just a silly
> typo.

Cool.
> That tinderbox type thing is realy cool by the way! :)

Thanks!  I'm just putting some final touches and regression testing the
code.  Once they're done, I should /finally/ get a v0.1 release out for
anyone interested.

Cheers,

----
Paul Millar