[PATCH 0/3] MR8880: opengl32: Simplify wow64 memory mapping error handling.
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/opengl32/unix_wgl.c | 63 ++++++++++++++++++---------------------- dlls/opengl32/wgl.c | 8 ++--- 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 46184fcd7a4..959cd41ba6f 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -2071,44 +2071,53 @@ static void unmap_named_buffer( TEB *teb, GLint buffer ) if (func) func( buffer ); } -static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *ptr, SIZE_T size, - GLbitfield access, PTR32 *ret ) +static PTR32 wow64_map_buffer( TEB *teb, GLuint name, GLenum target, void *ptr, SIZE_T size, + GLbitfield access, PTR32 *client_ptr ) { static unsigned int once; - if (*ret) /* wow64 pointer provided, map buffer to it */ + if (*client_ptr) /* wow64 pointer provided, map buffer to it */ { + PTR32 ret = *client_ptr; if (!(access & (GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT))) { if (!once++) FIXME( "Doing a copy of a mapped buffer (expect performance issues)\n" ); - TRACE( "Copying %#zx from buffer at %p to wow64 buffer %p\n", size, ptr, UlongToPtr(*ret) ); - memcpy( UlongToPtr(*ret), ptr, size ); + TRACE( "Copying %#zx from buffer at %p to wow64 buffer %p\n", size, ptr, UlongToPtr(*client_ptr) ); + memcpy( UlongToPtr(*client_ptr), ptr, size ); } /* save the wow64 pointer in the buffer data, we'll overwrite it on unmap */ - *(PTR32 *)ptr = (UINT_PTR)*ret; - return STATUS_SUCCESS; + *(PTR32 *)ptr = ret; + *client_ptr = 0; + return ret; } - if (ULongToPtr(*ret = PtrToUlong(ptr)) == ptr) return STATUS_SUCCESS; /* we're lucky */ + if (ULongToPtr(PtrToUlong(ptr)) == ptr) return PtrToUlong(ptr); /* we're lucky */ if (access & GL_MAP_PERSISTENT_BIT) { FIXME( "GL_MAP_PERSISTENT_BIT not supported!\n" ); - return STATUS_NOT_SUPPORTED; + goto unmap; } - if (!size) size = buffer ? get_named_buffer_param( teb, buffer, GL_BUFFER_SIZE ) : get_buffer_param( teb, target, GL_BUFFER_SIZE ); - if ((PTR32)size != size) return STATUS_NO_MEMORY; /* overflow */ + if (!size) size = name ? get_named_buffer_param( teb, name, GL_BUFFER_SIZE ) : get_buffer_param( teb, target, GL_BUFFER_SIZE ); + if ((PTR32)size != size) goto unmap; /* overflow */ if (size < sizeof(PTR32)) { FIXME( "Buffer too small for metadata!\n" ); - return STATUS_BUFFER_TOO_SMALL; + goto unmap; } - *ret = size; - return STATUS_INVALID_ADDRESS; + *client_ptr = size; + return 0; + +unmap: + if (name) + unmap_named_buffer( teb, name ); + else + unmap_buffer( teb, target ); + return 0; } static GLbitfield map_range_flags_from_map_flags( GLenum flags ) @@ -2182,16 +2191,13 @@ void wow64_glGetNamedBufferPointervEXT( TEB *teb, GLuint buffer, GLenum pname, P static PTR32 wow64_gl_map_buffer( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr, PFN_glMapBuffer gl_map_buffer64 ) { - NTSTATUS status; + GLbitfield range_access = map_range_flags_from_map_flags( access ); void *ptr; /* if *ret, we're being called again with a wow64 pointer */ ptr = *client_ptr ? get_buffer_pointer( teb, target ) : gl_map_buffer64( target, access ); - status = wow64_map_buffer( teb, 0, target, ptr, 0, map_range_flags_from_map_flags( access ), client_ptr ); - if (!status) return *client_ptr; - if (status != STATUS_INVALID_ADDRESS) unmap_buffer( teb, target ); - return 0; + return wow64_map_buffer( teb, 0, target, ptr, 0, range_access, client_ptr ); } PTR32 wow64_glMapBuffer( TEB *teb, GLenum target, GLenum access, PTR32 *client_ptr ) @@ -2209,33 +2215,26 @@ PTR32 wow64_glMapBufferARB( TEB *teb, GLenum target, GLenum access, PTR32 *clien PTR32 wow64_glMapBufferRange( TEB *teb, GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr ) { const struct opengl_funcs *funcs = teb->glTable; - NTSTATUS status; void *ptr; /* already mapped, we're being called again with a wow64 pointer */ if (*client_ptr) ptr = (char *)get_buffer_pointer( teb, target ); else ptr = funcs->p_glMapBufferRange( target, offset, length, access ); - status = wow64_map_buffer( teb, 0, target, ptr, length, access, client_ptr ); - if (!status) return *client_ptr; - if (status != STATUS_INVALID_ADDRESS) unmap_buffer( teb, target ); - return 0; + return wow64_map_buffer( teb, 0, target, ptr, length, access, client_ptr ); } static PTR32 wow64_gl_map_named_buffer( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr, PFN_glMapNamedBuffer gl_map_named_buffer64 ) { - NTSTATUS status; + GLbitfield range_access = map_range_flags_from_map_flags( access ); void *ptr; /* already mapped, we're being called again with a wow64 pointer */ if (*client_ptr) ptr = get_named_buffer_pointer( teb, buffer ); else ptr = gl_map_named_buffer64( buffer, access ); - status = wow64_map_buffer( teb, buffer, 0, ptr, 0, map_range_flags_from_map_flags( access ), client_ptr ); - if (!status) return *client_ptr; - if (status != STATUS_INVALID_ADDRESS) unmap_named_buffer( teb, buffer ); - return 0; + return wow64_map_buffer( teb, buffer, 0, ptr, 0, range_access, client_ptr ); } PTR32 wow64_glMapNamedBuffer( TEB *teb, GLuint buffer, GLenum access, PTR32 *client_ptr ) @@ -2253,17 +2252,13 @@ PTR32 wow64_glMapNamedBufferEXT( TEB *teb, GLuint buffer, GLenum access, PTR32 * static NTSTATUS wow64_gl_map_named_buffer_range( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr, PFN_glMapNamedBufferRange gl_map_named_buffer_range64 ) { - NTSTATUS status; void *ptr; /* already mapped, we're being called again with a wow64 pointer */ if (*client_ptr) ptr = get_named_buffer_pointer( teb, buffer ); else ptr = gl_map_named_buffer_range64( buffer, offset, length, access ); - status = wow64_map_buffer( teb, buffer, 0, ptr, length, access, client_ptr ); - if (!status) return *client_ptr; - if (status != STATUS_INVALID_ADDRESS) unmap_named_buffer( teb, buffer ); - return 0; + return wow64_map_buffer( teb, buffer, 0, ptr, length, access, client_ptr ); } PTR32 wow64_glMapNamedBufferRange( TEB *teb, GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access, PTR32 *client_ptr ) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b92511fd17b..b8af14388fc 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1709,7 +1709,7 @@ static void *gl_map_buffer( enum unix_funcs code, GLenum target, GLenum access ) TRACE( "Unable to map wow64 buffer directly, using copy buffer!\n" ); if (!(args.client_ptr = _aligned_malloc( (size_t)args.client_ptr, 16 ))) return NULL; status = WINE_UNIX_CALL( code, &args ); - if (args.ret != args.client_ptr) _aligned_free( args.client_ptr ); + _aligned_free( args.client_ptr ); } #endif if (status) WARN( "glMapBuffer returned %#lx\n", status ); @@ -1747,7 +1747,7 @@ void * WINAPI glMapBufferRange( GLenum target, GLintptr offset, GLsizeiptr lengt TRACE( "Unable to map wow64 buffer directly, using copy buffer!\n" ); if (!(args.client_ptr = _aligned_malloc( length, 16 ))) return NULL; status = UNIX_CALL( glMapBufferRange, &args ); - if (args.ret != args.client_ptr) _aligned_free( args.client_ptr ); + _aligned_free( args.client_ptr ); } #endif if (status) WARN( "glMapBufferRange returned %#lx\n", status ); @@ -1773,7 +1773,7 @@ static void *gl_map_named_buffer( enum unix_funcs code, GLuint buffer, GLenum ac TRACE( "Unable to map wow64 buffer directly, using copy buffer!\n" ); if (!(args.client_ptr = _aligned_malloc( (size_t)args.client_ptr, 16 ))) return NULL; status = WINE_UNIX_CALL( code, &args ); - if (args.ret != args.client_ptr) _aligned_free( args.client_ptr ); + _aligned_free( args.client_ptr ); } #endif if (status) WARN( "glMapNamedBuffer returned %#lx\n", status ); @@ -1811,7 +1811,7 @@ static void *gl_map_named_buffer_range( enum unix_funcs code, GLuint buffer, GLi TRACE( "Unable to map wow64 buffer directly, using copy buffer!\n" ); if (!(args.client_ptr = _aligned_malloc( length, 16 ))) return NULL; status = WINE_UNIX_CALL( code, &args ); - if (args.ret != args.client_ptr) _aligned_free( args.ret ); + _aligned_free( args.client_ptr ); } #endif if (status) WARN( "glMapNamedBufferRange returned %#lx\n", status ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8880
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/opengl32/unix_wgl.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 959cd41ba6f..898e1fc96e2 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1065,25 +1065,6 @@ BOOL wrap_wglCopyContext( TEB *teb, HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) return ret; } -HGLRC wrap_wglCreateContext( TEB *teb, HDC hdc ) -{ - HGLRC ret = 0; - struct context *context; - const struct opengl_funcs *funcs = get_dc_funcs( hdc ); - - if (!funcs) return 0; - if (!(context = calloc( 1, sizeof(*context) ))) return 0; - context->hdc = hdc; - context->share = (HGLRC)-1; /* initial shared context */ - if (!funcs->p_wgl_context_reset( &context->base, hdc, NULL, NULL )) free( context ); - else if (!(ret = alloc_handle( HANDLE_CONTEXT, funcs, context ))) - { - funcs->p_wgl_context_reset( &context->base, NULL, NULL, NULL ); - free( context ); - } - return ret; -} - BOOL wrap_wglMakeCurrent( TEB *teb, HDC hdc, HGLRC hglrc ) { DWORD tid = HandleToULong(teb->ClientId.UniqueThread); @@ -1275,6 +1256,11 @@ HGLRC wrap_wglCreateContextAttribsARB( TEB *teb, HDC hdc, HGLRC share, const int return ret; } +HGLRC wrap_wglCreateContext( TEB *teb, HDC hdc ) +{ + return wrap_wglCreateContextAttribsARB( teb, hdc, NULL, NULL ); +} + HPBUFFERARB wrap_wglCreatePbufferARB( TEB *teb, HDC hdc, int format, int width, int height, const int *attribs ) { HPBUFFERARB ret; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8880
From: Jacek Caban <jacek(a)codeweavers.com> And fix attribs leak in error case. --- dlls/opengl32/unix_wgl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 898e1fc96e2..7aa3d20bc7e 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1105,6 +1105,15 @@ BOOL wrap_wglMakeCurrent( TEB *teb, HDC hdc, HGLRC hglrc ) return TRUE; } +static void free_context( struct context *ctx ) +{ + free( ctx->wow64_version ); + free( ctx->disabled_exts ); + free( ctx->extensions ); + free( ctx->attribs ); + free( ctx ); +} + BOOL wrap_wglDeleteContext( TEB *teb, HGLRC hglrc ) { struct wgl_handle *ptr; @@ -1120,11 +1129,7 @@ BOOL wrap_wglDeleteContext( TEB *teb, HGLRC hglrc ) } if (hglrc == teb->glCurrentRC) wrap_wglMakeCurrent( teb, 0, 0 ); ptr->funcs->p_wgl_context_reset( &ctx->base, NULL, NULL, NULL ); - free( ctx->wow64_version ); - free( ctx->disabled_exts ); - free( ctx->extensions ); - free( ctx->attribs ); - free( ctx ); + free_context( ctx ); free_handle_ptr( ptr ); return TRUE; } @@ -1246,11 +1251,11 @@ HGLRC wrap_wglCreateContextAttribsARB( TEB *teb, HDC hdc, HGLRC share, const int context->hdc = hdc; context->share = (HGLRC)-1; /* initial shared context */ context->attribs = memdup_attribs( attribs ); - if (!(funcs->p_wgl_context_reset( &context->base, hdc, share_ctx ? &share_ctx->base : NULL, attribs ))) free( context ); + if (!(funcs->p_wgl_context_reset( &context->base, hdc, share_ctx ? &share_ctx->base : NULL, attribs ))) free_context( context ); else if (!(ret = alloc_handle( HANDLE_CONTEXT, funcs, context ))) { funcs->p_wgl_context_reset( &context->base, NULL, NULL, NULL ); - free( context ); + free_context( context ); } } return ret; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8880
participants (2)
-
Jacek Caban -
Jacek Caban (＠jacek)