December 2008 - Wine-commits

Alexandre Julliard : include: Fix typo in the 64-bit version of GetProcessHeap().
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: dcbe616a0e1c581e6e678a0408d0d98310d250d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbe616a0e1c581e6e678a040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 20:37:42 2008 +0100 include: Fix typo in the 64-bit version of GetProcessHeap(). --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index e3c8ec9..909a3e2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2513,7 +2513,7 @@ extern inline HANDLE WINAPI GetProcessHeap(void) { HANDLE *pdb; #ifdef __x86_64__ - __asm__ __volatile__( ".byte 0x64\n\tmovq 0x60,%0" : "=r" (pdb) ); + __asm__ __volatile__( ".byte 0x65\n\tmovq 0x60,%0" : "=r" (pdb) ); return pdb[0x30 / sizeof(HANDLE)]; /* get dword at offset 0x30 in pdb */ #else __asm__ __volatile__( ".byte 0x64\n\tmovl 0x30,%0" : "=r" (pdb) );

1 0

Alexandre Julliard : ntdll: Convert the handles to server handles in NTDLL_wait_for_multiple_objects.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: e81d453f636b950c1bb16fec782ff26a019ee97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81d453f636b950c1bb16fec7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 20:38:21 2008 +0100 ntdll: Convert the handles to server handles in NTDLL_wait_for_multiple_objects. --- dlls/ntdll/sync.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0cfe893..bad6eab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1037,14 +1037,16 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN const LARGE_INTEGER *timeout, HANDLE signal_object ) { NTSTATUS ret; - int cookie; + int i, cookie; BOOL user_apc = FALSE; + obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0; apc_call_t call; apc_result_t result; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; memset( &result, 0, sizeof(result) ); + for (i = 0; i < count; i++) obj_handles[i] = wine_server_obj_handle( handles[i] ); for (;;) { @@ -1056,7 +1058,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN req->prev_apc = apc_handle; req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, handles, count * sizeof(HANDLE) ); + wine_server_add_data( req, obj_handles, count * sizeof(*obj_handles) ); ret = wine_server_call( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle;

1 0

Alexandre Julliard : ntdll: Fix heap management for 64-bit.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 324a8035323fde78f6b43791b200bebc75dd7d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=324a8035323fde78f6b43791b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 20:38:41 2008 +0100 ntdll: Fix heap management for 64-bit. --- dlls/ntdll/heap.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 99a68d2..b2a6184 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -49,10 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(heap); * better compatibility with NT. */ -/* FIXME: use SIZE_T for 'size' structure members, but we need to make sure - * that there is no unaligned accesses to structure fields. - */ - typedef struct tagARENA_INUSE { DWORD size; /* Block size; must be the first field */ @@ -90,17 +86,19 @@ typedef struct #define ARENA_INUSE_FILLER 0x55 #define ARENA_FREE_FILLER 0xaa -#define ALIGNMENT 8 /* everything is aligned on 8 byte boundaries */ +/* everything is aligned on 8 byte boundaries (16 for Win64) */ +#define ALIGNMENT (2*sizeof(void*)) #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ +#define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) -#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) +#define ROUND_SIZE(size) ((((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET) #define QUIET 1 /* Suppress messages */ #define NOISY 0 /* Report all errors */ /* minimum data size (without arenas) of an allocated block */ /* make sure that it's larger than a free list entry */ -#define HEAP_MIN_DATA_SIZE (2 * sizeof(struct list)) +#define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ @@ -113,9 +111,10 @@ static const SIZE_T HEAP_freeListSizes[] = }; #define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) -typedef struct +typedef union { ARENA_FREE arena; + void *alignment[4]; } FREE_LIST_ENTRY; struct tagHEAP; @@ -771,6 +770,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, totalSize = (totalSize + 0xffff) & 0xffff0000; commitSize = (commitSize + 0xffff) & 0xffff0000; if (!commitSize) commitSize = 0x10000; + totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ @@ -960,7 +960,7 @@ static BOOL HEAP_ValidateFreeArena( SUBHEAP *subheap, ARENA_FREE *pArena ) char *heapEnd = (char *)subheap->base + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ((ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET) { ERR("Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); return FALSE; @@ -1051,7 +1051,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * const char *heapEnd = (const char *)subheap->base + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ((ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET) { if ( quiet == NOISY ) { @@ -1262,7 +1262,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); /* make sure structure alignment is correct */ - assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == 0 ); + assert( (ULONG_PTR)processHeap->freeList % ALIGNMENT == ARENA_OFFSET ); assert( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); }

1 0

Alexandre Julliard : libwine: Don't try to use the preloader on non-i386.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: d2a426a6ab695c9a209a3abd9a8d2d4221960111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a426a6ab695c9a209a3abd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 20:39:05 2008 +0100 libwine: Don't try to use the preloader on non-i386. --- libs/wine/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index ba89811..280241c 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -421,7 +421,7 @@ const char *wine_get_build_id(void) /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ static void preloader_exec( char **argv, int use_preloader ) { -#ifdef linux +#if defined(linux) && defined(__i386__) if (use_preloader) { static const char preloader[] = "wine-preloader";

1 0

Alexandre Julliard : msi: Don't include msvcrt headers.
by Alexandre Julliard 12 Dec '08

12 Dec '08

Module: wine Branch: master Commit: 0b99af82b230a46c2d633ee333ebdbcff7208cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b99af82b230a46c2d633ee33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 11 22:27:54 2008 +0100 msi: Don't include msvcrt headers. --- dlls/msi/files.c | 1 - dlls/msi/media.c | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f9311c8..5036efd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -39,7 +39,6 @@ #include "fdi.h" #include "msi.h" #include "msidefs.h" -#include "msvcrt/fcntl.h" #include "msipriv.h" #include "winuser.h" #include "winreg.h" diff --git a/dlls/msi/media.c b/dlls/msi/media.c index bac801d..a236eba 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -24,7 +24,6 @@ #include "winerror.h" #include "wine/debug.h" #include "fdi.h" -#include "msvcrt/fcntl.h" #include "msipriv.h" #include "winuser.h" #include "winreg.h" @@ -33,6 +32,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +/* from msvcrt/fcntl.h */ +#define _O_RDONLY 0 +#define _O_WRONLY 1 +#define _O_RDWR 2 +#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) +#define _O_APPEND 0x0008 +#define _O_RANDOM 0x0010 +#define _O_SEQUENTIAL 0x0020 +#define _O_TEMPORARY 0x0040 +#define _O_NOINHERIT 0x0080 +#define _O_CREAT 0x0100 +#define _O_TRUNC 0x0200 +#define _O_EXCL 0x0400 +#define _O_SHORT_LIVED 0x1000 +#define _O_TEXT 0x4000 +#define _O_BINARY 0x8000 + static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPWSTR source_root) { WCHAR volume_name[MAX_PATH + 1];

1 0

Paul Vriens : winapi_stats: Remove a superfluous '</div>'.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: tools Branch: master Commit: e5416fac9d193476e5dbb52cb10bf2193e84fdc9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e5416fac9d193476e5dbb52c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 11 13:24:57 2008 +0100 winapi_stats: Remove a superfluous '</div>'. --- winapi_stats | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winapi_stats b/winapi_stats index 9de76e5..786017f 100755 --- a/winapi_stats +++ b/winapi_stats @@ -58,5 +58,5 @@ foreach my $dll (sort keys %stats) my $now = `date`; chomp $now; -print "\n</table>\n</div>\n"; +print "\n</table>\n"; print "<p>last modified: $now</p>\n";

1 0

Marcus Meissner : acknowledgement: 12 -> 15 years
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: b86b0c64ad6c4e035b432fbfe69e310101fb7a83 URL: http://source.winehq.org/git/website.git/?a=commit;h=b86b0c64ad6c4e035b432f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 11 08:56:39 2008 +0100 acknowledgement: 12 -> 15 years --- templates/de/acknowledgement.template | 2 +- templates/en/acknowledgement.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 02d847f..9b94aba 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -4,7 +4,7 @@ <h1 class="title">Wine Danksagungen</h1> <p>Wine ist das Ergebnis vieler tausend Stunden Arbeit von hunderten talentierter -Menschen. Die Entwicklung ist bisher seit 12 Jahren im Gang und wir haben viele +Menschen. Die Entwicklung ist bisher seit 15 Jahren im Gang und wir haben viele Leute kommen und gehen sehen. Viele haben im Laufe der Jahre ihre Spuren hinterlassen und dafür möchten wir <i>Danke</i> sagen.</p> diff --git a/templates/en/acknowledgement.template b/templates/en/acknowledgement.template index 3722d70..bebb49f 100644 --- a/templates/en/acknowledgement.template +++ b/templates/en/acknowledgement.template @@ -4,7 +4,7 @@ <h1 class="title">Wine Acknowledgements</h1> <p>Wine is the result of many thousands of hours of work by hundreds of talented -people. Development thus far has been going on for 12 years and we've seen +people. Development thus far has been going on for 15 years and we've seen quite a cast of characters come and go. Many people have left their mark on Wine over the years and for that we'd like to say <i>thank you</i>.</p>

1 0

Jeremy Newman : moving template to match location of en version
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: f18d9f6f0cc3dd74a68be2879a8180ada64b5a1f URL: http://source.winehq.org/git/website.git/?a=commit;h=f18d9f6f0cc3dd74a68be2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 14:03:34 2008 -0600 moving template to match location of en version --- .../deb.template} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/templates/es/download-deb.template b/templates/es/download/deb.template similarity index 100% rename from templates/es/download-deb.template rename to templates/es/download/deb.template

1 0

Jeremy Newman : Who's Who is now in the Wiki
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 8940eab24dd43fc7e00811280c36d2d78ffa3827 URL: http://source.winehq.org/git/website.git/?a=commit;h=8940eab24dd43fc7e00811… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Dec 11 14:02:11 2008 -0600 Who's Who is now in the Wiki --- templates/de/acknowledgement.template | 2 +- templates/en/acknowledgement.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 34f36f3..02d847f 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -55,7 +55,7 @@ haben, die schwierige Probleme angehen... wir schon.</p> Anwendungen. Später wurde das Tool widl als Ersatz für MIDL gestiftet.</dd> <dt class="bold underline">...und weitere Hunderte</dt> - <dd>Falls Du noch nicht die <a href="http://www.winehq.org/site/who">Who's + <dd>Falls Du noch nicht die <a href="http://wiki.winehq.org/WhosWho">Who's Who</a> Liste gesehen hast: dort findest Du eine Übersicht der wichtigsten Mitarbeiter. Darüberhinaus haben die folgenden Mitwirkenden einen erheblichen Beitrag zur Verbesserung von Wine geleistet. Bitte beachte, dass Beiträge zur diff --git a/templates/en/acknowledgement.template b/templates/en/acknowledgement.template index bb48429..3722d70 100644 --- a/templates/en/acknowledgement.template +++ b/templates/en/acknowledgement.template @@ -52,7 +52,7 @@ enough to have paid staff tackling tough problems.. we are.</p> helped new types of programs to install. Later, the widl utility was donated to act as a MIDL replacement.</dd> <dt class="bold underline">...And a cast of hundreds</dt> - <dd>If you haven't seen the <a href="http://www.winehq.org/site/who">Who's + <dd>If you haven't seen the <a href="http://wiki.winehq.org/WhosWho">Who's Who</a> list, check that out for a list of major contributors. In addition, the following individuals have spent a considerable amount of time and effort improving Wine. Also note, contributions to "misc"

1 0

Paul Vriens : Acknowledge the work in the correct year
by Jeremy Newman 11 Dec '08

11 Dec '08

Module: website Branch: master Commit: 2826a753aa4fc03dbb671fcc2ee21d28981b1c23 URL: http://source.winehq.org/git/website.git/?a=commit;h=2826a753aa4fc03dbb671f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Dec 11 17:55:38 2008 +0100 Acknowledge the work in the correct year Hi, Or maybe they intend to start working in 20002 again? Changelog Acknowledge the work in the correct year -- Cheers, Paul. >From 9158107d84062bae8b537886b91ce3bb099cb4c9 Mon Sep 17 00:00:00 2001 From: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu, 11 Dec 2008 17:54:36 +0100 Subject: [PATCH] Acknowledge the work in the correct year --- templates/de/acknowledgement.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/acknowledgement.template b/templates/de/acknowledgement.template index 5a1c937..34f36f3 100644 --- a/templates/de/acknowledgement.template +++ b/templates/de/acknowledgement.template @@ -49,7 +49,7 @@ haben, die schwierige Probleme angehen... wir schon.</p> verbessern. Das ReactOS-Team verantwortet außerdem die Tools Regedit und Task Manager.</dd> <dt class="bold underline"><a href="http://www.transgaming.com">TransGaming</a></dt> - <dd>TransGamings Entwicklungsaufwand, hauptsächlich in 20002, hat mehrere + <dd>TransGamings Entwicklungsaufwand, hauptsächlich in 2002, hat mehrere kritische Bereiche von Wine verbessert. Änderungen an DCOM, DirectDraw und 2D Grafikunterstützung erlaubten das Installieren neuer Arten von Anwendungen. Später wurde das Tool widl als Ersatz für MIDL

1 0