April 2006 - Wine-commits - list.winehq.org

Mikołaj Zalewski : include: Fix a mistake in the declaration of _sntprintf.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 61512b202128041523ef64ceaafc954fdb7f7270 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61512b202128041523ef64c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Apr 13 10:21:51 2006 +0200 include: Fix a mistake in the declaration of _sntprintf. --- include/tchar.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 9af9f0a..e220485 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -95,7 +95,7 @@ extern "C" { #define _puttc WINE_tchar_routine(putc, putc, putwc) #define _puttchar WINE_tchar_routine(putchar, putchar, putwchar) #define _putts WINE_tchar_routine(puts, puts, putws) -#define _sntprintf WINE_tchar_routine(sprintf, sprintf, swprintf) +#define _sntprintf WINE_tchar_routine(snprintf, snprintf, snwprintf) #define _stprintf WINE_tchar_routine(sprintf, sprintf, swprintf) #define _stscanf WINE_tchar_routine(sscanf, sscanf, swscanf) #define _taccess WINE_tchar_routine(access, _access, _waccess)

1 0

Mike McCormack : widl: Add support for VT_I8 and VT_UI8 to msft typelibs.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 1d453ab55139fe1481eb78640966ecd7fa3d73b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d453ab55139fe1481eb786… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 13 20:06:53 2006 +0900 widl: Add support for VT_I8 and VT_UI8 to msft typelibs. --- tools/widl/write_msft.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 2af7d66..0305160 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -750,6 +750,8 @@ static int encode_type( break; case VT_R8: + case VT_I8: + case VT_UI8: *encoded_type = default_type; *width = 8; *alignment = 8;

1 0

Mike McCormack : wtypes.idl: Add size attribute to a void pointer.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: 54d3060a2db33e160c144dd0bbd787c859ddd73a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54d3060a2db33e160c144dd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 13 20:07:29 2006 +0900 wtypes.idl: Add size attribute to a void pointer. --- include/wtypes.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 0e0fed7..49aadbc 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -135,7 +135,7 @@ typedef struct _SECURITY_DESCRIPTOR { typedef struct _SECURITY_ATTRIBUTES { DWORD nLength; - LPVOID lpSecurityDescriptor; + [size_is(nLength)] LPVOID lpSecurityDescriptor; BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;

1 0

Alexandre Julliard : server: Remove the use_ptrace variable.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: f9ff7bf4d9a49c9a3516b77c27acd51d8045345e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9ff7bf4d9a49c9a3516b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 21:52:55 2006 +0200 server: Remove the use_ptrace variable. --- server/ptrace.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 9f8441f..ab6905b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -71,8 +71,6 @@ inline static int ptrace(int req, ...) { errno = EPERM; return -1; /*FAIL*/ } #endif /* HAVE_SYS_PTRACE_H */ -static const int use_ptrace = 1; /* set to 0 to disable ptrace */ - /* handle a status returned by wait4 */ static int handle_child_status( struct thread *thread, int pid, int status, int want_sig ) {

1 0

Alexandre Julliard : libwine: Reorganize the mmap code a bit to avoid some #ifdefs.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: b7d5b31cf1d8b5553544e9da714c177fe239e384 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7d5b31cf1d8b5553544e9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 21:53:41 2006 +0200 libwine: Reorganize the mmap code a bit to avoid some #ifdefs. --- libs/wine/mmap.c | 64 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 3d25f26..dbfa8a2 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -25,6 +25,7 @@ #include <ctype.h> #include <fcntl.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H @@ -50,14 +51,32 @@ struct reserved_area static struct list reserved_areas = LIST_INIT(reserved_areas); static const int granularity_mask = 0xffff; /* reserved areas have 64k granularity */ +#ifdef HAVE_MMAP + #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif - -#ifndef HAVE_MMAP -static inline int munmap( void *ptr, size_t size ) { return 0; } +#ifndef MAP_PRIVATE +#define MAP_PRIVATE 0 +#endif +#ifndef MAP_ANON +#define MAP_ANON 0 #endif +static inline int get_fdzero(void) +{ + static int fd = -1; + + if (MAP_ANON == 0 && fd == -1) + { + if ((fd = open( "/dev/zero", O_RDONLY )) == -1) + { + perror( "/dev/zero: open" ); + exit(1); + } + } + return fd; +} #if (defined(__svr4__) || defined(__NetBSD__)) && !defined(MAP_TRYFIXED) /*********************************************************************** @@ -172,30 +191,12 @@ static int try_mmap_fixed (void *addr, s */ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) { -#ifdef HAVE_MMAP - static int fdzero = -1; - -#ifdef MAP_ANON - flags |= MAP_ANON; -#else - if (fdzero == -1) - { - if ((fdzero = open( "/dev/zero", O_RDONLY )) == -1) - { - perror( "/dev/zero: open" ); - exit(1); - } - } -#endif /* MAP_ANON */ - #ifdef MAP_SHARED flags &= ~MAP_SHARED; #endif /* Linux EINVAL's on us if we don't pass MAP_PRIVATE to an anon mmap */ -#ifdef MAP_PRIVATE - flags |= MAP_PRIVATE; -#endif + flags |= MAP_PRIVATE | MAP_ANON; if (!(flags & MAP_FIXED)) { @@ -208,19 +209,14 @@ void *wine_anon_mmap( void *start, size_ /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) - if ( try_mmap_fixed( start, size, prot, flags, fdzero, 0 ) ) + if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) ) return start; #endif } - return mmap( start, size, prot, flags, fdzero, 0 ); -#else - return (void *)-1; -#endif + return mmap( start, size, prot, flags, get_fdzero(), 0 ); } -#ifdef HAVE_MMAP - /*********************************************************************** * reserve_area * @@ -329,6 +325,16 @@ void mmap_init(void) #else /* HAVE_MMAP */ +void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) +{ + return (void *)-1; +} + +static inline int munmap( void *ptr, size_t size ) +{ + return 0; +} + void mmap_init(void) { }

1 0

Alexandre Julliard : libwine: Only try to mmap the exact address when reserving memory.
by Alexandre Julliard 14 Apr '06

14 Apr '06

Module: wine Branch: refs/heads/master Commit: e814b24e6d2eb0252a9da9ce074de5d78f1745af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e814b24e6d2eb0252a9da9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 21:55:33 2006 +0200 libwine: Only try to mmap the exact address when reserving memory. This should avoid some extra work on platforms that need the try_mmap_fixed function. --- libs/wine/mmap.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index dbfa8a2..76fb7ff 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -218,6 +218,27 @@ void *wine_anon_mmap( void *start, size_ /*********************************************************************** + * mmap_reserve + * + * mmap wrapper used for reservations, only maps the specified address + */ +static inline int mmap_reserve( void *addr, size_t size ) +{ + void *ptr; + int flags = MAP_PRIVATE | MAP_ANON | MAP_NORESERVE; + +#ifdef MAP_TRYFIXED + flags |= MAP_TRYFIXED; +#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) + return try_mmap_fixed( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); +#endif + ptr = mmap( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); + if (ptr != addr && ptr != (void *)-1) munmap( ptr, size ); + return (ptr == addr); +} + + +/*********************************************************************** * reserve_area * * Reserve as much memory as possible in the given area. @@ -225,19 +246,14 @@ void *wine_anon_mmap( void *start, size_ */ static void reserve_area( void *addr, void *end ) { - void *ptr; size_t size = (char *)end - (char *)addr; if (!size) return; - if ((ptr = wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE )) != (void *)-1) + if (mmap_reserve( addr, size )) { - if (ptr == addr) - { - wine_mmap_add_reserved_area( addr, size ); - return; - } - else munmap( ptr, size ); + wine_mmap_add_reserved_area( addr, size ); + return; } if (size > granularity_mask + 1) {

1 0

lostwages/wwn wn20060410_311.xml
by Jeremy Newman 13 Apr '06

13 Apr '06

ChangeSet ID: 24216 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/13 14:02:55 Modified files: wwn : wn20060410_311.xml Log message: Tony Lambregts <tony.lambregts(a)gmail.com> fix archive link Patch: http://cvs.winehq.org/patch.py?id=24216 Old revision New revision Changes Path 1.2 1.3 +1 -1 lostwages/wwn/wn20060410_311.xml Index: lostwages/wwn/wn20060410_311.xml diff -u -p lostwages/wwn/wn20060410_311.xml:1.2 lostwages/wwn/wn20060410_311.xml:1.3 --- lostwages/wwn/wn20060410_311.xml:1.2 13 Apr 2006 19: 2:55 -0000 +++ lostwages/wwn/wn20060410_311.xml 13 Apr 2006 19: 2:55 -0000 @@ -179,7 +179,7 @@ changed to read "<i>Wine</i>" rather tha <section title="Audio Latency Issues" subject="Re: Implement THREAD_PRIORITY_TIME_CRITICAL" - archive="http://www.winehq.com/pipermail/wine-devel/2006-April/046088.html" + archive="http://www.winehq.com/pipermail/wine-devel/2006-April/046139.html" posts="55" > <topic>Multimedia</topic>

1 0

lostwages/ include/winehq.conf wwn/wn20060410_ ...
by WineHQ 13 Apr '06

13 Apr '06

ChangeSet ID: 24215 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/04/13 12:27:09 Modified files: include : winehq.conf wwn : wn20060410_311.xml Added files: news : 2006041301.xml Log message: news about Wine 0.9.12 and one tiny WWN #311 correction Patch: http://cvs.winehq.org/patch.py?id=24215 Old revision New revision Changes Path 1.35 1.36 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006041301.xml 1.1 1.2 +1 -1 lostwages/wwn/wn20060410_311.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.35 lostwages/include/winehq.conf:1.36 --- lostwages/include/winehq.conf:1.35 13 Apr 2006 17:27: 9 -0000 +++ lostwages/include/winehq.conf 13 Apr 2006 17:27: 9 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.11 +snapshot_date: 0.9.12 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006041301.xml diff -u -p /dev/null lostwages/news/2006041301.xml:1.1 --- /dev/null 13 Apr 2006 17:27: 9 -0000 +++ lostwages/news/2006041301.xml 13 Apr 2006 17:27: 9 -0000 @@ -0,0 +1,29 @@ +<news> + <date>April 13, 2006</date> + <title>Wine 0.9.12 Released</title> + <body> +<p> +Wine 0.9.12 fell out of the git tree this morning. Notable improvements +include: +<ul> + <li>New Winelib Internet Explorer application (all 5 lines of it).</li> + <li>Several improvements to the font support.</li> + <li>More work on the IDL compiler.</li> + <li>Faster drawing of the cards in Solitaire (very important feature).</li> + <li>A number of fixes for issues found by the Coverity code cheker.</li> +</ul></p> +<p> + Hear that? Faster drawing of the cards in Solitaire! I know you're + all psyched about that. +</p><p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.12.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.116">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. Currently official Fedora packages lag behind, but you can get + Wine-0.9.10 by running <tt>yum install wine</tt> from + <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a>. +</p> + </body> +</news> Index: lostwages/wwn/wn20060410_311.xml diff -u -p lostwages/wwn/wn20060410_311.xml:1.1 lostwages/wwn/wn20060410_311.xml:1.2 --- lostwages/wwn/wn20060410_311.xml:1.1 13 Apr 2006 17:27: 9 -0000 +++ lostwages/wwn/wn20060410_311.xml 13 Apr 2006 17:27: 9 -0000 @@ -358,7 +358,7 @@ pre-release kernels until 2.6.17. </section> <section - title="Coverity Scan Wine" + title="Coverity Scans Wine" subject="Coverity doing scans of Wine codebase!" archive="http://www.winehq.com/pipermail/wine-devel/2006-April/046347.html" posts="23"

1 0

Tag wine-0.9.12 : Alexandre Julliard : Release 0.9.12
by Alexandre Julliard 13 Apr '06

13 Apr '06

Module: wine Branch: refs/tags/wine-0.9.12 Tag: 10affb33aa90f949dca5ea0e3bf168f993edb9d6 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=10affb33aa90f949dca5ea0e3b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 13:16:50 2006 +0200 Release 0.9.12

1 0

Alexandre Julliard : Release 0.9.12.
by Alexandre Julliard 13 Apr '06

13 Apr '06

Module: wine Branch: refs/heads/master Commit: 31425c4d58989077dfda42090269293fbccca028 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31425c4d58989077dfda420… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 13 13:16:50 2006 +0200 Release 0.9.12. --- ANNOUNCE | 16 - ChangeLog | 1634 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1652 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=31425c4d58989077dfd…

1 0