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

Alexandros Frantzis : winewayland.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard April 24, 2024

April 24, 2024

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: Remove unnecessary parameter from describe_pixel_format.
by Alexandre Julliard April 24, 2024

April 24, 2024

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

Alexandros Frantzis : winex11.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard April 24, 2024

April 24, 2024

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 : opengl32: Cache driver pixel format information.
by Alexandre Julliard April 24, 2024

April 24, 2024

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

Paul Gofman : ntdll: Remove entries from queue in RtlWakeAddressAll().
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 56d56ec6295d43ed076a327f0bae1ee8af5a0663 URL: https://gitlab.winehq.org/wine/wine/-/commit/56d56ec6295d43ed076a327f0bae1e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 21 16:23:33 2023 -0600 ntdll: Remove entries from queue in RtlWakeAddressAll(). --- dlls/ntdll/sync.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a764d2afc09..495514a1298 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -916,8 +916,8 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size void WINAPI RtlWakeAddressAll( const void *addr ) { struct futex_queue *queue = get_futex_queue( addr ); + struct futex_entry *entry, *next; unsigned int count = 0, i; - struct futex_entry *entry; DWORD tids[256]; TRACE("%p\n", addr); @@ -929,10 +929,12 @@ void WINAPI RtlWakeAddressAll( const void *addr ) if (!queue->queue.next) list_init(&queue->queue); - LIST_FOR_EACH_ENTRY( entry, &queue->queue, struct futex_entry, entry ) + LIST_FOR_EACH_ENTRY_SAFE( entry, next, &queue->queue, struct futex_entry, entry ) { if (entry->addr == addr) { + entry->addr = NULL; + list_remove( &entry->entry ); /* Try to buffer wakes, so that we don't make a system call while * holding a spinlock. */ if (count < ARRAY_SIZE(tids))

1 0

Alexandros Frantzis : opengl32: Implement wglDescribePixelFormat using new driver API get_pixel_formats.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 9943ab6e208112d1b98a412fc759a1a9a60807ac URL: https://gitlab.winehq.org/wine/wine/-/commit/9943ab6e208112d1b98a412fc759a1… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Apr 19 12:55:02 2024 +0300 opengl32: Implement wglDescribePixelFormat using new driver API get_pixel_formats. Introduce a new wgl driver callback function to allow the driver to provide a complete list of all pixel formats and their attributes. If the driver provides the information use it to implement wglDescribePixelFormat. --- dlls/opengl32/make_opengl | 24 ++++++++++++++++++++++- dlls/opengl32/thunks.c | 9 --------- dlls/opengl32/unix_thunks.c | 4 ++++ dlls/opengl32/unix_wgl.c | 35 +++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 11 +++++++++++ dlls/opengl32/wgl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/wgl_driver.h | 8 +++++++- 7 files changed, 127 insertions(+), 11 deletions(-)

1 0

Alexandros Frantzis : winex11.drv: Rename wgl_pixel_format to glx_pixel_format.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 76aa8668bdc7e0f1fd8b2172def454ab68772e5d URL: https://gitlab.winehq.org/wine/wine/-/commit/76aa8668bdc7e0f1fd8b2172def454… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Mar 14 16:15:59 2024 +0200 winex11.drv: Rename wgl_pixel_format to glx_pixel_format. We want to use wgl_pixel_format in the wgl driver API. --- dlls/winex11.drv/opengl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 68c8214b835..2482a07212a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -184,7 +184,7 @@ static char wglExtensions[4096]; static int glxVersion[2]; static int glx_opcode; -struct wgl_pixel_format +struct glx_pixel_format { GLXFBConfig fbconfig; XVisualInfo *visual; @@ -199,7 +199,7 @@ struct wgl_context BOOL has_been_current; BOOL sharing; BOOL gl3_context; - const struct wgl_pixel_format *fmt; + const struct glx_pixel_format *fmt; int numAttribs; /* This is needed for delaying wglCreateContextAttribsARB */ int attribList[16]; /* This is needed for delaying wglCreateContextAttribsARB */ GLXContext ctx; @@ -226,7 +226,7 @@ struct gl_drawable Window window; /* window if drawable is a GLXWindow */ Colormap colormap; /* colormap for the client window */ Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ - const struct wgl_pixel_format *format; /* pixel format for the drawable */ + const struct glx_pixel_format *format; /* pixel format for the drawable */ SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ int swap_interval; BOOL refresh_swap_interval; @@ -236,7 +236,7 @@ struct gl_drawable struct wgl_pbuffer { struct gl_drawable *gl; - const struct wgl_pixel_format* fmt; + const struct glx_pixel_format* fmt; int width; int height; int* attribList; @@ -268,7 +268,7 @@ static XContext gl_pbuffer_context; static struct list context_list = LIST_INIT( context_list ); static struct list pbuffer_list = LIST_INIT( pbuffer_list ); -static struct wgl_pixel_format *pixel_formats; +static struct glx_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static BOOL use_render_texture_emulation = TRUE; @@ -1000,7 +1000,7 @@ static BOOL check_fbconfig_bitmap_capability(Display *display, GLXFBConfig fbcon static void init_pixel_formats( Display *display ) { - struct wgl_pixel_format *list; + struct glx_pixel_format *list; int size = 0, onscreen_size = 0; int fmt_id, nCfgs, i, run, bmp_formats; GLXFBConfig* cfgs; @@ -1119,7 +1119,7 @@ static inline BOOL is_onscreen_pixel_format( int format ) return format > 0 && format <= nb_onscreen_formats; } -static inline int pixel_format_index( const struct wgl_pixel_format *format ) +static inline int pixel_format_index( const struct glx_pixel_format *format ) { return format - pixel_formats + 1; } @@ -1129,7 +1129,7 @@ static inline int pixel_format_index( const struct wgl_pixel_format *format ) * Wine's main visual and offscreen formats (if they are available). * This function converts a WGL format to its corresponding GLX one. */ -static const struct wgl_pixel_format *get_pixel_format(Display *display, int iPixelFormat, BOOL AllowOffscreen) +static const struct glx_pixel_format *get_pixel_format(Display *display, int iPixelFormat, BOOL AllowOffscreen) { /* Check if the pixelformat is valid. Note that it is legal to pass an invalid * iPixelFormat in case of probing the number of pixelformats. @@ -1308,7 +1308,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL known_child, +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct glx_pixel_format *format, BOOL known_child, BOOL mutable_pf ) { struct gl_drawable *gl, *prev; @@ -1400,7 +1400,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel /*********************************************************************** * set_win_format */ -static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BOOL internal ) +static BOOL set_win_format( HWND hwnd, const struct glx_pixel_format *format, BOOL internal ) { struct gl_drawable *old, *gl; @@ -1431,7 +1431,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) { - const struct wgl_pixel_format *fmt; + const struct glx_pixel_format *fmt; int value; HWND hwnd = NtUserWindowFromDC( hdc ); int prev; @@ -1562,7 +1562,7 @@ static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, /*XVisualInfo *vis;*/ int value; int rb,gb,bb,ab; - const struct wgl_pixel_format *fmt; + const struct glx_pixel_format *fmt; if (!has_opengl()) return 0; @@ -2165,7 +2165,7 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat const int *piAttribList ) { struct wgl_pbuffer* object; - const struct wgl_pixel_format *fmt; + const struct glx_pixel_format *fmt; int attribs[256]; int nAttribs = 0; @@ -2708,7 +2708,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int UINT nAttributes, const int *piAttributes, int *piValues ) { UINT i; - const struct wgl_pixel_format *fmt; + const struct glx_pixel_format *fmt; int hTest; int tmp; int curGLXAttr = 0;

1 0

Paul Gofman : ntdll: Pre-check entry->addr before taking a spin lock in RtlWaitOnAddress().
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: e00cbef06d8df1c5aeed3bcabc3dfe660a21fa1d URL: https://gitlab.winehq.org/wine/wine/-/commit/e00cbef06d8df1c5aeed3bcabc3dfe… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 21 16:29:14 2023 -0600 ntdll: Pre-check entry->addr before taking a spin lock in RtlWaitOnAddress(). --- dlls/ntdll/sync.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 495514a1298..efc820624bb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -898,11 +898,14 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size ret = NtWaitForAlertByThreadId( NULL, timeout ); - spin_lock( &queue->lock ); - /* We may have already been removed by a call to RtlWakeAddressSingle(). */ + /* We may have already been removed by a call to RtlWakeAddressSingle() or RtlWakeAddressAll(). */ if (entry.addr) - list_remove( &entry.entry ); - spin_unlock( &queue->lock ); + { + spin_lock( &queue->lock ); + if (entry.addr) + list_remove( &entry.entry ); + spin_unlock( &queue->lock ); + } TRACE("returning %#lx\n", ret);

1 0

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

April 24, 2024

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 : oleaut32: Extend 8- and 16-bit parameters on ARM.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: fffed9b3b198b9f26157e903291af0ee6de33867 URL: https://gitlab.winehq.org/wine/wine/-/commit/fffed9b3b198b9f26157e903291af0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 16:54:48 2024 +0200 oleaut32: Extend 8- and 16-bit parameters on ARM. And update tests to show that Windows does the same. --- dlls/oleaut32/tests/typelib.c | 31 +++++++++++++++-------------- dlls/oleaut32/typelib.c | 46 +++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d755729d9e9..f8606bcfe68 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1188,7 +1188,11 @@ static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 ) { ok( a0 == 1, "wrong arg0 %x\n", a0 ); ok( a1 == -1, "wrong arg1 %x\n", a1 ); +#ifdef __arm__ /* parameters are extended on arm */ + ok( a2 == 1234, "wrong arg2 %x\n", a2 ); +#else ok( a2 == (0x55550000 | 1234), "wrong arg2 %x\n", a2 ); +#endif ok( a3 == 0xdeadbeef, "wrong arg3 %x\n", a3 ); ok( a4 == 0x555555fd, "wrong arg4 %x\n", a4 ); return 4321; @@ -1226,16 +1230,13 @@ static VARIANT WINAPI variant_func( int a0, BOOL a1, DECIMAL a2, VARIANT a3 ) static int CDECL void_func( int a0, int a1 ) { - if (is_win64) /* VT_EMPTY is passed as real arg on win64 */ - { - ok( a0 == 0x55555555, "wrong arg0 %x\n", a0 ); - ok( a1 == 1111, "wrong arg1 %x\n", a1 ); - } - else - { - ok( a0 == 1111, "wrong arg0 %x\n", a0 ); - ok( a1 == 0, "wrong arg1 %x\n", a1 ); - } +#ifdef __i386__ + ok( a0 == 1111, "wrong arg0 %x\n", a0 ); + ok( a1 == 0, "wrong arg1 %x\n", a1 ); +#else /* VT_EMPTY is passed as real arg on other platforms */ + ok( a0 == 0x55555555, "wrong arg0 %x\n", a0 ); + ok( a1 == 1111, "wrong arg1 %x\n", a1 ); +#endif return 12; } @@ -1433,11 +1434,11 @@ static void test_DispCallFunc(void) res = DispCallFunc( NULL, (ULONG_PTR)void_func, CC_CDECL, VT_EMPTY, 5, types, pargs, &result ); ok( res == S_OK, "DispCallFunc failed %lx\n", res ); ok( V_VT(&result) == VT_EMPTY, "wrong result type %d\n", V_VT(&result) ); - if (is_win64) - ok( V_UI4(&result) == 12, "wrong result %08lx\n", V_UI4(&result) ); - else - ok( V_UI4(&result) == 0xcccccccc, "wrong result %08lx\n", V_UI4(&result) ); - +#ifdef __i386__ + ok( V_UI4(&result) == 0xcccccccc, "wrong result %08lx\n", V_UI4(&result) ); +#else + ok( V_UI4(&result) == 12, "wrong result %08lx\n", V_UI4(&result) ); +#endif memset( args, 0x55, sizeof(args) ); types[0] = VT_I4; V_I4(&args[0]) = 3; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d920ee7c0cc..670938fb81c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6618,9 +6618,7 @@ __ASM_GLOBAL_FUNC( call_method, "bgt 2b\n\t" /* Loop till done */ "1:\n\t" -#ifndef __SOFTFP__ "vldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ -#endif "mov ip, r0\n\t" /* Save the function call address to ip before we nuke r0 with arguments to pass */ "ldm r3, {r0-r3}\n\t" /* Load the r0-r3 arguments */ @@ -6642,19 +6640,15 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART UINT i; DWORD *args; struct { -#ifndef __SOFTFP__ union { float s[16]; double d[8]; } sd; -#endif DWORD r[4]; } regs; int rcount; /* 32-bit register index count */ -#ifndef __SOFTFP__ int scount = 0; /* single-precision float register index count */ int dcount = 0; /* double-precision float register index count */ -#endif TRACE("(%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -6702,11 +6696,8 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART switch (prgvt[i]) { - case VT_EMPTY: - break; case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ case VT_DATE: -#ifndef __SOFTFP__ dcount = max( (scount + 1) / 2, dcount ); if (dcount < 8) { @@ -6719,7 +6710,6 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART argspos += sizeof(V_R8(arg)) / sizeof(DWORD); } break; -#endif case VT_I8: /* these must be 8-byte aligned, and put in 'r' regs or stack, as they are long-longs */ case VT_UI8: case VT_CY: @@ -6757,26 +6747,37 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART --ntemp; } break; - case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ - if (rcount < 4) - regs.r[rcount++] = V_BOOL(arg); - else - args[argspos++] = V_BOOL(arg); - break; case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ -#ifndef __SOFTFP__ if (!(scount % 2)) scount = max( scount, dcount * 2 ); if (scount < 16) regs.sd.s[scount++] = V_R4(arg); else args[argspos++] = V_UI4(arg); break; -#endif + /* extend parameters to 32 bits */ + case VT_I1: + if (rcount < 4) regs.r[rcount++] = V_I1(arg); + else args[argspos++] = V_I1(arg); + break; + case VT_UI1: + if (rcount < 4) regs.r[rcount++] = V_UI1(arg); + else args[argspos++] = V_UI1(arg); + break; + case VT_I2: + if (rcount < 4) regs.r[rcount++] = V_I2(arg); + else args[argspos++] = V_I2(arg); + break; + case VT_UI2: + if (rcount < 4) regs.r[rcount++] = V_UI2(arg); + else args[argspos++] = V_UI2(arg); + break; + case VT_BOOL: + if (rcount < 4) regs.r[rcount++] = V_BOOL(arg); + else args[argspos++] = V_BOOL(arg); + break; default: - if (rcount < 4) - regs.r[rcount++] = V_UI4(arg); - else - args[argspos++] = V_UI4(arg); + if (rcount < 4) regs.r[rcount++] = V_UI4(arg); + else args[argspos++] = V_UI4(arg); break; } TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); @@ -6786,7 +6787,6 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART switch (vtReturn) { - case VT_EMPTY: /* EMPTY = no return value */ case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ case VT_VARIANT: call_method( func, argspos, args, (DWORD*)&regs );

1 0