[PATCH v3 0/1] MR9491: win32u: Make a copy of the GL_RENDERER / GL_VENDOR strings.

[Rémi Bernon]

Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=58973

Looks like these strings aren't as static as glGetString says they are.

--
  v3: win32u: Make a copy of the GL_RENDERER / GL_VENDOR strings.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9491

[PATCH v3 1/1] win32u: Make a copy of the GL_RENDERER / GL_VENDOR strings.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=58973
---
 dlls/win32u/opengl.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 60c80784115..38577c8959b 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -1115,10 +1115,18 @@ static void init_device_info( struct egl_platform *egl, const struct opengl_func
 
     if (context)
     {
+        char *renderer, *vendor;
+
         funcs->p_eglMakeCurrent( egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, context );
 
-        egl->device_name = gpu_device_name( egl->vendor_id, egl->device_id, (const char *)funcs->p_glGetString( GL_RENDERER ) );
-        egl->vendor_name = opengl_vendor_to_name( egl->vendor_id, (const char *)funcs->p_glGetString( GL_VENDOR ) );
+        renderer = strdup( (const char *)funcs->p_glGetString( GL_RENDERER ) );
+        egl->device_name = gpu_device_name( egl->vendor_id, egl->device_id, renderer );
+        if (egl->device_name != renderer) free( renderer );
+
+        vendor = strdup( (const char *)funcs->p_glGetString( GL_VENDOR ) );
+        egl->vendor_name = opengl_vendor_to_name( egl->vendor_id, vendor );
+        if (egl->vendor_name != vendor) free( vendor );
+
         TRACE( "  - device_name: %s\n", debugstr_a( egl->device_name ) );
         TRACE( "  - vendor_name: %s\n", debugstr_a( egl->vendor_name ) );
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9491