Attachment #83257 for bug #127777

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

Lines 164-170 Link Here

(-)wine/libs/wine/mmap.c.orig (+21 lines)
164		164
165	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */	165	#endif /* (__svr4__ \|\| __NetBSD__) && !MAP_TRYFIXED */
166		166
		167	static void *get_anon_mmap_null_address(size_t size)
		168	{
		169	static int got_override = 0;
		170	static void *low_alloc_ptr = NULL;
		171	void * current_low_alloc_ptr;
		172
		173	if (!got_override)
		174	{
		175	low_alloc_ptr = (void*)0x10000000;
		176	got_override = 1;
		177	}
167		178
		179	current_low_alloc_ptr = low_alloc_ptr;
		180
		181	if (low_alloc_ptr)
		182	low_alloc_ptr += size;
		183
		184	return current_low_alloc_ptr;
		185	}
		186
168	/***********************************************************************	187	/***********************************************************************
169	* wine_anon_mmap	188	* wine_anon_mmap
170	*	189	*
Lines 212-217 Link Here
212	return start;	231	return start;
213	#endif	232	#endif
214	}	233	}
		234	if ((start == NULL) && !(flags & MAP_FIXED))
		235	start = get_anon_mmap_null_address(size);
215	return mmap( start, size, prot, flags, fdzero, 0 );	236	return mmap( start, size, prot, flags, fdzero, 0 );
216	#else	237	#else
217	return (void *)-1;	238	return (void *)-1;

Lines 199-204 Link Here

(-)wine/dlls/x11drv/opengl.c.orig (+6 lines)
199	dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd);	199	dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd);
200	}	200	}
201		201
		202	if (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) {
		203	ERR("Flag not supported !\n");
		204	/* Should SetError here... */
		205	return 0;
		206	}
		207
202	/* Now, build the request to GLX */	208	/* Now, build the request to GLX */
203		209
204	if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) {	210	if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) {




}


/* retrieve the X drawable to use on a given DC */
inline static Drawable get_drawable( HDC hdc )
{
    Drawable drawable;
    enum x11drv_escape_codes escape = X11DRV_GET_DRAWABLE;

    if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape,
                    sizeof(drawable), (LPSTR)&drawable )) drawable = 0;

      }
      TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx);
      ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);
      if(ret && type == OBJ_MEMDC)
          glDrawBuffer(GL_FRONT_LEFT);
  }
  LEAVE_GL();
  TRACE(" returning %s\n", (ret ? "True" : "False"));

Lines 109-116 Link Here

(-)wine/loader/preloader.c.orig (-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 127777

Lines 129-139 Link Here

(-)wine/dlls/opengl32/wgl.c.orig (-5 / +3 lines)
129	}	129	}
130		130
131		131
132	/* retrieve the GLX drawable to use on a given DC */	132	/* retrieve the X drawable to use on a given DC */
133	inline static Drawable get_drawable( HDC hdc )	133	inline static Drawable get_drawable( HDC hdc )
134	{	134	{
135	GLXDrawable drawable;	135	Drawable drawable;
136	enum x11drv_escape_codes escape = X11DRV_GET_GLX_DRAWABLE;	136	enum x11drv_escape_codes escape = X11DRV_GET_DRAWABLE;
137		137
138	if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape,	138	if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape,
139	sizeof(drawable), (LPSTR)&drawable )) drawable = 0;	139	sizeof(drawable), (LPSTR)&drawable )) drawable = 0;
Lines 546-553 Link Here
546	}	546	}
547	TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx);	547	TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx);
548	ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);	548	ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);
549	if(ret && type == OBJ_MEMDC)
550	glDrawBuffer(GL_FRONT_LEFT);
551	}	549	}
552	LEAVE_GL();	550	LEAVE_GL();
553	TRACE(" returning %s\n", (ret ? "True" : "False"));	551	TRACE(" returning %s\n", (ret ? "True" : "False"));