wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Alexandre Julliard : kernelbase: Don't use WRITECOPY protection on anonymous mappings.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2ac86fb8c3295886026ba0aaf7d2b38e81f343e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ac86fb8c3295886026ba0aaf7d2b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 21:00:46 2024 +0200 kernelbase: Don't use WRITECOPY protection on anonymous mappings. --- dlls/kernelbase/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index faa6bd7d5ee..… [View More]

1 0

Alistair Leslie-Hughes : msado15: Use the correct version when loading the typelib.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 0a83c4f287b8bd7def878cf566318ad7b89a3d19 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a83c4f287b8bd7def878cf566318a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 19 20:56:28 2024 +1000 msado15: Use the correct version when loading the typelib. --- dlls/msado15/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 6489ae3f9b7..2d2f220c06f … [View More]

1 0

Alexandros Frantzis : winex11: Use default wglGetPixelFormatAttribivARB implementation.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2e5b4ff32a0ae1260d75b2d4ceefd717fead3ffb URL: https://gitlab.winehq.org/wine/wine/-/commit/2e5b4ff32a0ae1260d75b2d4ceefd7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 15:21:55 2024 +0300 winex11: Use default wglGetPixelFormatAttribivARB implementation. Populate all the ARB related fields of advertised pixel formats, so that the default implementation of wglGetPixelFormatAttribivARB (in opengl32) will be … [View More]

1 0

Alexandros Frantzis : winex11: Pass wgl_pixel_format to describe_pixel_format.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 8934fbcdbd87f558cd0f27173f6862ae98f5f391 URL: https://gitlab.winehq.org/wine/wine/-/commit/8934fbcdbd87f558cd0f27173f6862… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 11:41:22 2024 +0300 winex11: Pass wgl_pixel_format to describe_pixel_format. --- dlls/winex11.drv/opengl.c | 132 +++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-)

1 0

Alexandros Frantzis : winex11: Update describe_pixel_format coding style.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 35801043df2b928936d6f27072e4c92f6e4e2ef8 URL: https://gitlab.winehq.org/wine/wine/-/commit/35801043df2b928936d6f27072e4c9… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 18 12:15:52 2024 +0300 winex11: Update describe_pixel_format coding style. --- dlls/winex11.drv/opengl.c | 221 +++++++++++++++++++++++----------------------- 1 file changed, 112 insertions(+), 109 deletions(-) diff --git a/dlls/winex11.drv/… [View More]opengl.c b/dlls/winex11.drv/opengl.c index ab5c7b7776c..ff96a63b06c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1559,126 +1559,129 @@ void destroy_gl_drawable( HWND hwnd ) */ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd ) { - /*XVisualInfo *vis;*/ - int value; - int rb,gb,bb,ab; - const struct glx_pixel_format *fmt; - - if (!has_opengl()) return 0; - - /* Look for the iPixelFormat in our list of supported formats. If it is supported we get the index in the FBConfig table and the number of supported formats back */ - fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); - if (!fmt) { - WARN("unexpected format %d\n", iPixelFormat); - return 0; - } + int value; + int rb, gb, bb, ab; + const struct glx_pixel_format *fmt; - memset(ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); - ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); - ppfd->nVersion = 1; - - /* These flags are always the same... */ - ppfd->dwFlags = PFD_SUPPORT_OPENGL; - /* Now the flags extracted from the Visual */ - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if(value & GLX_WINDOW_BIT) - ppfd->dwFlags |= PFD_DRAW_TO_WINDOW; - - /* On Windows bitmap rendering is only offered using the GDI Software renderer. We reserve some formats (see get_formats for more info) - * for bitmap rendering since we require indirect rendering for this. Further pixel format logs of a GeforceFX, Geforce8800GT, Radeon HD3400 and a - * Radeon 9000 indicated that all bitmap formats have PFD_SUPPORT_GDI. Except for 2 formats on the Radeon 9000 none of the hw accelerated formats - * offered the GDI bit either. */ - ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); - - /* PFD_GENERIC_FORMAT - gdi software rendering - * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (MCD e.g. 3dfx minigl) - * none set - full hardware accelerated by a ICD - * - * We only set PFD_GENERIC_FORMAT on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ - ppfd->dwFlags |= fmt->dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED); - - if (!(ppfd->dwFlags & PFD_GENERIC_FORMAT)) - ppfd->dwFlags |= PFD_SUPPORT_COMPOSITION; - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); - if (value) { - ppfd->dwFlags |= PFD_DOUBLEBUFFER; - ppfd->dwFlags &= ~PFD_SUPPORT_GDI; - } - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STEREO, &value); if (value) ppfd->dwFlags |= PFD_STEREO; - - /* Pixel type */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_RENDER_TYPE, &value); - if (value & GLX_RGBA_BIT) - ppfd->iPixelType = PFD_TYPE_RGBA; - else - ppfd->iPixelType = PFD_TYPE_COLORINDEX; - - /* Color bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_BUFFER_SIZE, &value); - ppfd->cColorBits = value; - - /* Red, green, blue and alpha bits / shifts */ - if (ppfd->iPixelType == PFD_TYPE_RGBA) { - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_RED_SIZE, &rb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_GREEN_SIZE, &gb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_BLUE_SIZE, &bb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &ab); - - ppfd->cBlueBits = bb; - ppfd->cBlueShift = 0; - ppfd->cGreenBits = gb; - ppfd->cGreenShift = bb; - ppfd->cRedBits = rb; - ppfd->cRedShift = gb + bb; - ppfd->cAlphaBits = ab; - if (ab) - ppfd->cAlphaShift = rb + gb + bb; + if (!has_opengl()) return 0; + + /* Look for the iPixelFormat in our list of supported formats. If it is + * supported we get the index in the FBConfig table and the number of + * supported formats back */ + fmt = get_pixel_format( gdi_display, iPixelFormat, TRUE /* Offscreen */); + if (!fmt) + { + WARN( "unexpected format %d\n", iPixelFormat ); + return 0; + } + + memset( ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR) ); + ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); + ppfd->nVersion = 1; + + /* These flags are always the same... */ + ppfd->dwFlags = PFD_SUPPORT_OPENGL; + /* Now the flags extracted from the Visual */ + + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value ); + if (value & GLX_WINDOW_BIT) ppfd->dwFlags |= PFD_DRAW_TO_WINDOW; + + /* On Windows bitmap rendering is only offered using the GDI Software + * renderer. We reserve some formats (see get_formats for more info) for + * bitmap rendering since we require indirect rendering for this. Further + * pixel format logs of a GeforceFX, Geforce8800GT, Radeon HD3400 and a + * Radeon 9000 indicated that all bitmap formats have PFD_SUPPORT_GDI. + * Except for 2 formats on the Radeon 9000 none of the hw accelerated + * formats offered the GDI bit either. */ + ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); + + /* PFD_GENERIC_FORMAT - gdi software rendering + * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver + * (MCD e.g. 3dfx minigl) none set - full hardware accelerated by a ICD + * + * We only set PFD_GENERIC_FORMAT on bitmap formats (see get_formats) as + * that's what ATI and Nvidia Windows drivers do */ + ppfd->dwFlags |= fmt->dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED); + + if (!(ppfd->dwFlags & PFD_GENERIC_FORMAT)) ppfd->dwFlags |= PFD_SUPPORT_COMPOSITION; + + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value ); + if (value) + { + ppfd->dwFlags |= PFD_DOUBLEBUFFER; + ppfd->dwFlags &= ~PFD_SUPPORT_GDI; + } + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_STEREO, &value ); + if (value) ppfd->dwFlags |= PFD_STEREO; + + /* Pixel type */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_RENDER_TYPE, &value ); + if (value & GLX_RGBA_BIT) ppfd->iPixelType = PFD_TYPE_RGBA; + else ppfd->iPixelType = PFD_TYPE_COLORINDEX; + + /* Color bits */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_BUFFER_SIZE, &value ); + ppfd->cColorBits = value; + + /* Red, green, blue and alpha bits / shifts */ + if (ppfd->iPixelType == PFD_TYPE_RGBA) + { + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_RED_SIZE, &rb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_GREEN_SIZE, &gb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_BLUE_SIZE, &bb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_ALPHA_SIZE, &ab ); + + ppfd->cBlueBits = bb; + ppfd->cBlueShift = 0; + ppfd->cGreenBits = gb; + ppfd->cGreenShift = bb; + ppfd->cRedBits = rb; + ppfd->cRedShift = gb + bb; + ppfd->cAlphaBits = ab; + if (ab) ppfd->cAlphaShift = rb + gb + bb; + else ppfd->cAlphaShift = 0; + } else + { + ppfd->cRedBits = 0; + ppfd->cRedShift = 0; + ppfd->cBlueBits = 0; + ppfd->cBlueShift = 0; + ppfd->cGreenBits = 0; + ppfd->cGreenShift = 0; + ppfd->cAlphaBits = 0; ppfd->cAlphaShift = 0; - } else { - ppfd->cRedBits = 0; - ppfd->cRedShift = 0; - ppfd->cBlueBits = 0; - ppfd->cBlueShift = 0; - ppfd->cGreenBits = 0; - ppfd->cGreenShift = 0; - ppfd->cAlphaBits = 0; - ppfd->cAlphaShift = 0; - } + } - /* Accum RGBA bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_RED_SIZE, &rb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_GREEN_SIZE, &gb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_BLUE_SIZE, &bb); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_ACCUM_ALPHA_SIZE, &ab); + /* Accum RGBA bits */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_ACCUM_RED_SIZE, &rb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_ACCUM_GREEN_SIZE, &gb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_ACCUM_BLUE_SIZE, &bb ); + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_ACCUM_ALPHA_SIZE, &ab ); - ppfd->cAccumBits = rb+gb+bb+ab; - ppfd->cAccumRedBits = rb; - ppfd->cAccumGreenBits = gb; - ppfd->cAccumBlueBits = bb; - ppfd->cAccumAlphaBits = ab; + ppfd->cAccumBits = rb + gb + bb + ab; + ppfd->cAccumRedBits = rb; + ppfd->cAccumGreenBits = gb; + ppfd->cAccumBlueBits = bb; + ppfd->cAccumAlphaBits = ab; - /* Aux bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &value); - ppfd->cAuxBuffers = value; + /* Aux bits */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &value ); + ppfd->cAuxBuffers = value; - /* Depth bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value); - ppfd->cDepthBits = value; + /* Depth bits */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value ); + ppfd->cDepthBits = value; - /* stencil bits */ - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_STENCIL_SIZE, &value); - ppfd->cStencilBits = value; + /* stencil bits */ + pglXGetFBConfigAttrib( gdi_display, fmt->fbconfig, GLX_STENCIL_SIZE, &value ); + ppfd->cStencilBits = value; - ppfd->iLayerType = PFD_MAIN_PLANE; + ppfd->iLayerType = PFD_MAIN_PLANE; - if (TRACE_ON(wgl)) { - dump_PIXELFORMATDESCRIPTOR(ppfd); - } + if (TRACE_ON(wgl)) dump_PIXELFORMATDESCRIPTOR( ppfd ); - return nb_onscreen_formats; + return nb_onscreen_formats; } [View Less]

1 0

Alexandros Frantzis : opengl32: Add default implementation for wglGetPixelFormatAttribfvARB.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 3ecd3ff8532ed7e0db5361f9ce5b17077fb887da URL: https://gitlab.winehq.org/wine/wine/-/commit/3ecd3ff8532ed7e0db5361f9ce5b17… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 11:26:55 2024 +0300 opengl32: Add default implementation for wglGetPixelFormatAttribfvARB. The default implementation is always used, and never calls the driver implementation of this function, so we can remove all the driver implementations. … [View More]--- dlls/opengl32/make_opengl | 1 + dlls/opengl32/thunks.c | 10 +--------- dlls/opengl32/wgl.c | 28 ++++++++++++++++++++++++++++ dlls/winemac.drv/opengl.c | 41 +---------------------------------------- dlls/winex11.drv/opengl.c | 37 +------------------------------------ 5 files changed, 32 insertions(+), 85 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 42cc0c78ab3..771793b9049 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -181,6 +181,7 @@ my %manual_win_thunks = "wglGetExtensionsStringARB" => 1, "wglGetExtensionsStringEXT" => 1, "wglGetPixelFormat" => 1, + "wglGetPixelFormatAttribfvARB" => 1, "wglGetPixelFormatAttribivARB" => 1, "wglGetProcAddress" => 1, "wglQueryCurrentRendererStringWINE" => 1, diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index 2bd1dd302ee..3ee1776daef 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -24217,15 +24217,6 @@ static HDC WINAPI wglGetPbufferDCARB( HPBUFFERARB hPbuffer ) return args.ret; } -static BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues ) -{ - struct wglGetPixelFormatAttribfvARB_params args = { .teb = NtCurrentTeb(), .hdc = hdc, .iPixelFormat = iPixelFormat, .iLayerPlane = iLayerPlane, .nAttributes = nAttributes, .piAttributes = piAttributes, .pfValues = pfValues }; - NTSTATUS status; - TRACE( "hdc %p, iPixelFormat %d, iLayerPlane %d, nAttributes %u, piAttributes %p, pfValues %p\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues ); - if ((status = UNIX_CALL( wglGetPixelFormatAttribfvARB, &args ))) WARN( "wglGetPixelFormatAttribfvARB returned %#lx\n", status ); - return args.ret; -} - static int WINAPI wglGetSwapIntervalEXT(void) { struct wglGetSwapIntervalEXT_params args = { .teb = NtCurrentTeb() }; @@ -24331,6 +24322,7 @@ extern GLboolean WINAPI glUnmapNamedBufferEXT( GLuint buffer ); extern HDC WINAPI wglGetCurrentReadDCARB(void); extern const char * WINAPI wglGetExtensionsStringARB( HDC hdc ); extern const char * WINAPI wglGetExtensionsStringEXT(void); +extern BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues ); extern BOOL WINAPI wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues ); extern const GLchar * WINAPI wglQueryCurrentRendererStringWINE( GLenum attribute ); extern const GLchar * WINAPI wglQueryRendererStringWINE( HDC dc, GLint renderer, GLenum attribute ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6c4e82a548f..2ae79a56f9e 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -577,6 +577,34 @@ BOOL WINAPI wglGetPixelFormatAttribivARB( HDC hdc, int index, int plane, UINT co return TRUE; } +/*********************************************************************** + * wglGetPixelFormatAttribfvARB (OPENGL32.@) + */ +BOOL WINAPI wglGetPixelFormatAttribfvARB( HDC hdc, int index, int plane, UINT count, + const int *attributes, FLOAT *values ) +{ + int *ivalues; + BOOL ret; + UINT i; + + TRACE( "hdc %p, index %d, plane %d, count %u, attributes %p, values %p\n", + hdc, index, plane, count, attributes, values ); + + if (!(ivalues = malloc( count * sizeof(int) ))) return FALSE; + + /* For now we can piggy-back on wglGetPixelFormatAttribivARB, since we don't support + * any non-integer attributes. */ + ret = wglGetPixelFormatAttribivARB( hdc, index, plane, count, attributes, ivalues ); + if (ret) + { + for (i = 0; i < count; i++) + values[i] = ivalues[i]; + } + + free( ivalues ); + return ret; +} + /*********************************************************************** * wglGetPixelFormat (OPENGL32.@) */ diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a614a5b076b..90e99844d4c 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3391,45 +3391,6 @@ invalid_layer: } -/********************************************************************** - * macdrv_wglGetPixelFormatAttribfvARB - * - * WGL_ARB_pixel_format: wglGetPixelFormatAttribfvARB - */ -static BOOL macdrv_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int iLayerPlane, - UINT nAttributes, const int *piAttributes, FLOAT *pfValues) -{ - int *attr; - int ret; - - TRACE("hdc %p iPixelFormat %d iLayerPlane %d nAttributes %u piAttributes %p pfValues %p\n", - hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues); - - /* Allocate a temporary array to store integer values */ - attr = malloc(nAttributes * sizeof(int)); - if (!attr) - { - ERR("couldn't allocate %d array\n", nAttributes); - return GL_FALSE; - } - - /* Piggy-back on wglGetPixelFormatAttribivARB */ - ret = macdrv_wglGetPixelFormatAttribivARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, attr); - if (ret) - { - UINT i; - - /* Convert integer values to float. Should also check for attributes - that can give decimal values here */ - for (i = 0; i < nAttributes; i++) - pfValues[i] = attr[i]; - } - - free(attr); - return ret; -} - - /********************************************************************** * macdrv_wglGetSwapIntervalEXT * @@ -4136,7 +4097,7 @@ static void load_extensions(void) register_extension("WGL_ARB_pixel_format"); opengl_funcs.ext.p_wglChoosePixelFormatARB = macdrv_wglChoosePixelFormatARB; - opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = macdrv_wglGetPixelFormatAttribfvARB; + opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = (void *)1; /* never called */ opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = macdrv_wglGetPixelFormatAttribivARB; if (gluCheckExtension((GLubyte*)"GL_ARB_color_buffer_float", (GLubyte*)gl_info.glExtensions)) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 09105a8c842..ab5c7b7776c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2966,41 +2966,6 @@ pix_error: return GL_FALSE; } -/** - * X11DRV_wglGetPixelFormatAttribfvARB - * - * WGL_ARB_pixel_format: wglGetPixelFormatAttribfvARB - */ -static BOOL X11DRV_wglGetPixelFormatAttribfvARB( HDC hdc, int iPixelFormat, int iLayerPlane, - UINT nAttributes, const int *piAttributes, FLOAT *pfValues ) -{ - int *attr; - int ret; - UINT i; - - TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues); - - /* Allocate a temporary array to store integer values */ - attr = malloc( nAttributes * sizeof(int) ); - if (!attr) { - ERR("couldn't allocate %d array\n", nAttributes); - return GL_FALSE; - } - - /* Piggy-back on wglGetPixelFormatAttribivARB */ - ret = X11DRV_wglGetPixelFormatAttribivARB(hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, attr); - if (ret) { - /* Convert integer values to float. Should also check for attributes - that can give decimal values here */ - for (i=0; i<nAttributes;i++) { - pfValues[i] = attr[i]; - } - } - - free( attr ); - return ret; -} - /** * X11DRV_wglBindTexImageARB * @@ -3260,7 +3225,7 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension( "WGL_ARB_pixel_format" ); opengl_funcs.ext.p_wglChoosePixelFormatARB = X11DRV_wglChoosePixelFormatARB; - opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = X11DRV_wglGetPixelFormatAttribfvARB; + opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = (void *)1; /* never called */ opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = X11DRV_wglGetPixelFormatAttribivARB; if (has_extension( glxExtensions, "GLX_ARB_fbconfig_float")) [View Less]

1 0

Alexandros Frantzis : opengl32: Add default implementation for wglGetPixelFormatAttribivARB.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 5b126f78069e61fab53f8ecd8b002aa936f9a86f URL: https://gitlab.winehq.org/wine/wine/-/commit/5b126f78069e61fab53f8ecd8b002a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 12 10:56:13 2024 +0300 opengl32: Add default implementation for wglGetPixelFormatAttribivARB. Extend the wgl_pixel_format struct with extra fields required to implement wglGetPixelFormatAttribivARB in opengl32.dll. The default implementation will … [View More]

1 0

Eric Pouech : cmd: Fix delay expansion in FOR loop for filesets.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 6d6fee9ddaad1a2528135b3ef634c6fce674409a URL: https://gitlab.winehq.org/wine/wine/-/commit/6d6fee9ddaad1a2528135b3ef634c6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 14:04:02 2024 +0200 cmd: Fix delay expansion in FOR loop for filesets. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 6 +++++- 2 files changed, 7 … [View More]

1 0

Eric Pouech : cmd: Split parsing from executing FOR loops for filesets (/F).
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 2e2a3f4539d0af7c5b426aff353be86c2e06f4e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e2a3f4539d0af7c5b426aff353be8… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:34:06 2024 +0200 cmd: Split parsing from executing FOR loops for filesets (/F). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 18 +- programs/… [View More]

1 0

Eric Pouech : cmd: Fix delay expansion in FOR /L loops.
by Alexandre Julliard 19 Jun '24

19 Jun '24

Module: wine Branch: master Commit: 53f7a5999204d42a154d13b1feab3e9cd89ba776 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f7a5999204d42a154d13b1feab3e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 09:54:28 2024 +0200 cmd: Fix delay expansion in FOR /L loops. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 5 ----- programs/cmd/tests/test_builtins.cmd.exp | 22 +++++++++++----------- programs/… [View More]

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2024