June 2024 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msado15: Use the correct version when loading the typelib.
by Alexandre Julliard June 19, 2024

June 19, 2024

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 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -159,7 +159,7 @@ static HRESULT load_typelib(void) if(typelib) return S_OK; - hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + hres = LoadRegTypeLib(&LIBID_ADODB, 2, 8, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08lx\n", hres); return hres;

1 0

Brendan McGrath : mf/tests: Add additional tests for MESessionClosed event.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: af565ce846d5548f8d0aaedb81985d246521131d URL: https://gitlab.winehq.org/wine/wine/-/commit/af565ce846d5548f8d0aaedb81985d… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon May 6 16:38:02 2024 +1000 mf/tests: Add additional tests for MESessionClosed event. --- dlls/mf/tests/mf.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a2f183e5cc4..4773f202ccc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6249,6 +6249,8 @@ static void test_media_session_Start(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Close(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionClosed, 1000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Media session is shut down */ hr = IMFMediaSource_Shutdown(source); @@ -6331,6 +6333,9 @@ static void test_media_session_Start(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Close(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event(session, callback, MESessionClosed, 1000, &propvar); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSource_Shutdown(source); @@ -6534,6 +6539,89 @@ static void test_MFEnumDeviceSources(void) CoUninitialize(); } +static void test_media_session_Close(void) +{ + media_type_desc video_rgb32_desc = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), + }; + struct test_grabber_callback *grabber_callback; + IMFPresentationClock *presentation_clock; + IMFActivate *sink_activate; + IMFAsyncCallback *callback; + IMFMediaType *output_type; + IMFMediaSession *session; + IMFMediaSource *source; + IMFTopology *topology; + PROPVARIANT propvar; + IMFClock *clock; + UINT64 duration; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); + + if (!(source = create_media_source(L"test.mp4", L"video/mp4"))) + { + todo_wine /* Gitlab CI Debian runner */ + win_skip("MP4 media source is not supported, skipping tests.\n"); + MFShutdown(); + return; + } + + grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback()); + hr = MFCreateMediaType(&output_type); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + init_media_type(output_type, video_rgb32_desc, -1); + hr = MFCreateSampleGrabberSinkActivate(output_type, &grabber_callback->IMFSampleGrabberSinkCallback_iface, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#lx.\n", hr); + IMFMediaType_Release(output_type); + + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + topology = create_test_topology(source, sink_activate, &duration); + hr = IMFMediaSession_SetTopology(session, 0, topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFTopology_Release(topology); + + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFClock_Release(clock); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + callback = create_test_callback(TRUE); + hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Close(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaSource_Shutdown(source); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = wait_media_event_until_blocking(session, callback, MESessionClosed, 5000, &propvar); + todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFPresentationClock_Release(presentation_clock); + IMFAsyncCallback_Release(callback); + IMFMediaSession_Release(session); + IMFActivate_ShutdownObject(sink_activate); + IMFActivate_Release(sink_activate); + IMFSampleGrabberSinkCallback_Release(&grabber_callback->IMFSampleGrabberSinkCallback_iface); + IMFMediaSource_Release(source); + + hr = MFShutdown(); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(mf) { init_functions(); @@ -6568,4 +6656,5 @@ START_TEST(mf) test_MFCreateSequencerSegmentOffset(); test_media_session_Start(); test_MFEnumDeviceSources(); + test_media_session_Close(); }

1 0

Alexandros Frantzis : winex11: Use default wglGetPixelFormatAttribivARB implementation.
by Alexandre Julliard June 19, 2024

June 19, 2024

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 used to get the pixel format attributes. --- dlls/winex11.drv/opengl.c | 373 ++++++++++------------------------------------ 1 file changed, 79 insertions(+), 294 deletions(-)

1 0

Alexandros Frantzis : winex11: Pass wgl_pixel_format to describe_pixel_format.
by Alexandre Julliard June 19, 2024

June 19, 2024

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 : opengl32: Add default implementation for wglGetPixelFormatAttribfvARB.
by Alexandre Julliard June 19, 2024

June 19, 2024

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. --- 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"))

1 0

Alexandros Frantzis : winex11: Update describe_pixel_format coding style.
by Alexandre Julliard June 19, 2024

June 19, 2024

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/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; }

1 0

Alexandros Frantzis : opengl32: Add default implementation for wglGetPixelFormatAttribivARB.
by Alexandre Julliard June 19, 2024

June 19, 2024

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 be used automatically if the driver populates the extra fields. --- dlls/opengl32/make_opengl | 26 ++++++ dlls/opengl32/thunks.c | 10 +-- dlls/opengl32/wgl.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- include/wine/wgl_driver.h | 27 +++++- 4 files changed, 271 insertions(+), 11 deletions(-)

1 0

Eric Pouech : cmd: Fix delay expansion in FOR loop for filesets.
by Alexandre Julliard June 19, 2024

June 19, 2024

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 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a7af684cb9a..84637ce41e3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1014,8 +1014,8 @@ A D B C B D --- nested FORs and args tempering -(a)todo_wine@inner argument {-foo, bar} -(a)todo_wine@inner argument {-x, y} +inner argument {-foo, bar} +inner argument {-x, y} --- nesting and delayed expansion a 1 2 1-A2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f7d399b4e7..9bce77b19df 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3140,13 +3140,17 @@ static CMD_NODE *for_control_execute_from_FILE(CMD_FOR_CONTROL *for_ctrl, FILE * static CMD_NODE *for_control_execute_fileset(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *cmdList) { + WCHAR set[MAXSTRING]; WCHAR *args; size_t len; CMD_NODE *body = NULL; FILE *input; int i; - args = WCMD_skip_leading_spaces((WCHAR *)for_ctrl->set); + wcscpy(set, for_ctrl->set); + handleExpansion(set, context != NULL, delayedsubst); + + args = WCMD_skip_leading_spaces(set); for (len = wcslen(args); len && (args[len - 1] == L' ' || args[len - 1] == L'\t'); len--) args[len - 1] = L'\0'; if (args[0] == (for_ctrl->use_backq ? L'\'' : L'"') && match_ending_delim(args))

1 0

Eric Pouech : cmd: Split parsing from executing FOR loops for filesets (/F).
by Alexandre Julliard June 19, 2024

June 19, 2024

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/cmd/wcmdmain.c | 337 ++++++++++++++++++++++++++++++- 3 files changed, 353 insertions(+), 4 deletions(-)

1 0

Eric Pouech : cmd: Fix delay expansion in FOR /L loops.
by Alexandre Julliard June 19, 2024

June 19, 2024

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/cmd/wcmdmain.c | 1 + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2ef2d495a63..c9951a66373 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -757,11 +757,6 @@ setlocal EnableDelayedExpansion set WINE_FOO=foo bar for %%i in ("!WINE_FOO!") do echo %%i for %%i in (!WINE_FOO!) do echo %%i -rem tests disabled for now... wine's cmd loops endlessly here -rem set WINE_FOO=4 4 4 -rem for /l %%i in (!WINE_FOO!) do echo %%i -rem set WINE_FOO=4 -rem for /l %%i in (1 2 !WINE_FOO!) do echo %%i setlocal DisableDelayedExpansion echo --- in digit variables diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1c3b0dc81cc..b5989b55f52 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1018,17 +1018,17 @@ B D @todo_wine(a)inner argument {-x, y} --- nesting and delayed expansion a 1 2 -(a)todo_wine@1-A2 -(a)todo_wine@1-B1 -(a)todo_wine@2-A1 -(a)todo_wine@2-B2 -(a)todo_wine@b 1 3 -(a)todo_wine@1-A2 -(a)todo_wine@1-B1 -(a)todo_wine@2-A2 -(a)todo_wine@2-B2 -(a)todo_wine@3-A1 -(a)todo_wine@3-B2 +1-A2 +1-B1 +2-A1 +2-B2 +b 1 3 +1-A2 +1-B1 +2-A2 +2-B2 +3-A1 +3-B2 --- nesting if/for @todo_wine@"f" @todo_wine@"g" diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e86ad8042f9..b50c159414e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2879,6 +2879,7 @@ static CMD_NODE *for_control_execute_numbers(CMD_FOR_CONTROL *for_ctrl, CMD_NODE int i; wcscpy(set, for_ctrl->set); + handleExpansion(set, context != NULL, delayedsubst); /* Note: native doesn't check the actual number of parameters, and set * them by default to 0.

1 0