Attachment #81208 for bug #124804





#endif  /* (__svr4__ || __NetBSD__) && !MAP_TRYFIXED */

static void *get_anon_mmap_null_address(size_t size)
{
    static int got_override = 0;
    static void *low_alloc_ptr = NULL;
    void * current_low_alloc_ptr;

    if (!got_override)
    {
            low_alloc_ptr = (void*)0x10000000;
            got_override = 1;
            //printf("gaak!\n");
    }

    current_low_alloc_ptr = low_alloc_ptr;

    if (low_alloc_ptr)
        low_alloc_ptr += size;

    return current_low_alloc_ptr;
    }

/***********************************************************************
 *		wine_anon_mmap

            return start;
#endif
    }
    if ((start == NULL) && !(flags & MAP_FIXED))
       start = get_anon_mmap_null_address(size);

    return mmap( start, size, prot, flags, fdzero, 0 );
#else
    return (void *)-1;

Lines 110-116 Link Here

(-)wine-a/loader/preloader.c.old (-1 / +1 lines)
110	{	110	{
111	{ (void )0x00000000, 0x00110000 }, / DOS area */	111	{ (void )0x00000000, 0x00110000 }, / DOS area */
112	{ (void )0x7ffe0000, 0x01020000 }, / shared user data + shared heap */	112	{ (void )0x7ffe0000, 0x01020000 }, / shared user data + shared heap */
113	{ (void )0x00110000, 0x1fef0000 }, / PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */	113	{ (void )0x10000000, 0x00f00000 }, / PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */
114	{ 0, 0 } /* end of list */	114	{ 0, 0 } /* end of list */
115	};	115	};
116		116

Return to bug 124804

Lines 161-166 Link Here

(-)wine-a/libs/wine/mmap.c.old (+23 lines)
161		161
162	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */	162	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */
163		163
		164	static void *get_anon_mmap_null_address(size_t size)
		165	{
		166	static int got_override = 0;
		167	static void *low_alloc_ptr = NULL;
		168	void * current_low_alloc_ptr;
		169
		170	if (!got_override)
		171	{
		172	low_alloc_ptr = (void*)0x10000000;
		173	got_override = 1;
		174	//printf("gaak!\n");
		175	}
		176
		177	current_low_alloc_ptr = low_alloc_ptr;
		178
		179	if (low_alloc_ptr)
		180	low_alloc_ptr += size;
		181
		182	return current_low_alloc_ptr;
		183	}
164		184
165	/***********************************************************************	185	/***********************************************************************
166	* wine_anon_mmap	186	* wine_anon_mmap
Lines 209-214 Link Here
209	return start;	229	return start;
210	#endif	230	#endif
211	}	231	}
		232	if ((start == NULL) && !(flags & MAP_FIXED))
		233	start = get_anon_mmap_null_address(size);
		234
212	return mmap( start, size, prot, flags, fdzero, 0 );	235	return mmap( start, size, prot, flags, fdzero, 0 );
213	#else	236	#else
214	return (void *)-1;	237	return (void *)-1;