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

Alexandros Frantzis : winewayland: Support WGL_ARB_pixel_format.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 7d1dec86de97545171927320a8b38a7e87e6a393 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d1dec86de97545171927320a8b38a… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 26 10:49:58 2024 +0300 winewayland: Support WGL_ARB_pixel_format. Populate wgl_pixel_format ARB attributes to enable the default implementation of WGL_ARB_pixel_format. --- dlls/winewayland.drv/opengl.c | 77 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 3cb8b1e8a0d..e714b2cb952 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -707,14 +707,17 @@ static BOOL wayland_wglSwapIntervalEXT(int interval) static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt) { - EGLint value; + EGLint value, surface_type; PIXELFORMATDESCRIPTOR *pfd = &fmt->pfd; - memset(pfd, 0, sizeof(*pfd)); + /* If we can't get basic information, there is no point continuing */ + if (!p_eglGetConfigAttrib(egl_display, config, EGL_SURFACE_TYPE, &surface_type)) return; + + memset(fmt, 0, sizeof(*fmt)); pfd->nSize = sizeof(*pfd); pfd->nVersion = 1; - pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | - PFD_SUPPORT_COMPOSITION; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_SUPPORT_COMPOSITION; + if (surface_type & EGL_WINDOW_BIT) pfd->dwFlags |= PFD_DRAW_TO_WINDOW; pfd->iPixelType = PFD_TYPE_RGBA; pfd->iLayerType = PFD_MAIN_PLANE; @@ -722,6 +725,9 @@ static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt value = 0; \ p_eglGetConfigAttrib(egl_display, config, attrib, &value); \ pfd->field = value; +#define SET_ATTRIB_ARB(field, attrib) \ + if (!p_eglGetConfigAttrib(egl_display, config, attrib, &value)) value = -1; \ + fmt->field = value; /* Although the documentation describes cColorBits as excluding alpha, real * drivers tend to return the full pixel size, so do the same. */ @@ -743,7 +749,65 @@ static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt SET_ATTRIB(cDepthBits, EGL_DEPTH_SIZE); SET_ATTRIB(cStencilBits, EGL_STENCIL_SIZE); + fmt->swap_method = WGL_SWAP_UNDEFINED_ARB; + + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_TYPE, &value)) + { + switch (value) + { + case EGL_TRANSPARENT_RGB: fmt->transparent = GL_TRUE; break; + case EGL_NONE: fmt->transparent = GL_FALSE; break; + default: + ERR("unexpected transparency type 0x%x\n", value); + fmt->transparent = -1; + break; + } + } + else fmt->transparent = -1; + + /* TODO: Support floating point pixel components */ + fmt->pixel_type = WGL_TYPE_RGBA_ARB; + + fmt->draw_to_pbuffer = !!(surface_type & EGL_PBUFFER_BIT); + SET_ATTRIB_ARB(max_pbuffer_pixels, EGL_MAX_PBUFFER_PIXELS); + SET_ATTRIB_ARB(max_pbuffer_width, EGL_MAX_PBUFFER_WIDTH); + SET_ATTRIB_ARB(max_pbuffer_height, EGL_MAX_PBUFFER_HEIGHT); + + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_RED_VALUE, &value)) + { + fmt->transparent_red_value_valid = GL_TRUE; + fmt->transparent_red_value = value; + } + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_GREEN_VALUE, &value)) + { + fmt->transparent_green_value_valid = GL_TRUE; + fmt->transparent_green_value = value; + } + if (p_eglGetConfigAttrib(egl_display, config, EGL_TRANSPARENT_BLUE_VALUE, &value)) + { + fmt->transparent_blue_value_valid = GL_TRUE; + fmt->transparent_blue_value = value; + } + fmt->transparent_alpha_value_valid = GL_TRUE; + fmt->transparent_alpha_value = 0; + fmt->transparent_index_value_valid = GL_TRUE; + fmt->transparent_index_value = 0; + + SET_ATTRIB_ARB(sample_buffers, EGL_SAMPLE_BUFFERS); + SET_ATTRIB_ARB(samples, EGL_SAMPLES); + + SET_ATTRIB_ARB(bind_to_texture_rgb, EGL_BIND_TO_TEXTURE_RGB); + SET_ATTRIB_ARB(bind_to_texture_rgba, EGL_BIND_TO_TEXTURE_RGBA); + fmt->bind_to_texture_rectangle_rgb = fmt->bind_to_texture_rgb; + fmt->bind_to_texture_rectangle_rgba = fmt->bind_to_texture_rgba; + + /* TODO: Support SRGB surfaces and enable the attribute */ + fmt->framebuffer_srgb_capable = GL_FALSE; + + fmt->float_components = GL_FALSE; + #undef SET_ATTRIB +#undef SET_ATTRIB_ARB } static BOOL has_opengl(void); @@ -827,6 +891,11 @@ static BOOL init_opengl_funcs(void) opengl_funcs.ext.p_wglGetSwapIntervalEXT = wayland_wglGetSwapIntervalEXT; opengl_funcs.ext.p_wglSwapIntervalEXT = wayland_wglSwapIntervalEXT; + register_extension("WGL_ARB_pixel_format"); + opengl_funcs.ext.p_wglChoosePixelFormatARB = (void *)1; /* never called */ + opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = (void *)1; /* never called */ + opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = (void *)1; /* never called */ + return TRUE; }

1 0

Alexandros Frantzis : winewayland: Support WGL_ARB_pixel_format_float.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 31be907221b50d3e2a44c26e0eee85879e53eac9 URL: https://gitlab.winehq.org/wine/wine/-/commit/31be907221b50d3e2a44c26e0eee85… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Jun 26 10:55:16 2024 +0300 winewayland: Support WGL_ARB_pixel_format_float. --- dlls/winewayland.drv/opengl.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index e714b2cb952..994154968b3 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -49,6 +49,7 @@ static EGLDisplay egl_display; static char wgl_extensions[4096]; static EGLConfig *egl_configs; static int num_egl_configs; +static BOOL has_egl_ext_pixel_format_float; #define USE_GL_FUNC(name) #name, static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; @@ -765,8 +766,24 @@ static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt } else fmt->transparent = -1; - /* TODO: Support floating point pixel components */ - fmt->pixel_type = WGL_TYPE_RGBA_ARB; + if (!has_egl_ext_pixel_format_float) fmt->pixel_type = WGL_TYPE_RGBA_ARB; + else if (p_eglGetConfigAttrib(egl_display, config, EGL_COLOR_COMPONENT_TYPE_EXT, &value)) + { + switch (value) + { + case EGL_COLOR_COMPONENT_TYPE_FIXED_EXT: + fmt->pixel_type = WGL_TYPE_RGBA_ARB; + break; + case EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT: + fmt->pixel_type = WGL_TYPE_RGBA_FLOAT_ARB; + break; + default: + ERR("unexpected color component type 0x%x\n", value); + fmt->pixel_type = -1; + break; + } + } + else fmt->pixel_type = -1; fmt->draw_to_pbuffer = !!(surface_type & EGL_PBUFFER_BIT); SET_ATTRIB_ARB(max_pbuffer_pixels, EGL_MAX_PBUFFER_PIXELS); @@ -896,6 +913,12 @@ static BOOL init_opengl_funcs(void) opengl_funcs.ext.p_wglGetPixelFormatAttribfvARB = (void *)1; /* never called */ opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = (void *)1; /* never called */ + if (has_egl_ext_pixel_format_float) + { + register_extension("WGL_ARB_pixel_format_float"); + register_extension("WGL_ATI_pixel_format_float"); + } + return TRUE; } @@ -1030,6 +1053,8 @@ static void init_opengl(void) REQUIRE_EXT(EGL_KHR_no_config_context); #undef REQUIRE_EXT + has_egl_ext_pixel_format_float = has_extension(egl_exts, "EGL_EXT_pixel_format_float"); + if (!init_opengl_funcs()) goto err; if (!init_egl_configs()) goto err;

1 0

Elizabeth Figura : mfplat/tests: Add more tests for compressed formats.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: e72f8b08e235ec19973134a2f190b60312118874 URL: https://gitlab.winehq.org/wine/wine/-/commit/e72f8b08e235ec19973134a2f190b6… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Jun 19 00:02:15 2024 -0500 mfplat/tests: Add more tests for compressed formats. --- dlls/mfplat/tests/mfplat.c | 249 +++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/resource.rc | 24 ++++ dlls/mfplat/tests/test-aac.mp4 | Bin 0 -> 2102 bytes dlls/mfplat/tests/test-h264.mp4 | Bin 0 -> 21173 bytes dlls/mfplat/tests/test-i420.avi | Bin 0 -> 6680 bytes dlls/mfplat/tests/test-mp3.mp4 | Bin 0 -> 2511 bytes dlls/mfplat/tests/test-wma2.wmv | Bin 0 -> 5224 bytes dlls/mfplat/tests/test-wmv1.wmv | Bin 0 -> 38939 bytes 8 files changed, 271 insertions(+), 2 deletions(-)

1 0

Alexandros Frantzis : opengl32: Add default implementation for wglChoosePixelFormatARB.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 272c55ac257315ef8393df357a79aac4e0d6cd76 URL: https://gitlab.winehq.org/wine/wine/-/commit/272c55ac257315ef8393df357a79aa… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 25 13:45:02 2024 +0300 opengl32: Add default implementation for wglChoosePixelFormatARB. The default implementation will be used automatically if the driver populates the wgl_pixel_format ARB fields. --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/thunks.c | 10 +- dlls/opengl32/wgl.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 285 insertions(+), 9 deletions(-)

1 0

Fabian Maurer : mlang/tests: Add test for GetGlobalFontLinkObject allowing IID_IMultiLanguage2.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 1ba592eec681c79ce1ccb301ff5725f666fb1dcf URL: https://gitlab.winehq.org/wine/wine/-/commit/1ba592eec681c79ce1ccb301ff5725… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:18:46 2024 +0200 mlang/tests: Add test for GetGlobalFontLinkObject allowing IID_IMultiLanguage2. --- dlls/mlang/tests/mlang.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 6bb973dc285..988e48ee178 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2308,6 +2308,7 @@ static void test_GetGlobalFontLinkObject(void) IMLangFontLink *IMLFL; IMLangCodePages *IMLCP; IMultiLanguage *IML; + IMultiLanguage2 *IML2; ret = GetGlobalFontLinkObject(NULL); ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); @@ -2327,6 +2328,10 @@ static void test_GetGlobalFontLinkObject(void) todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); if (ret == S_OK) IMultiLanguage_Release(IML); + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMultiLanguage2, (void**)&IML2); + todo_wine ok(ret == E_NOINTERFACE, "expected E_NOINTERFACE got %#lx\n", ret); + if (ret == S_OK) IMultiLanguage2_Release(IML2); + ret = IUnknown_QueryInterface((IUnknown*)unknown, &IID_IMLangFontLink, (void**)&IMLFL); ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangFontLink_Release(IMLFL);

1 0

Fabian Maurer : mlang: Return the correct interface in GetGlobalFontLinkObject.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 279d8bf7242df03c7269f30c86db2f7c3291cf1f URL: https://gitlab.winehq.org/wine/wine/-/commit/279d8bf7242df03c7269f30c86db2f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:45:03 2024 +0200 mlang: Return the correct interface in GetGlobalFontLinkObject. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56600 --- dlls/gdiplus/graphics.c | 5 +---- dlls/mlang/mlang.c | 11 ++++------- dlls/mlang/tests/mlang.c | 4 +--- include/mlang.idl | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 265b3363ca9..1c0e6aa07d6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5354,7 +5354,6 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w /* Populates gdip_font_link_info struct based on the base_font and input string */ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD length, GDIPCONST GpFont *base_font) { - IUnknown *unk; IMLangFontLink *iMLFL; GpFont *gpfont; HFONT map_hfont, hfont, old_font; @@ -5365,9 +5364,7 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD list_init(&info->font_link_info.sections); info->font_link_info.base_font = base_font; - GetGlobalFontLinkObject((void**)&unk); - IUnknown_QueryInterface(unk, &IID_IMLangFontLink, (void**)&iMLFL); - IUnknown_Release(unk); + GetGlobalFontLinkObject(&iMLFL); get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL); IMLangFontLink_GetFontCodePages(iMLFL, info->hdc, hfont, &font_codepages); diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index c7e7f360f0b..fd78f47fdb2 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3887,11 +3887,11 @@ static BOOL WINAPI allocate_font_link_cb(PINIT_ONCE init_once, PVOID args, PVOID return SUCCEEDED(MultiLanguage_create(NULL, (void**)&font_link_global)); } -HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) +HRESULT WINAPI GetGlobalFontLinkObject(IMLangFontLink **obj) { - TRACE("%p\n", unknown); + TRACE("%p\n", obj); - if (!unknown) return E_INVALIDARG; + if (!obj) return E_INVALIDARG; if (!InitOnceExecuteOnce(&font_link_global_init_once, allocate_font_link_cb, NULL, NULL)) { @@ -3899,8 +3899,5 @@ HRESULT WINAPI GetGlobalFontLinkObject(void **unknown) return E_FAIL; } - IUnknown_AddRef(font_link_global); - *unknown = font_link_global; - - return S_OK; + return IUnknown_QueryInterface(font_link_global, &IID_IMLangFontLink, (void**)obj); } diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7d94003bc78..d104d4d5184 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2314,7 +2314,7 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); unknown = (void *)0xdeadbeef; - ret = GetGlobalFontLinkObject(&unknown); + ret = GetGlobalFontLinkObject((IMLangFontLink**)&unknown); ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); @@ -2340,9 +2340,7 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangCodePages_Release(IMLCP); - todo_wine ok(unknown == IMLFL, "IUnknown from GetGlobalFontLinkObject isn't IMLangFontLink\n"); - todo_wine ok(unknown == IMLCP, "IUnknown from GetGlobalFontLinkObject isn't IMLangCodePages\n"); refcount = IUnknown_Release((IUnknown*)unknown); diff --git a/include/mlang.idl b/include/mlang.idl index 7c4398feafd..c9b5912b0e3 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -762,7 +762,7 @@ cpp_quote("STDAPI Rfc1766ToLcidA(LCID *, LPCSTR);") cpp_quote("STDAPI Rfc1766ToLcidW(LCID *, LPCWSTR);") cpp_quote("#define Rfc1766ToLcid WINELIB_NAME_AW(Rfc1766ToLcid)") -cpp_quote("STDAPI GetGlobalFontLinkObject(void **unknown);") +cpp_quote("STDAPI GetGlobalFontLinkObject(IMLangFontLink **unknown);") cpp_quote("STDAPI IsConvertINetStringAvailable(DWORD, DWORD);") cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);")

1 0

Fabian Maurer : mlang/tests: Add tests showing which interface is returned by GetGlobalFontLinkObject.
by Alexandre Julliard July 2, 2024

July 2, 2024

Module: wine Branch: master Commit: 6df749e2b83ff048d365d04e8f98a9572a1c076e URL: https://gitlab.winehq.org/wine/wine/-/commit/6df749e2b83ff048d365d04e8f98a9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 29 04:36:43 2024 +0200 mlang/tests: Add tests showing which interface is returned by GetGlobalFontLinkObject. --- dlls/mlang/tests/mlang.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 988e48ee178..7d94003bc78 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2340,6 +2340,10 @@ static void test_GetGlobalFontLinkObject(void) ok(ret == S_OK, "expected S_OK got %#lx\n", ret); IMLangCodePages_Release(IMLCP); + todo_wine + ok(unknown == IMLFL, "IUnknown from GetGlobalFontLinkObject isn't IMLangFontLink\n"); + todo_wine + ok(unknown == IMLCP, "IUnknown from GetGlobalFontLinkObject isn't IMLangCodePages\n"); refcount = IUnknown_Release((IUnknown*)unknown); ok(refcount == 1, "Got refcount %ld\n", refcount);

1 0

Paul Gofman : ntdll: Buffer pagemap reads in fill_working_set_info().
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 17f052c36a414a05fcb6a6e67bd3aac824fbed3e URL: https://gitlab.winehq.org/wine/wine/-/commit/17f052c36a414a05fcb6a6e67bd3aa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 20 15:43:15 2024 -0600 ntdll: Buffer pagemap reads in fill_working_set_info(). --- dlls/ntdll/unix/virtual.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3ba8093d995..dce03c2c3b5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5150,7 +5150,7 @@ struct fill_working_set_info_data struct kinfo_vmentry *vmentries; }; -static void init_fill_working_set_info_data( struct fill_working_set_info_data *d ) +static void init_fill_working_set_info_data( struct fill_working_set_info_data *d, char *end ) { unsigned int proc_count; @@ -5210,10 +5210,19 @@ static int pagemap_fd = -2; struct fill_working_set_info_data { + UINT64 pm_buffer[256]; + SIZE_T buffer_start; + ssize_t buffer_len; + SIZE_T end_page; }; -static void init_fill_working_set_info_data( struct fill_working_set_info_data *d ) +static void init_fill_working_set_info_data( struct fill_working_set_info_data *d, char *end ) { + d->buffer_start = 0; + d->buffer_len = 0; + d->end_page = (UINT_PTR)end >> page_shift; + memset( d->pm_buffer, 0, sizeof(d->pm_buffer) ); + if (pagemap_fd != -2) return; #ifdef O_CLOEXEC @@ -5235,18 +5244,31 @@ static void fill_working_set_info( struct fill_working_set_info_data *d, struct { MEMORY_WORKING_SET_EX_INFORMATION *p; UINT64 pagemap; - SIZE_T i; + SIZE_T i, page; + ssize_t len; for (i = 0; i < count; ++i) { + page = (UINT_PTR)ref[i].addr >> page_shift; p = &info[ref[i].orig_index]; - if (pagemap_fd == -1 || - pread( pagemap_fd, &pagemap, sizeof(pagemap), ((UINT_PTR)p->VirtualAddress >> page_shift) * sizeof(pagemap) ) != sizeof(pagemap)) + assert(page >= d->buffer_start); + if (page >= d->buffer_start + d->buffer_len) { - /* If we don't have pagemap information, default to invalid. */ - pagemap = 0; + d->buffer_start = page; + len = min( sizeof(d->pm_buffer), (d->end_page - page) * sizeof(pagemap) ); + if (pagemap_fd != -1) + { + d->buffer_len = pread( pagemap_fd, d->pm_buffer, len, page * sizeof(pagemap) ); + if (d->buffer_len != len) + { + d->buffer_len = max( d->buffer_len, 0 ); + memset( d->pm_buffer + d->buffer_len / sizeof(pagemap), 0, len - d->buffer_len ); + } + } + d->buffer_len = len / sizeof(pagemap); } + pagemap = d->pm_buffer[page - d->buffer_start]; p->VirtualAttributes.Valid = !(vprot & VPROT_GUARD) && (vprot & 0x0f) && (pagemap >> 63); p->VirtualAttributes.Shared = !is_view_valloc( view ) && ((pagemap >> 61) & 1); @@ -5300,7 +5322,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, end = ref[count - 1].addr + page_size; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - init_fill_working_set_info_data( &data ); + init_fill_working_set_info_data( &data, end ); view = find_view_range( start, end - start ); while (view && (char *)view->base > start)

1 0

Paul Gofman : ntdll: Limit vprot scan range to the needed interval in get_working_set_ex().
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 27b74d8e3727b37ce0bc3b6f8cd04e1501485d4f URL: https://gitlab.winehq.org/wine/wine/-/commit/27b74d8e3727b37ce0bc3b6f8cd04e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 20 14:31:07 2024 -0600 ntdll: Limit vprot scan range to the needed interval in get_working_set_ex(). --- dlls/ntdll/unix/virtual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 1e5d9311b62..af3b40f949f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2140,7 +2140,7 @@ done: * Get the size of the committed range with equal masked vprot bytes starting at base. * Also return the protections for the first page. */ -static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot, BYTE vprot_mask ) +static SIZE_T get_committed_size( struct file_view *view, void *base, size_t max_size, BYTE *vprot, BYTE vprot_mask ) { SIZE_T offset, size; @@ -2159,7 +2159,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro req->offset = offset; if (!wine_server_call( req )) { - size = reply->size; + size = min( reply->size, max_size ); if (reply->committed) { *vprot |= VPROT_COMMITTED; @@ -2171,7 +2171,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro if (!size || !(vprot_mask & ~VPROT_COMMITTED)) return size; } - else size = view->size - offset; + else size = min( view->size - offset, max_size ); return get_vprot_range_size( base, size, vprot_mask, vprot ); } @@ -4921,7 +4921,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if ((view = find_view( base, size ))) { /* Make sure all the pages are committed */ - if (get_committed_size( view, base, &vprot, VPROT_COMMITTED ) >= size && (vprot & VPROT_COMMITTED)) + if (get_committed_size( view, base, ~(size_t)0, &vprot, VPROT_COMMITTED ) >= size && (vprot & VPROT_COMMITTED)) { old = get_win32_prot( vprot, view->protect ); status = set_protection( view, base, size, new_prot ); @@ -5049,7 +5049,7 @@ static unsigned int fill_basic_memory_info( const void *addr, MEMORY_BASIC_INFOR BYTE vprot; info->AllocationBase = alloc_base; - info->RegionSize = get_committed_size( view, base, &vprot, ~VPROT_WRITEWATCH ); + info->RegionSize = get_committed_size( view, base, ~(size_t)0, &vprot, ~VPROT_WRITEWATCH ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; info->Protect = (vprot & VPROT_COMMITTED) ? get_win32_prot( vprot, view->protect ) : 0; info->AllocationProtect = get_win32_prot( view->protect, view->protect ); @@ -5304,7 +5304,7 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, while (start != (char *)view->base + view->size && r != ref + count && r->addr < (char *)view->base + view->size) { - size = get_committed_size( view, start, &vprot, ~VPROT_WRITEWATCH ); + size = get_committed_size( view, start, end - start, &vprot, ~VPROT_WRITEWATCH ); while (r != ref + count && r->addr < start + size) { if (vprot & VPROT_COMMITTED) fill_working_set_info( &data, view, vprot, &info[r->orig_index] );

1 0

Paul Gofman : ntdll: Iterate views instead of requested addresses in get_working_set_ex().
by Alexandre Julliard July 1, 2024

July 1, 2024

Module: wine Branch: master Commit: 2befbce04da8bc198e4bc9e1e6e5e3ac03c39e80 URL: https://gitlab.winehq.org/wine/wine/-/commit/2befbce04da8bc198e4bc9e1e6e5e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 19 20:38:40 2024 -0600 ntdll: Iterate views instead of requested addresses in get_working_set_ex(). --- dlls/ntdll/unix/virtual.c | 68 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a15c252158e..1e5d9311b62 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -5135,6 +5135,12 @@ static unsigned int get_memory_region_info( HANDLE process, LPCVOID addr, MEMORY return STATUS_SUCCESS; } +struct working_set_info_ref +{ + char *addr; + SIZE_T orig_index; +}; + #if defined(HAVE_LIBPROCSTAT) struct fill_working_set_info_data { @@ -5237,13 +5243,24 @@ static void fill_working_set_info( struct fill_working_set_info_data *d, struct } #endif +static int compare_working_set_info_ref( const void *a, const void *b ) +{ + const struct working_set_info_ref *r1 = a, *r2 = b; + + if (r1->addr < r2->addr) return -1; + return r1->addr > r2->addr; +} + static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, MEMORY_WORKING_SET_EX_INFORMATION *info, SIZE_T len, SIZE_T *res_len ) { + struct working_set_info_ref ref_buffer[256], *ref = ref_buffer, *r; struct fill_working_set_info_data data; - MEMORY_WORKING_SET_EX_INFORMATION *p; - struct file_view *view; + char *start, *end; + SIZE_T i, count; + size_t size; + struct file_view *view, *prev_view; sigset_t sigset; BYTE vprot; @@ -5255,17 +5272,52 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, if (len < sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; + count = len / sizeof(*info); + + if (count > ARRAY_SIZE(ref_buffer)) ref = malloc( count * sizeof(*ref) ); + for (i = 0; i < count; ++i) + { + ref[i].orig_index = i; + ref[i].addr = ROUND_ADDR( info[i].VirtualAddress, page_mask ); + info[i].VirtualAttributes.Flags = 0; + } + qsort( ref, count, sizeof(*ref), compare_working_set_info_ref ); + start = ref[0].addr; + end = ref[count - 1].addr + page_size; + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); init_fill_working_set_info_data( &data ); - for (p = info; (UINT_PTR)(p + 1) <= (UINT_PTR)info + len; p++) + + view = find_view_range( start, end - start ); + while (view && (char *)view->base > start) { - memset( &p->VirtualAttributes, 0, sizeof(p->VirtualAttributes) ); - if ((view = find_view( p->VirtualAddress, 0 )) - && get_committed_size( view, p->VirtualAddress, &vprot, VPROT_COMMITTED ) - && (vprot & VPROT_COMMITTED)) - fill_working_set_info( &data, view, vprot, p ); + prev_view = RB_ENTRY_VALUE( rb_prev( &view->entry ), struct file_view, entry ); + if (!prev_view || (char *)prev_view->base + prev_view->size <= start) break; + view = prev_view; } + + r = ref; + while (view && (char *)view->base < end) + { + if (start < (char *)view->base) start = view->base; + while (r != ref + count && r->addr < start) ++r; + while (start != (char *)view->base + view->size && r != ref + count + && r->addr < (char *)view->base + view->size) + { + size = get_committed_size( view, start, &vprot, ~VPROT_WRITEWATCH ); + while (r != ref + count && r->addr < start + size) + { + if (vprot & VPROT_COMMITTED) fill_working_set_info( &data, view, vprot, &info[r->orig_index] ); + ++r; + } + start += size; + } + if (r == ref + count) break; + view = RB_ENTRY_VALUE( rb_next( &view->entry ), struct file_view, entry ); + } + free_fill_working_set_info_data( &data ); + if (ref != ref_buffer) free( ref ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if (res_len)

1 0