Attachment #91084 for bug #139497

View | Details | Raw Unified | Return to bug 139497
Collapse All | Expand All

Lines 590-596 BOOL WINAPI wglMakeCurrent(HDC hdc, Link Here

(-)a/dlls/opengl32/wgl.c (-1 lines)
590	if(ret && type == OBJ_MEMDC)	590	if(ret && type == OBJ_MEMDC)
591	{	591	{
592	ctx->do_escape = TRUE;	592	ctx->do_escape = TRUE;
593	glDrawBuffer(GL_FRONT_LEFT);
594	}	593	}
595	}	594	}
596	LEAVE_GL();	595	LEAVE_GL();

Lines 607-613 XVisualInfo *X11DRV_setup_opengl_visual( Link Here

(-)a/dlls/winex11.drv/opengl.c (-1 / +1 lines)
607	{	607	{
608	XVisualInfo *visual = NULL;	608	XVisualInfo *visual = NULL;
609	/* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */	609	/* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */
610	int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None};	610	int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 32, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None};
611	if (!has_opengl()) return NULL;	611	if (!has_opengl()) return NULL;
612		612
613	wine_tsx11_lock();	613	wine_tsx11_lock();

Lines 183-189 static int try_mmap_fixed (void *addr, s Link Here

(-)a/libs/wine/mmap.c (+21 lines)
183		183
184	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */	184	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */
185		185
		186	static void *get_anon_mmap_null_address(size_t size)
		187	{
		188	static int got_override = 0;
		189	static void *low_alloc_ptr = NULL;
		190	void * current_low_alloc_ptr;
		191
		192	if (!got_override)
		193	{
		194	low_alloc_ptr = (void*)0x10000000;
		195	got_override = 1;
		196	}
		197
		198	current_low_alloc_ptr = low_alloc_ptr;
		199
		200	if (low_alloc_ptr)
		201	low_alloc_ptr += size;
186		202
		203	return current_low_alloc_ptr;
		204	}
		205
187	/***********************************************************************	206	/***********************************************************************
188	* wine_anon_mmap	207	* wine_anon_mmap
189	*	208	*
Lines 213-218 #elif defined(__svr4__) \|\| defined(__Net Link Here
213	return start;	232	return start;
214	#endif	233	#endif
215	}	234	}
		235	if ((start == NULL) && !(flags & MAP_FIXED))
		236	start = get_anon_mmap_null_address(size);
216	return mmap( start, size, prot, flags, get_fdzero(), 0 );	237	return mmap( start, size, prot, flags, get_fdzero(), 0 );
217	}	238	}
218		239

Lines 109-116 #endif Link Here

(-)a/loader/preloader.c (-2 / +2 lines)
109	static struct wine_preload_info preload_info[] =	109	static struct wine_preload_info preload_info[] =
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 )0x80000000, 0x01000000 }, / 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 139497