dlls/kernel/heap.c breakage

[Gerald Pfeifer]

Robert,

the following change to dlls/kernel/heap.c broke FreeBSD, both 4.10
and 5.2:

revision 1.10
   date: 2004/08/13 00:41:34;  author: julliard;  state: Exp;  lines: +115 -88
   Robert Reif 
   Use GlobalMemoryStatusEx in GlobalMemoryStatus rather than the other
   way around.

The failure mode is the following:

/sw/gcc-3.3.2/bin/gcc -c -I. -I. -I../../include -I../../include
   -D__WINESRC__ -D_KERNEL32_ -DETCDIR=""/tmp/WINE/etc"" -D_REENTRANT -fPIC
   -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+
   -Wpointer-arith  -g -O2 -o heap.o heap.c
   heap.c: In function `GlobalMemoryStatusEx':
   heap.c:1127: error: structure has no member named `ullMemoryLoad'
   heap.c:1133: error: structure has no member named `ullMemoryLoad'
   gmake: *** [heap.o] Error 1

Would you mind fixing this?

Gerald

[Robert Reif]

Gerald Pfeifer wrote:
> Robert,
>
> the following change to dlls/kernel/heap.c broke FreeBSD, both 4.10
> and 5.2:

Here is the bsd fix.

Index: dlls/kernel/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/heap.c,v
retrieving revision 1.10
diff -u -r1.10 heap.c
--- dlls/kernel/heap.c	13 Aug 2004 00:41:34 -0000	1.10
+++ dlls/kernel/heap.c	13 Aug 2004 12:25:44 -0000
@@ -1124,13 +1124,13 @@
        lpmemex->ullAvailPhys = *tmp;
             lpmemex->ullTotalPageFile = *tmp;
        lpmemex->ullAvailPageFile = *tmp;
-	    lpmemex->ullMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys;
+	    lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys;
    } else
    {
        lpmemex->ullAvailPhys = lpmemex->ullTotalPhys;
        lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys;
        lpmemex->ullAvailPageFile = lpmemex->ullTotalPhys;
-	    lpmemex->ullMemoryLoad = 0;
+	    lpmemex->dwMemoryLoad = 0;
    }
    free(tmp);

[Gerald Pfeifer]

On Fri, 13 Aug 2004, Robert Reif wrote:
> > the following change to dlls/kernel/heap.c broke FreeBSD, both 4.10
> > and 5.2:
>
> Here is the bsd fix.

Thanks!  Builds like a charm now.

Gerald