Re: Status FreeBSD ? (This time with attachments!)

Index: Make.rules.in
===================================================================
RCS file: /cvsroot/winex/Make.rules.in,v
retrieving revision 1.10
diff -u -p -r1.10 Make.rules.in
--- Make.rules.in	28 Apr 2004 12:56:41 -0000	1.10
+++ Make.rules.in	30 Jun 2004 01:18:16 -0000
@@ -28,6 +28,7 @@ CC        = @CC@
 CPP       = @CPP@
 CFLAGS    = @CFLAGS@
 OPTIONS   = @OPTIONS@ -D_REENTRANT
+SDL_CFLAGS = @SDL_CFLAGS@
 X_CFLAGS  = @X_CFLAGS@
 X_LIBS    = @X_LIBS@
 XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
@@ -42,7 +43,7 @@ DLLWRAPFLAGS = --add-stdcall-alias
 RANLIB    = @RANLIB@
 LN_S      = @LN_S@
 DIVINCL   = $(EXTRAPREINCL) -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL)
-ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
+ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) $(SDL_CFLAGS)
 LDCOMBINE = @LDCOMBINE@
 LDFLAGS   = @LDFLAGS@
 AR        = ar rc
Index: dlls/Makedll.rules.in
===================================================================
RCS file: /cvsroot/winex/dlls/Makedll.rules.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makedll.rules.in
--- dlls/Makedll.rules.in	19 Apr 2002 16:35:56 -0000	1.4
+++ dlls/Makedll.rules.in	30 Jun 2004 01:18:36 -0000
@@ -23,7 +23,7 @@ all: lib$(MODULE).$(LIBEXT)
 # Rules for .so files
 
 lib$(MODULE).so: $(ALL_OBJS) Makefile.in
-	$(LDSHARED) $(LDDLLFLAGS) $(ALL_OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS)
+	$(LDSHARED) $(LDDLLFLAGS) $(ALL_OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(LDFLAGS) $(ALL_LIBS)
 
 # Rules for .dll files
 
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /cvsroot/winex/dlls/ntdll/cdrom.c,v
retrieving revision 1.9
diff -u -p -r1.9 cdrom.c
--- dlls/ntdll/cdrom.c	18 Feb 2004 22:27:40 -0000	1.9
+++ dlls/ntdll/cdrom.c	30 Jun 2004 01:19:00 -0000
@@ -971,27 +971,9 @@ static DWORD CDROM_RawRead(int dev, cons
     }
 #elif defined(__FreeBSD__)
     {
-        struct ioc_read_audio   ira;
-
-        switch (raw->TrackMode)
-        {
-        case YellowMode2:
-            FIXME("YellowMode2: NIY\n");
-            return ret;
-        case XAForm2:
-            FIXME("XAForm2: NIY\n");
-            return ret;
-        case CDDA:
-            /* 2048 = 2 ** 11 */
-            if (raw->DiskOffset.s.HighPart & ~2047) FIXME("Unsupported value\n");
-            ira.address.lba = ((raw->DiskOffset.s.LowPart >> 11) |
-                raw->DiskOffset.s.HighPart << (32 - 11)) - 1;
-            ira.address_format = CD_LBA_FORMAT;
-            ira.nframes = raw->SectorCount;
-            ira.buffer = buffer;
-            io = ioctl(dev, CDIOCREADAUDIO, &ira);
-            break;
-        }
+	off_t lba = ((raw->DiskOffset.s.LowPart >> 11) |
+	    (raw->DiskOffset.s.HighPart << (32 - 11))) - 1;
+	io = pread(dev, buffer, raw->SectorCount * sectSize, lba);
     }
 #elif defined(__NetBSD__)
     {
Index: dlls/sdldrv/Makefile.in
===================================================================
RCS file: /cvsroot/winex/dlls/sdldrv/Makefile.in,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.in
--- dlls/sdldrv/Makefile.in	22 Apr 2002 18:46:08 -0000	1.1
+++ dlls/sdldrv/Makefile.in	30 Jun 2004 01:19:21 -0000
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = sdldrv
 SOVERSION = 1.0
 IMPORTS   = user32 gdi32 kernel32 ntdll
-EXTRALIBS = `sdl-config --static-libs` $(LIBUUID)
+EXTRALIBS = `@SDL_CONFIG@ --static-libs` $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
Index: dlls/sdldrv/sdldrv.h
===================================================================
RCS file: /cvsroot/winex/dlls/sdldrv/sdldrv.h,v
retrieving revision 1.3
diff -u -p -r1.3 sdldrv.h
--- dlls/sdldrv/sdldrv.h	25 Sep 2002 20:26:01 -0000	1.3
+++ dlls/sdldrv/sdldrv.h	30 Jun 2004 01:19:21 -0000
@@ -9,7 +9,7 @@
 //# error You must include config.h to use this header
 #endif
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include "windef.h"
 #include "wingdi.h"
Index: dlls/wininet/internet.h
===================================================================
RCS file: /cvsroot/winex/dlls/wininet/internet.h,v
retrieving revision 1.5
diff -u -p -r1.5 internet.h
--- dlls/wininet/internet.h	12 Jan 2004 22:44:01 -0000	1.5
+++ dlls/wininet/internet.h	30 Jun 2004 01:19:35 -0000
@@ -29,6 +29,9 @@
 #endif
 #ifdef HAVE_NETINET_IN_H
 # include <sys/types.h>
+# ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+# endif
 # include <netinet/in.h>
 #endif
 
Index: server/mem_malloc.c
===================================================================
RCS file: /cvsroot/winex/server/mem_malloc.c,v
retrieving revision 1.2
diff -u -p -r1.2 mem_malloc.c
--- server/mem_malloc.c	24 Jun 2004 20:17:58 -0000	1.2
+++ server/mem_malloc.c	30 Jun 2004 01:19:48 -0000
@@ -2,6 +2,8 @@
 
 /*LINTLIBRARY*/
 
+#include "config.h"
+
 /* #define PH_TRACE 1 */ /* In case you need to see all your allocations and frees */
 #if defined( PH_TRACE )
   #define DEBUG      /* In case you need to turn on some more debug checks to track down a corruptor. Need to have PH_TRACE on to make sense  */
Index: tools/wrc/genres.c
===================================================================
RCS file: /cvsroot/winex/tools/wrc/genres.c,v
retrieving revision 1.2
diff -u -p -r1.2 genres.c
--- tools/wrc/genres.c	2 Dec 2003 19:29:40 -0000	1.2
+++ tools/wrc/genres.c	30 Jun 2004 01:19:54 -0000
@@ -361,7 +361,7 @@ static void put_string(res_t *res, strin
 		if(isterm && (str->size == 0 || (cnt == str->size && c)))
 			put_word(res, 0);
 	}
-	free(str);
+	free_string(str);
 }
 
 /*
@@ -1475,6 +1475,7 @@ static res_t *stringtable2res(stringtabl
 				else
 					put_byte(res, str->size);
 				put_string(res, str, win32 ? str_unicode : str_char, FALSE);
+				free_string(str);
 			}
 			else
 			{
Index: tools/wrc/utils.c
===================================================================
RCS file: /cvsroot/winex/tools/wrc/utils.c,v
retrieving revision 1.3
diff -u -p -r1.3 utils.c
--- tools/wrc/utils.c	25 Sep 2002 20:15:26 -0000	1.3
+++ tools/wrc/utils.c	30 Jun 2004 01:19:55 -0000
@@ -312,6 +312,14 @@ string_t *convert_string(const string_t 
 	return ret;
 }
 
+void free_string(string_t *str)
+{
+    if (str->type == str_unicode)
+	free(str->str.wstr);
+    else /* str->type == str_char */
+	free(str->str.cstr);
+    free(str);
+}
 
 struct lang2cp
 {
Index: tools/wrc/utils.h
===================================================================
RCS file: /cvsroot/winex/tools/wrc/utils.h,v
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.2 utils.h
--- tools/wrc/utils.h	23 Nov 2000 15:18:33 -0000	1.1.1.2
+++ tools/wrc/utils.h	30 Jun 2004 01:19:55 -0000
@@ -32,6 +32,7 @@ char *dupwstr2cstr(const short *str);
 short *dupcstr2wstr(const char *str);
 int compare_name_id(name_id_t *n1, name_id_t *n2);
 string_t *convert_string(const string_t *str, enum str_e type);
+void free_string(string_t *str);
 void set_language(unsigned short lang, unsigned short sublang);
 
 #endif

env\
	CPPFLAGS='-I/usr/local/include'\
	LDFLAGS='-L/usr/local/lib'\
	SDL_CONFIG=`which sdl11-config`\
	LIBPNG='-L/usr/local/lib -lpng -lz'\
    ./configure\
	--prefix=/usr/local\
	--enable-pthreads\
	--enable-sdldrv

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)

iD8DBQFA6SDPD1AymFxBOwgRAialAJwMXj0S1rj8SUbtsc/jhbAoRR8LcwCbB43a
3YbAcGzFt6tLSiUeYpPQKBU=
=xX0L
-----END PGP SIGNATURE-----