wine-1.1.8 regression -- wine: could not load L"...": Invalid address

[Vladimir Grebenschikov]

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 <gerald at pfeifer.com> 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 at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-emulation
> To unsubscribe, send any mail to "freebsd-emulation-unsubscribe at freebsd.org"
-- 
Vladimir B. Grebenschikov
vova at fbsd.ru