ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wgl: Don't return prematurely if ConvertPixelFormatWGLtoGLX receives an invalid pixel format.

This commit is contained in:
Chris Robinson 2006-12-02 18:06:42 -08:00 committed by Alexandre Julliard
parent 12e4aa2165
commit b4f0adbf96
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winex11.drv/opengl.c
View File

@ -876,20 +876,26 @@ static BOOL init_formats(Display *display, int screen, Visual *visual)
*/ */
static BOOL ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, int *fmt_index, int *fmt_count) static BOOL ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, int *fmt_index, int *fmt_count)
{ {
int ret;
/* Init the list of pixel formats when we need it */ /* Init the list of pixel formats when we need it */
if(!WineGLPixelFormatListSize) if(!WineGLPixelFormatListSize)
init_formats(display, DefaultScreen(display), visual); init_formats(display, DefaultScreen(display), visual);
if((iPixelFormat <= 0) || (iPixelFormat > WineGLPixelFormatListSize)) { if((iPixelFormat <= 0) || (iPixelFormat > WineGLPixelFormatListSize)) {
ERR("invalid iPixelFormat %d\n", iPixelFormat); ERR("invalid iPixelFormat %d\n", iPixelFormat);
return FALSE; ret = FALSE;
*fmt_index = -1;
}
else {
ret = TRUE;
*fmt_index = WineGLPixelFormatList[iPixelFormat-1].fmt_index;
} }
*fmt_index = WineGLPixelFormatList[iPixelFormat-1].fmt_index;
*fmt_count = WineGLPixelFormatListSize; *fmt_count = WineGLPixelFormatListSize;
TRACE("Returning fmt_index=%d, fmt_count=%d for iPixelFormat=%d\n", *fmt_index, *fmt_count, iPixelFormat); TRACE("Returning fmt_index=%d, fmt_count=%d for iPixelFormat=%d\n", *fmt_index, *fmt_count, iPixelFormat);
return TRUE; return ret;
} }
/* Search our internal pixelformat list for the WGL format corresponding to the given fbconfig */ /* Search our internal pixelformat list for the WGL format corresponding to the given fbconfig */
@ -2272,7 +2278,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
* We don't have to fail yet as a program can specify an invaled iPixelFormat (lets say 0) if it wants to query * We don't have to fail yet as a program can specify an invaled iPixelFormat (lets say 0) if it wants to query
* the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */ * the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */
if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &nWGLFormats)) { if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &nWGLFormats)) {
ERR("Unable to convert iPixelFormat %d to a GLX one, expect problems!\n", iPixelFormat); WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat);
} }
for (i = 0; i < nAttributes; ++i) { for (i = 0; i < nAttributes; ++i) {