April 2024 - Wine-commits - list.winehq.org

Alexandros Frantzis : opengl32: Cache driver pixel format information.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: ab70da6dd52772986b4805b68667d2ea68b1f245 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab70da6dd52772986b4805b68667d2… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Apr 19 16:01:06 2024 +0300 opengl32: Cache driver pixel format information. Use the glReserved1 area in the Teb to cache the latest pixel format information requested from the driver. --- dlls/opengl32/wgl.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c7b0bbfdf34..87f91aef473 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -42,6 +42,11 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; +#define WINE_GL_RESERVED_FORMATS_HDC 2 +#define WINE_GL_RESERVED_FORMATS_PTR 3 +#define WINE_GL_RESERVED_FORMATS_NUM 4 +#define WINE_GL_RESERVED_FORMATS_ONSCREEN 5 + #ifndef _WIN64 static char **wow64_strings; @@ -299,8 +304,16 @@ static struct wgl_pixel_format *get_pixel_formats( HDC hdc, UINT *num_formats, UINT *num_onscreen_formats ) { struct get_pixel_formats_params args = { .teb = NtCurrentTeb(), .hdc = hdc }; + PVOID *glReserved = NtCurrentTeb()->glReserved1; NTSTATUS status; + if (glReserved[WINE_GL_RESERVED_FORMATS_HDC] == hdc) + { + *num_formats = PtrToUlong( glReserved[WINE_GL_RESERVED_FORMATS_NUM] ); + *num_onscreen_formats = PtrToUlong( glReserved[WINE_GL_RESERVED_FORMATS_ONSCREEN] ); + return glReserved[WINE_GL_RESERVED_FORMATS_PTR]; + } + if ((status = UNIX_CALL( get_pixel_formats, &args ))) goto error; if (!(args.formats = malloc( sizeof(*args.formats) * args.num_formats ))) goto error; args.max_formats = args.num_formats; @@ -308,6 +321,13 @@ static struct wgl_pixel_format *get_pixel_formats( HDC hdc, UINT *num_formats, *num_formats = args.num_formats; *num_onscreen_formats = args.num_onscreen_formats; + + free( glReserved[WINE_GL_RESERVED_FORMATS_PTR] ); + glReserved[WINE_GL_RESERVED_FORMATS_HDC] = hdc; + glReserved[WINE_GL_RESERVED_FORMATS_PTR] = args.formats; + glReserved[WINE_GL_RESERVED_FORMATS_NUM] = ULongToPtr( args.num_formats ); + glReserved[WINE_GL_RESERVED_FORMATS_ONSCREEN] = ULongToPtr( args.num_onscreen_formats ); + return args.formats; error: @@ -333,7 +353,6 @@ INT WINAPI wglDescribePixelFormat( HDC hdc, int index, UINT size, PIXELFORMATDES *ppfd = formats[index - 1].pfd; - free( formats ); return num_onscreen_formats; } @@ -1374,6 +1393,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) #ifndef _WIN64 cleanup_wow64_strings(); #endif + /* fallthrough */ + case DLL_THREAD_DETACH: + free( NtCurrentTeb()->glReserved1[WINE_GL_RESERVED_FORMATS_PTR] ); return TRUE; } return TRUE;

1 0

Alexandros Frantzis : winewayland.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 5571422344ad2b5bc1e05369c664951698e9608d URL: https://gitlab.winehq.org/wine/wine/-/commit/5571422344ad2b5bc1e05369c66495… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Mar 21 15:00:08 2024 +0200 winewayland.drv: Enable wglDescribePixelFormat through p_get_pixel_formats. --- dlls/winewayland.drv/opengl.c | 121 ++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index f072b8063a1..3cb8b1e8a0d 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -544,63 +544,6 @@ static BOOL wayland_wglDeleteContext(struct wgl_context *ctx) return TRUE; } -static BOOL has_opengl(void); - -static int wayland_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, - PIXELFORMATDESCRIPTOR *pfd) -{ - EGLint val; - EGLConfig config; - - if (!has_opengl()) return 0; - if (!pfd) return num_egl_configs; - if (size < sizeof(*pfd)) return 0; - if (fmt <= 0 || fmt > num_egl_configs) return 0; - - config = egl_configs[fmt - 1]; - - memset(pfd, 0, sizeof(*pfd)); - pfd->nSize = sizeof(*pfd); - pfd->nVersion = 1; - pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | - PFD_SUPPORT_COMPOSITION; - pfd->iPixelType = PFD_TYPE_RGBA; - pfd->iLayerType = PFD_MAIN_PLANE; - - /* Although the documentation describes cColorBits as excluding alpha, real - * drivers tend to return the full pixel size, so do the same. */ - p_eglGetConfigAttrib(egl_display, config, EGL_BUFFER_SIZE, &val); - pfd->cColorBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_RED_SIZE, &val); - pfd->cRedBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_GREEN_SIZE, &val); - pfd->cGreenBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_BLUE_SIZE, &val); - pfd->cBlueBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_ALPHA_SIZE, &val); - pfd->cAlphaBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_DEPTH_SIZE, &val); - pfd->cDepthBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_STENCIL_SIZE, &val); - pfd->cStencilBits = val; - - /* Although we don't get information from EGL about the component shifts - * or the native format, the 0xARGB order is the most common. */ - pfd->cBlueShift = 0; - pfd->cGreenShift = pfd->cBlueBits; - pfd->cRedShift = pfd->cGreenBits + pfd->cBlueBits; - if (pfd->cAlphaBits) - pfd->cAlphaShift = pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits; - else - pfd->cAlphaShift = 0; - - TRACE("fmt %u color %u %u/%u/%u/%u depth %u stencil %u\n", - fmt, pfd->cColorBits, pfd->cRedBits, pfd->cGreenBits, pfd->cBlueBits, - pfd->cAlphaBits, pfd->cDepthBits, pfd->cStencilBits); - - return num_egl_configs; -} - static const char *wayland_wglGetExtensionsStringARB(HDC hdc) { TRACE("() returning \"%s\"\n", wgl_extensions); @@ -762,6 +705,68 @@ static BOOL wayland_wglSwapIntervalEXT(int interval) return ret; } +static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt) +{ + EGLint value; + PIXELFORMATDESCRIPTOR *pfd = &fmt->pfd; + + memset(pfd, 0, sizeof(*pfd)); + pfd->nSize = sizeof(*pfd); + pfd->nVersion = 1; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | + PFD_SUPPORT_COMPOSITION; + pfd->iPixelType = PFD_TYPE_RGBA; + pfd->iLayerType = PFD_MAIN_PLANE; + +#define SET_ATTRIB(field, attrib) \ + value = 0; \ + p_eglGetConfigAttrib(egl_display, config, attrib, &value); \ + pfd->field = value; + + /* Although the documentation describes cColorBits as excluding alpha, real + * drivers tend to return the full pixel size, so do the same. */ + SET_ATTRIB(cColorBits, EGL_BUFFER_SIZE); + SET_ATTRIB(cRedBits, EGL_RED_SIZE); + SET_ATTRIB(cGreenBits, EGL_GREEN_SIZE); + SET_ATTRIB(cBlueBits, EGL_BLUE_SIZE); + SET_ATTRIB(cAlphaBits, EGL_ALPHA_SIZE); + /* Although we don't get information from EGL about the component shifts + * or the native format, the 0xARGB order is the most common. */ + pfd->cBlueShift = 0; + pfd->cGreenShift = pfd->cBlueBits; + pfd->cRedShift = pfd->cGreenBits + pfd->cBlueBits; + if (pfd->cAlphaBits) + pfd->cAlphaShift = pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits; + else + pfd->cAlphaShift = 0; + + SET_ATTRIB(cDepthBits, EGL_DEPTH_SIZE); + SET_ATTRIB(cStencilBits, EGL_STENCIL_SIZE); + +#undef SET_ATTRIB +} + +static BOOL has_opengl(void); + +static void wayland_get_pixel_formats(struct wgl_pixel_format *formats, + UINT max_formats, UINT *num_formats, + UINT *num_onscreen_formats) +{ + UINT i; + + if (!has_opengl()) + { + *num_formats = *num_onscreen_formats = 0; + return; + } + if (formats) + { + for (i = 0; i < min(max_formats, num_egl_configs); ++i) + describe_pixel_format(egl_configs[i], &formats[i]); + } + *num_formats = *num_onscreen_formats = num_egl_configs; +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -980,12 +985,12 @@ static struct opengl_funcs opengl_funcs = .p_wglCopyContext = wayland_wglCopyContext, .p_wglCreateContext = wayland_wglCreateContext, .p_wglDeleteContext = wayland_wglDeleteContext, - .p_wglDescribePixelFormat = wayland_wglDescribePixelFormat, .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglMakeCurrent = wayland_wglMakeCurrent, .p_wglSetPixelFormat = wayland_wglSetPixelFormat, .p_wglShareLists = wayland_wglShareLists, .p_wglSwapBuffers = wayland_wglSwapBuffers, + .p_get_pixel_formats = wayland_get_pixel_formats, } };

1 0

Alexandros Frantzis : winex11.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: cff896b39ba9bffec97c42312bc881ef5547f73d URL: https://gitlab.winehq.org/wine/wine/-/commit/cff896b39ba9bffec97c42312bc881… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Apr 23 10:31:20 2024 +0300 winex11.drv: Enable wglDescribePixelFormat through p_get_pixel_formats. --- dlls/winex11.drv/opengl.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2482a07212a..feb6a70019e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1681,27 +1681,6 @@ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, return nb_onscreen_formats; } -/** - * glxdrv_DescribePixelFormat - * - * Get the pixel-format descriptor associated to the given id - */ -static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, - UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) -{ - TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd); - - if (!ppfd) return nb_onscreen_formats; - - if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) - { - ERR("Wrong structure size !\n"); - /* Should set error */ - return 0; - } - - return describe_pixel_format(iPixelFormat, ppfd, FALSE); -} /*********************************************************************** * glxdrv_wglGetPixelFormat @@ -3428,19 +3407,40 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) return TRUE; } +static void glxdrv_get_pixel_formats( struct wgl_pixel_format *formats, + UINT max_formats, UINT *num_formats, + UINT *num_onscreen_formats ) +{ + UINT i; + + if (!has_opengl()) + { + *num_formats = *num_onscreen_formats = 0; + return; + } + if (formats) + { + for (i = 0; i < min( max_formats, nb_pixel_formats ); ++i) + describe_pixel_format( i + 1, &formats[i].pfd, TRUE ); + } + *num_formats = nb_pixel_formats; + *num_onscreen_formats = nb_onscreen_formats; +} + static struct opengl_funcs opengl_funcs = { { glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglCreateContext, /* p_wglCreateContext */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ - glxdrv_wglDescribePixelFormat, /* p_wglDescribePixelFormat */ + NULL, /* p_wglDescribePixelFormat */ glxdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ glxdrv_wglGetProcAddress, /* p_wglGetProcAddress */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ glxdrv_wglSetPixelFormat, /* p_wglSetPixelFormat */ glxdrv_wglShareLists, /* p_wglShareLists */ glxdrv_wglSwapBuffers, /* p_wglSwapBuffers */ + glxdrv_get_pixel_formats, /* p_get_pixel_formats */ } };

1 0

Alexandros Frantzis : winex11.drv: Remove unnecessary parameter from describe_pixel_format.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 79edaed63985ba2582fd5367c9a25f7cfb378276 URL: https://gitlab.winehq.org/wine/wine/-/commit/79edaed63985ba2582fd5367c9a25f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Apr 23 11:00:14 2024 +0300 winex11.drv: Remove unnecessary parameter from describe_pixel_format. --- dlls/winex11.drv/opengl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index feb6a70019e..cd132f059df 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1557,7 +1557,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) +static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd ) { /*XVisualInfo *vis;*/ int value; @@ -1567,7 +1567,7 @@ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, 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, allow_offscreen); + fmt = get_pixel_format(gdi_display, iPixelFormat, TRUE /* Offscreen */); if (!fmt) { WARN("unexpected format %d\n", iPixelFormat); return 0; @@ -2653,7 +2653,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c format->original_index = it; memset(&format->pfd, 0, sizeof(format->pfd)); - if (!describe_pixel_format(format->format, &format->pfd, TRUE)) + if (!describe_pixel_format(format->format, &format->pfd)) ERR("describe_pixel_format failed, format %d.\n", format->format); format->depth = format->pfd.cDepthBits; @@ -3421,7 +3421,7 @@ static void glxdrv_get_pixel_formats( struct wgl_pixel_format *formats, if (formats) { for (i = 0; i < min( max_formats, nb_pixel_formats ); ++i) - describe_pixel_format( i + 1, &formats[i].pfd, TRUE ); + describe_pixel_format( i + 1, &formats[i].pfd ); } *num_formats = nb_pixel_formats; *num_onscreen_formats = nb_onscreen_formats;

1 0

Rémi Bernon : mfreadwrite/tests: Do not accept MFVideoFormat_RGB32 in the test transform.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 7b47833b28ccc365efd677853fa96fcfc4e94697 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b47833b28ccc365efd677853fa96f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 3 13:09:25 2024 +0200 mfreadwrite/tests: Do not accept MFVideoFormat_RGB32 in the test transform. --- dlls/mfreadwrite/tests/mfplat.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index a2c46869250..00b79353090 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2488,6 +2488,13 @@ static HRESULT WINAPI test_decoder_SetInputType(IMFTransform *iface, DWORD id, I static HRESULT WINAPI test_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct test_decoder *decoder = test_decoder_from_IMFTransform(iface); + GUID subtype; + HRESULT hr; + + if (type && SUCCEEDED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)) + && IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) return S_OK; if (decoder->output_type) @@ -2900,7 +2907,7 @@ static void test_source_reader_transforms_d3d(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96), - ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE), ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE), {0}, @@ -3019,18 +3026,14 @@ static void test_source_reader_transforms_d3d(void) /* video processor transform is not D3D aware */ hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, NULL, &video_processor); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - /* FIXME: Wine skips the video processor as the test decoder accepts the output type directly */ - if (hr == S_OK) - { - ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n"); - hr = IMFTransform_GetAttributes(video_processor, &attributes); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); - IMFAttributes_Release(attributes); - IMFTransform_Release(video_processor); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n"); + hr = IMFTransform_GetAttributes(video_processor, &attributes); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + IMFAttributes_Release(attributes); + IMFTransform_Release(video_processor); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, NULL, &test_decoder); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : mfreadwrite/tests: Avoid using MFCreateMediaBufferFromMediaType.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: c908181eefe542a85a062c439c57071a512c8a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/c908181eefe542a85a062c439c5707… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 3 13:29:03 2024 +0200 mfreadwrite/tests: Avoid using MFCreateMediaBufferFromMediaType. It's not available on Win7. --- dlls/mfreadwrite/tests/mfplat.c | 54 ++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 00b79353090..69478bd58cb 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2604,28 +2604,25 @@ static HRESULT WINAPI test_decoder_ProcessOutput(IMFTransform *iface, DWORD flag hr = MFCreateSample(&data->pSample); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateMediaBufferFromMediaType(decoder->output_type, 0, 0, 0, &buffer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) - { - hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - } + hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_AddBuffer(data->pSample, buffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); } + else + { + ok(!!data->pSample, "Missing sample\n"); - ok(!!data->pSample, "Missing sample\n"); - - hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE); - todo_wine check_interface(buffer, &IID_IMFGetService, TRUE); - check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); - hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown); - todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); - IMFMediaBuffer_Release(buffer); + hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + todo_wine check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown); + todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); + } if (decoder->next_output == MF_E_TRANSFORM_STREAM_CHANGE) { @@ -2817,6 +2814,16 @@ static void test_source_reader_transform_stream_change(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaSource_Release(source); + /* skip tests on Win7 which misses IMFSourceReaderEx */ + hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr); + if (broken(hr == E_NOINTERFACE)) + { + win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n"); + goto skip_tests; + } + IMFSourceReaderEx_Release(reader_ex); + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2881,6 +2888,7 @@ static void test_source_reader_transform_stream_change(void) IMFTransform_Release(test_decoder); +skip_tests: IMFSourceReader_Release(reader); hr = MFTUnregisterLocal(&factory); @@ -2993,6 +3001,17 @@ static void test_source_reader_transforms_d3d(void) IMFAttributes_Release(attributes); IMFMediaSource_Release(source); + /* skip tests on Win7 which misses IMFSourceReaderEx */ + hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr); + if (broken(hr == E_NOINTERFACE)) + { + win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n"); + IMFSourceReader_Release(reader); + goto skip_tests; + } + IMFSourceReaderEx_Release(reader_ex); + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3152,6 +3171,7 @@ static void test_source_reader_transforms_d3d(void) test_decoder_allocate_samples = FALSE; +skip_tests: hr = MFTUnregisterLocal(&factory); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : mfreadwrite/tests: Shutdown the test stream event queues on source shutdown.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 8514ddb2001b1fa2485ae1617b8b174cbb625b9e URL: https://gitlab.winehq.org/wine/wine/-/commit/8514ddb2001b1fa2485ae1617b8b17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 18:04:18 2024 +0200 mfreadwrite/tests: Shutdown the test stream event queues on source shutdown. --- dlls/mfreadwrite/tests/mfplat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 69478bd58cb..b70d0587072 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -554,9 +554,15 @@ static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) { struct test_source *source = impl_from_IMFMediaSource(iface); HRESULT hr; + UINT i; hr = IMFMediaEventQueue_Shutdown(source->event_queue); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < source->stream_count; ++i) + { + hr = IMFMediaEventQueue_Shutdown(source->streams[i]->event_queue); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } return S_OK; }

1 0

Rémi Bernon : mfreadwrite/reader: Avoid leaking the stream transform service MFT.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 7bb1b147ce2c83156a468e323dc03a151c1b1ff1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bb1b147ce2c83156a468e323dc03a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 16:20:53 2024 +0200 mfreadwrite/reader: Avoid leaking the stream transform service MFT. --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 96bb316ac85..ab8c3993570 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -223,6 +223,8 @@ static void media_stream_destroy(struct media_stream *stream) transform_entry_destroy(entry); } + if (stream->transform_service) + IMFTransform_Release(stream->transform_service); if (stream->stream) IMFMediaStream_Release(stream->stream); if (stream->current)

1 0

Francisco Casas : tests/shader-runner: Report whole-block errors on the block's starting line.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: dbb9cfd95814b0c0f785448be70a16cabc202cae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbb9cfd95814b0c0f785448be70a1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 4 12:44:27 2024 -0300 tests/shader-runner: Report whole-block errors on the block's starting line. So, if there is an error or a trace on "[pixel shader]" or similar blocks, they get reported in the line with the tag at the beginning of the block and no on the line where the next block starts. --- tests/shader_runner.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index a639d716..29ac8749 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1568,6 +1568,12 @@ static void trace_tags(const struct shader_runner_caps *caps) trace("%s.\n", tags); } +static void update_line_number_context(const char *testname, unsigned int line_number) +{ + vkd3d_test_pop_context(); + vkd3d_test_push_context("%s:%u", testname, line_number); +} + void run_shader_tests(struct shader_runner *runner, const struct shader_runner_caps *caps, const struct shader_runner_ops *ops, void *dxc_compiler) { @@ -1575,7 +1581,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c struct resource_params current_resource; struct sampler *current_sampler = NULL; enum parse_state state = STATE_NONE; - unsigned int i, line_number = 0; + unsigned int i, line_number = 0, block_start_line_number = 0; char *shader_source = NULL; HRESULT expect_hr = S_OK; bool skip_tests = false; @@ -1609,17 +1615,19 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c else testname = test_options.filename; + vkd3d_test_push_context("%s:%u", testname, line_number); + for (;;) { char *ret = fgets(line_buffer, sizeof(line_buffer), f); const char *line = line_buffer; - if (line_number++) - vkd3d_test_pop_context(); - vkd3d_test_push_context("%s:%u", testname, line_number); + line_number++; if (!ret || line[0] == '[') { + update_line_number_context(testname, block_start_line_number); + switch (state) { case STATE_INPUT_LAYOUT: @@ -1801,6 +1809,9 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c { unsigned int index; + block_start_line_number = line_number; + update_line_number_context(testname, line_number); + if (match_directive_substring(line, "[compute shader", &line)) { state = STATE_SHADER_COMPUTE; @@ -1953,6 +1964,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c } else if (line[0] != '%' && line[0] != '\n') { + update_line_number_context(testname, line_number); + switch (state) { case STATE_NONE: @@ -2008,8 +2021,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c } } - if (line_number) - vkd3d_test_pop_context(); + /* Pop line_number context. */ + vkd3d_test_pop_context(); for (i = 0; i < runner->input_element_count; ++i) free(runner->input_elements[i].name);

1 0

Alexandre Julliard : rpcrt4: Fix stack alignment and by-value parameters for typelibs on ARM platforms.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: wine Branch: master Commit: 486068560eb23a70061f4d383919a19d0f671e5e URL: https://gitlab.winehq.org/wine/wine/-/commit/486068560eb23a70061f4d383919a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 18:00:59 2024 +0200 rpcrt4: Fix stack alignment and by-value parameters for typelibs on ARM platforms. --- dlls/rpcrt4/ndr_typelib.c | 156 ++++++++++++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 60 deletions(-)

1 0