From owner-freebsd-emulation@FreeBSD.ORG Tue Nov 25 10:20:38 2008 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E40FA1065670 for ; Tue, 25 Nov 2008 10:20:38 +0000 (UTC) (envelope-from vova@sw.ru) Received: from relay.sw.ru (mailhub.sw.ru [195.214.232.25]) by mx1.freebsd.org (Postfix) with ESMTP id 37F5A8FC1E for ; Tue, 25 Nov 2008 10:20:37 +0000 (UTC) (envelope-from vova@sw.ru) Received: from vbook.fbsd.ru ([10.30.1.111]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id mAPAKWZj003493 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 Nov 2008 13:20:35 +0300 (MSK) Received: from vova by vbook.fbsd.ru with local (Exim 4.69 (FreeBSD)) (envelope-from ) id 1L4v20-000IMC-3Z; Tue, 25 Nov 2008 13:20:32 +0300 From: Vladimir Grebenschikov To: Alex Kozlov In-Reply-To: <20081124220311.GA14308@ravenloft.kiev.ua> References: <20081124220311.GA14308@ravenloft.kiev.ua> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Tue, 25 Nov 2008 13:20:32 +0300 Message-Id: <1227608432.1731.72.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 FreeBSD GNOME Team Port Sender: Vladimir Grebenschikov Cc: Jan Henrik Sylvester , freebsd-emulation@freebsd.org, Gerald Pfeifer Subject: Re: wine-1.1.8 regression -- wine: could not load L"...": Invalid address X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2008 10:20:39 -0000 On Tue, 2008-11-25 at 00:03 +0200, Alex Kozlov wrote: > On Mon, Nov 24, 2008 at 03:07:21AM -0600, Sam Fourman Jr. wrote: > > On Sun, Nov 23, 2008 at 5:41 PM, Gerald Pfeifer wrote: > >> On Mon, 10 Nov 2008, Jan Henrik Sylvester wrote: > >>> On wine-1.1.8, I cannot run many application that used to run fine on > >>> wine-1.1.7, for example an old version (4.10) of irfanview: > >>> wine: could not load L"C:\\irfanview-OLD\\i_view32.exe": Invalid address > > it would appear World of warcraft is still broken. it works fine in 1.1.7 > > wine: could not load L"C:\\Program Files\\World of Warcraft\\Wow.exe": > > Invalid address > Can You please test this patch? (Drop it in emulators/wine/files) > Thanks. Patch helps me. Thank you. Now no more "Invalid address" messages. > Index: dlls/ntdll/virtual.c > @@ -1250,8 +1254,13 @@ > } > > /* try to find space in a reserved area for the virtual heap */ > - if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &heap_base, 1 )) > +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) > + heap_base = wine_anon_mmap( address_space_limit - 10 * VIRTUAL_HEAP_SIZE, > + VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, 0 ); > +#else > + if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &heap_base, 0 )) > heap_base = wine_anon_mmap( NULL, VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, 0 ); > +#endif > > assert( heap_base != (void *)-1 ); > virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, heap_base, VIRTUAL_HEAP_SIZE, > > > -- > Adios > _______________________________________________ > freebsd-emulation@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-emulation > To unsubscribe, send any mail to "freebsd-emulation-unsubscribe@freebsd.org" -- Vladimir B. Grebenschikov vova@fbsd.ru