November 2022 - Wine-commits

Rémi Bernon : opengl32: Move glGetStringi extension filtering to unix_wgl.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 720afb14019d9a887d3787053fad9d835470fd7c URL: https://gitlab.winehq.org/wine/wine/-/commit/720afb14019d9a887d3787053fad9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 13:29:46 2022 +0100 opengl32: Move glGetStringi extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 3 +-- dlls/opengl32/opengl_ext.h | 1 + dlls/opengl32/thunks.c | 10 +++++++++- dlls/opengl32/unix_thunks.c | 9 +-------- dlls/opengl32/unix_wgl.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 41 ---------------------------------------- 6 files changed, 58 insertions(+), 52 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 78368ec6c2f..733b5795306 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -163,7 +163,6 @@ my %manual_win_thunks = ( "glGetIntegerv" => 1, "glGetString" => 1, - "glGetStringi" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetPixelFormat" => 1, "wglGetProcAddress" => 1, @@ -511,7 +510,7 @@ sub needs_wrapper($$) { my ($name, $func) = @_; - return 1 if $name =~ /^glDebugMessageCallback/; + return 1 if $name =~ /^glDebugMessageCallback|^glGetStringi/; # check if return value needs special handling (my $type = $func->[0]->textContent()) =~ s/ $//; diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index b2c3c681a41..132a414399d 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -104,5 +104,6 @@ extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFO extern BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLuint **disabled_exts ) DECLSPEC_HIDDEN; extern const GLuint *disabled_extensions_index(void) DECLSPEC_HIDDEN; extern BOOL check_extension_support( const char *extension, const char *available_extensions ) DECLSPEC_HIDDEN; +extern char *build_extension_list(void) DECLSPEC_HIDDEN; #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */ diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index a2a78bff97d..ca133a25830 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -9898,6 +9898,15 @@ static GLushort WINAPI glGetStageIndexNV( GLenum shadertype ) return args.ret; } +static const GLubyte * WINAPI glGetStringi( GLenum name, GLuint index ) +{ + struct glGetStringi_params args = { .name = name, .index = index, }; + NTSTATUS status; + TRACE( "name %d, index %d\n", name, index ); + if ((status = UNIX_CALL( glGetStringi, &args ))) WARN( "glGetStringi returned %#x\n", status ); + return args.ret; +} + static GLuint WINAPI glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar *name ) { struct glGetSubroutineIndex_params args = { .program = program, .shadertype = shadertype, .name = name, }; @@ -24462,7 +24471,6 @@ static BOOL WINAPI wglSwapIntervalEXT( int interval ) return args.ret; } -extern const GLubyte * WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; extern HDC WINAPI wglGetCurrentReadDCARB(void) DECLSPEC_HIDDEN; const int extension_registry_size = 2694; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 86af754b278..3f00f6ce394 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -21,6 +21,7 @@ extern NTSTATUS wgl_wglShareLists( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallback( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackAMD( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackARB( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS ext_glGetStringi( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_wglBindTexImageARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_wglCreateContextAttribsARB( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_wglCreatePbufferARB( void *args ) DECLSPEC_HIDDEN; @@ -9797,14 +9798,6 @@ static NTSTATUS ext_glGetStageIndexNV( void *args ) return STATUS_SUCCESS; } -static NTSTATUS ext_glGetStringi( void *args ) -{ - struct glGetStringi_params *params = args; - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - params->ret = funcs->ext.p_glGetStringi( params->name, params->index ); - return STATUS_SUCCESS; -} - static NTSTATUS ext_glGetSubroutineIndex( void *args ) { struct glGetSubroutineIndex_params *params = args; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 9a96f78dacb..4fe594d42f9 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -286,6 +286,45 @@ BOOL check_extension_support( const char *extension, const char *available_exten return FALSE; } +static const GLubyte * WINAPI wrap_glGetStringi( GLenum name, GLuint index ) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const GLuint *disabled; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + *func_ptr = funcs->wgl.p_wglGetProcAddress( "glGetStringi" ); + } + + if (name == GL_EXTENSIONS && (disabled = disabled_extensions_index())) + while (index >= *disabled++) index++; + + return funcs->ext.p_glGetStringi( name, index ); +} + +char *build_extension_list(void) +{ + GLint len = 0, capacity, i, extensions_count; + char *extension, *tmp, *available_extensions; + + glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); + capacity = 128 * extensions_count; + + if (!(available_extensions = HeapAlloc( GetProcessHeap(), 0, capacity ))) return NULL; + for (i = 0; i < extensions_count; ++i) + { + extension = (char *)wrap_glGetStringi( GL_EXTENSIONS, i ); + capacity = max( capacity, len + strlen( extension ) + 2 ); + if (!(tmp = HeapReAlloc( GetProcessHeap(), 0, available_extensions, capacity ))) break; + available_extensions = tmp; + len += sprintf( available_extensions + len, "%s ", extension ); + } + if (len) available_extensions[len - 1] = 0; + + return available_extensions; +} + static BOOL wrap_wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) { struct wgl_handle *src, *dst; @@ -691,6 +730,13 @@ NTSTATUS ext_glDebugMessageCallbackARB( void *args ) return STATUS_SUCCESS; } +NTSTATUS ext_glGetStringi( void *args ) +{ + struct glGetStringi_params *params = args; + params->ret = wrap_glGetStringi( params->name, params->index ); + return STATUS_SUCCESS; +} + NTSTATUS ext_wglBindTexImageARB( void *args ) { struct wglBindTexImageARB_params *params = args; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 60ba7bf3bdf..ec1e875c56c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -348,52 +348,11 @@ void WINAPI glGetIntegerv(GLenum pname, GLint *data) while (*disabled++ != ~0u) (*data)--; } -const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const GLuint *disabled; - - TRACE("(%d, %d)\n", name, index); - if (!funcs->ext.p_glGetStringi) - { - void **func_ptr = (void **)&funcs->ext.p_glGetStringi; - - *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); - } - - if (name == GL_EXTENSIONS && (disabled = disabled_extensions_index())) - while (index >= *disabled++) index++; - - return funcs->ext.p_glGetStringi(name, index); -} - static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name); } -static char *build_extension_list(void) -{ - GLint len = 0, capacity, i, extensions_count; - char *extension, *tmp, *available_extensions; - - glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); - capacity = 128 * extensions_count; - - if (!(available_extensions = HeapAlloc( GetProcessHeap(), 0, capacity ))) return NULL; - for (i = 0; i < extensions_count; ++i) - { - extension = (char *)glGetStringi( GL_EXTENSIONS, i ); - capacity = max( capacity, len + strlen( extension ) + 2 ); - if (!(tmp = HeapReAlloc( GetProcessHeap(), 0, available_extensions, capacity ))) break; - available_extensions = tmp; - len += sprintf( available_extensions + len, "%s ", extension ); - } - if (len) available_extensions[len - 1] = 0; - - return available_extensions; -} - static char *heap_strdup( const char *str ) { int len = strlen( str ) + 1;

1 0

Rémi Bernon : opengl32: Move glGetString extension filtering to unix_wgl.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 35f64cd7c8b75934fd9300508c4c084b58c40500 URL: https://gitlab.winehq.org/wine/wine/-/commit/35f64cd7c8b75934fd9300508c4c08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:16:48 2022 +0100 opengl32: Move glGetString extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 10 ++++++++-- dlls/opengl32/opengl_ext.h | 1 - dlls/opengl32/thunks.c | 9 +++++++++ dlls/opengl32/unix_thunks.c | 9 +-------- dlls/opengl32/unix_wgl.c | 25 ++++++++++++++++++++++++- dlls/opengl32/wgl.c | 23 ----------------------- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 733b5795306..5e269d89109 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -162,7 +162,6 @@ my %manual_win_functions = my %manual_win_thunks = ( "glGetIntegerv" => 1, - "glGetString" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetPixelFormat" => 1, "wglGetProcAddress" => 1, @@ -510,7 +509,7 @@ sub needs_wrapper($$) { my ($name, $func) = @_; - return 1 if $name =~ /^glDebugMessageCallback|^glGetStringi/; + return 1 if $name =~ /^glDebugMessageCallback|^glGetString/; # check if return value needs special handling (my $type = $func->[0]->textContent()) =~ s/ $//; @@ -941,6 +940,12 @@ foreach (sort keys %wgl_functions) next unless needs_wrapper( $_, $wgl_functions{$_} ); print OUT "extern NTSTATUS wgl_$_( void *args ) DECLSPEC_HIDDEN;\n"; } +foreach (sort keys %norm_functions) +{ + next if defined $manual_win_functions{$_}; + next unless needs_wrapper( $_, $norm_functions{$_} ); + print OUT "extern NTSTATUS gl_$_( void *args ) DECLSPEC_HIDDEN;\n"; +} foreach (sort keys %ext_functions) { next if defined $manual_win_functions{$_}; @@ -958,6 +963,7 @@ foreach (sort keys %wgl_functions) foreach (sort keys %norm_functions) { next if defined $manual_win_functions{$_}; + next if needs_wrapper( $_, $norm_functions{$_} ); print OUT generate_unix_thunk($_, $norm_functions{$_}, "gl"); } foreach (sort keys %ext_functions) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 132a414399d..6e069cf5bd5 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -101,7 +101,6 @@ static inline enum wgl_handle_type get_current_context_type(void) extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); -extern BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLuint **disabled_exts ) DECLSPEC_HIDDEN; extern const GLuint *disabled_extensions_index(void) DECLSPEC_HIDDEN; extern BOOL check_extension_support( const char *extension, const char *available_extensions ) DECLSPEC_HIDDEN; extern char *build_extension_list(void) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index ca133a25830..0a9fb8bb677 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -1011,6 +1011,15 @@ void WINAPI glGetPolygonStipple( GLubyte *mask ) if ((status = UNIX_CALL( glGetPolygonStipple, &args ))) WARN( "glGetPolygonStipple returned %#x\n", status ); } +const GLubyte * WINAPI glGetString( GLenum name ) +{ + struct glGetString_params args = { .name = name, }; + NTSTATUS status; + TRACE( "name %d\n", name ); + if ((status = UNIX_CALL( glGetString, &args ))) WARN( "glGetString returned %#x\n", status ); + return args.ret; +} + void WINAPI glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params ) { struct glGetTexEnvfv_params args = { .target = target, .pname = pname, .params = params, }; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 3f00f6ce394..375d1630cf9 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -18,6 +18,7 @@ extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglDeleteContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglShareLists( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS gl_glGetString( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallback( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackAMD( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackARB( void *args ) DECLSPEC_HIDDEN; @@ -1009,14 +1010,6 @@ static NTSTATUS gl_glGetPolygonStipple( void *args ) return STATUS_SUCCESS; } -static NTSTATUS gl_glGetString( void *args ) -{ - struct glGetString_params *params = args; - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - params->ret = funcs->gl.p_glGetString( params->name ); - return STATUS_SUCCESS; -} - static NTSTATUS gl_glGetTexEnvfv( void *args ) { struct glGetTexEnvfv_params *params = args; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 4fe594d42f9..a0207ad533a 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -195,7 +195,7 @@ static GLuint *filter_extensions_index( const char *disabled ) } /* build the extension string by filtering out the disabled extensions */ -BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLuint **disabled_exts ) +static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLuint **disabled_exts ) { static const char *disabled; @@ -286,6 +286,22 @@ BOOL check_extension_support( const char *extension, const char *available_exten return FALSE; } +static const GLubyte * WINAPI wrap_glGetString( GLenum name ) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const GLubyte *ret; + + if ((ret = funcs->gl.p_glGetString( name )) && name == GL_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr(); + GLubyte **extensions = &ptr->u.context->extensions; + GLuint **disabled = &ptr->u.context->disabled_exts; + if (*extensions || filter_extensions( (const char *)ret, extensions, disabled )) return *extensions; + } + + return ret; +} + static const GLubyte * WINAPI wrap_glGetStringi( GLenum name, GLuint index ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; @@ -711,6 +727,13 @@ NTSTATUS wgl_wglShareLists( void *args ) return STATUS_SUCCESS; } +NTSTATUS gl_glGetString( void *args ) +{ + struct glGetString_params *params = args; + params->ret = wrap_glGetString( params->name ); + return STATUS_SUCCESS; +} + NTSTATUS ext_glDebugMessageCallback( void *args ) { struct glDebugMessageCallback_params *params = args; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ec1e875c56c..3aa37bd5cb4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -955,29 +955,6 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) return 0; } -/*********************************************************************** - * glGetString (OPENGL32.@) - */ -const GLubyte * WINAPI glGetString( GLenum name ) -{ - struct glGetString_params args = { .name = name, }; - NTSTATUS status; - - TRACE( "name %d\n", name ); - - if ((status = UNIX_CALL( glGetString, &args ))) WARN( "glGetString returned %#x\n", status ); - - if (name == GL_EXTENSIONS && args.ret) - { - struct wgl_handle *ptr = get_current_context_ptr(); - GLubyte **extensions = &ptr->u.context->extensions; - GLuint **disabled = &ptr->u.context->disabled_exts; - if (*extensions || filter_extensions( (const char *)args.ret, extensions, disabled )) return *extensions; - } - - return args.ret; -} - static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_message_params *params, ULONG size ) { params->user_callback( params->source, params->type, params->id, params->severity,

1 0

Rémi Bernon : opengl32: Move glGetIntegerv extension filtering to unix_wgl.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: b6f80f9fcc6cf01995ac35f3f8254e4cccef4746 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6f80f9fcc6cf01995ac35f3f8254e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:18:07 2022 +0100 opengl32: Move glGetIntegerv extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 3 +-- dlls/opengl32/opengl_ext.h | 1 - dlls/opengl32/thunks.c | 8 ++++++++ dlls/opengl32/unix_thunks.c | 9 +-------- dlls/opengl32/unix_wgl.c | 22 ++++++++++++++++++++-- dlls/opengl32/wgl.c | 14 -------------- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5e269d89109..a5326d5f40d 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -161,7 +161,6 @@ my %manual_win_functions = ); my %manual_win_thunks = ( - "glGetIntegerv" => 1, "wglGetCurrentReadDCARB" => 1, "wglGetPixelFormat" => 1, "wglGetProcAddress" => 1, @@ -509,7 +508,7 @@ sub needs_wrapper($$) { my ($name, $func) = @_; - return 1 if $name =~ /^glDebugMessageCallback|^glGetString/; + return 1 if $name =~ /^glDebugMessageCallback|^glGetString|^glGetIntegerv/; # check if return value needs special handling (my $type = $func->[0]->textContent()) =~ s/ $//; diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 6e069cf5bd5..3638494829c 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -101,7 +101,6 @@ static inline enum wgl_handle_type get_current_context_type(void) extern int WINAPI wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ); -extern const GLuint *disabled_extensions_index(void) DECLSPEC_HIDDEN; extern BOOL check_extension_support( const char *extension, const char *available_extensions ) DECLSPEC_HIDDEN; extern char *build_extension_list(void) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index 0a9fb8bb677..a5a117657fc 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -915,6 +915,14 @@ void WINAPI glGetFloatv( GLenum pname, GLfloat *data ) if ((status = UNIX_CALL( glGetFloatv, &args ))) WARN( "glGetFloatv returned %#x\n", status ); } +void WINAPI glGetIntegerv( GLenum pname, GLint *data ) +{ + struct glGetIntegerv_params args = { .pname = pname, .data = data, }; + NTSTATUS status; + TRACE( "pname %d, data %p\n", pname, data ); + if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); +} + void WINAPI glGetLightfv( GLenum light, GLenum pname, GLfloat *params ) { struct glGetLightfv_params args = { .light = light, .pname = pname, .params = params, }; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 375d1630cf9..41374ed9d74 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -18,6 +18,7 @@ extern NTSTATUS wgl_wglCreateContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglDeleteContext( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglMakeCurrent( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wgl_wglShareLists( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS gl_glGetIntegerv( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS gl_glGetString( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallback( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS ext_glDebugMessageCallbackAMD( void *args ) DECLSPEC_HIDDEN; @@ -906,14 +907,6 @@ static NTSTATUS gl_glGetFloatv( void *args ) return STATUS_SUCCESS; } -static NTSTATUS gl_glGetIntegerv( void *args ) -{ - struct glGetIntegerv_params *params = args; - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - funcs->gl.p_glGetIntegerv( params->pname, params->data ); - return STATUS_SUCCESS; -} - static NTSTATUS gl_glGetLightfv( void *args ) { struct glGetLightfv_params *params = args; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a0207ad533a..3213bfcb6bc 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -229,7 +229,7 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui return (exts_list && *exts_list) || *disabled_exts; } -const GLuint *disabled_extensions_index(void) +static const GLuint *disabled_extensions_index(void) { struct wgl_handle *ptr = get_current_context_ptr(); GLuint **disabled = &ptr->u.context->disabled_exts; @@ -286,6 +286,17 @@ BOOL check_extension_support( const char *extension, const char *available_exten return FALSE; } +static void WINAPI wrap_glGetIntegerv( GLenum pname, GLint *data ) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const GLuint *disabled; + + funcs->gl.p_glGetIntegerv( pname, data ); + + if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index())) + while (*disabled++ != ~0u) (*data)--; +} + static const GLubyte * WINAPI wrap_glGetString( GLenum name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; @@ -324,7 +335,7 @@ char *build_extension_list(void) GLint len = 0, capacity, i, extensions_count; char *extension, *tmp, *available_extensions; - glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); + wrap_glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); capacity = 128 * extensions_count; if (!(available_extensions = HeapAlloc( GetProcessHeap(), 0, capacity ))) return NULL; @@ -727,6 +738,13 @@ NTSTATUS wgl_wglShareLists( void *args ) return STATUS_SUCCESS; } +NTSTATUS gl_glGetIntegerv( void *args ) +{ + struct glGetIntegerv_params *params = args; + wrap_glGetIntegerv( params->pname, params->data ); + return STATUS_SUCCESS; +} + NTSTATUS gl_glGetString( void *args ) { struct glGetString_params *params = args; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3aa37bd5cb4..a39bbcdd000 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -334,20 +334,6 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } -void WINAPI glGetIntegerv(GLenum pname, GLint *data) -{ - struct glGetIntegerv_params args = { .pname = pname, .data = data, }; - const GLuint *disabled; - NTSTATUS status; - - TRACE( "pname %d, data %p\n", pname, data ); - - if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); - - if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index())) - while (*disabled++ != ~0u) (*data)--; -} - static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name);

1 0

Rémi Bernon : opengl32: Move function / extension registry mapping to unix_thunks.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 8a6987af121b79df818b7fcf278f512f8cf1eb60 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a6987af121b79df818b7fcf278f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:26:36 2022 +0100 opengl32: Move function / extension registry mapping to unix_thunks.c. Keeping the extension function pointers array on the PE side. --- dlls/opengl32/make_opengl | 20 +- dlls/opengl32/opengl_ext.h | 13 +- dlls/opengl32/thunks.c | 5394 +++++++++++++++++++++---------------------- dlls/opengl32/unix_thunks.c | 2699 ++++++++++++++++++++++ dlls/opengl32/wgl.c | 32 +- 5 files changed, 5432 insertions(+), 2726 deletions(-)

1 0

Rémi Bernon : opengl32: Move wglGetProcAddress extension filtering to unix_wgl.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: b892720adb2daf2c1a671a6d7876616fe2ce1576 URL: https://gitlab.winehq.org/wine/wine/-/commit/b892720adb2daf2c1a671a6d787661… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 15:41:48 2022 +0100 opengl32: Move wglGetProcAddress extension filtering to unix_wgl.c. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/opengl_ext.h | 9 ---- dlls/opengl32/unix_thunks.c | 9 +--- dlls/opengl32/unix_wgl.c | 107 +++++++++++++++++++++++++++++++++++++++++++- dlls/opengl32/wgl.c | 90 +++---------------------------------- 5 files changed, 113 insertions(+), 104 deletions(-)

1 0

Paul Gofman : ws2_32/tests: Don't test protocol name in test_WSASocket().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 2d5de1d911bb847ec8d5dfad4569454e152ae834 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d5de1d911bb847ec8d5dfad456945… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 7 21:01:26 2022 -0600 ws2_32/tests: Don't test protocol name in test_WSASocket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53893 --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9b39ecff3c5..d4d92b58c41 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3270,9 +3270,8 @@ static void test_WSASocket(void) size = sizeof(info); err = getsockopt(sock, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &info, &size); ok(!err,"got error %d\n", WSAGetLastError()); - ok(!wcscmp(info.szProtocol, L"MSAFD Tcpip [RAW/IP]") - || broken(!wcscmp(info.szProtocol, L"MSAFD-Tcpip [RAW/IP]")) /* Some Win7 machines. */, - "got szProtocol %s.\n", debugstr_w(info.szProtocol)); + /* Protocol name in info.szProtocol is not entirely consistent across Windows versions and + * locales, so not testing it. */ ok(info.iAddressFamily == AF_INET, "got iAddressFamily %d.\n", info.iAddressFamily); ok(info.iSocketType == SOCK_RAW, "got iSocketType %d.\n", info.iSocketType); ok(info.iMaxSockAddr == 0x10, "got iMaxSockAddr %d.\n", info.iMaxSockAddr);

1 0

Rémi Bernon : winebuild: Introduce a new --without-dlltool winebuild flag.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: b9375920f9317a022b3d351340304bb3b38fb211 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9375920f9317a022b3d351340304b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 2 14:21:14 2022 +0100 winebuild: Introduce a new --without-dlltool winebuild flag. Set it only when -Wl,--delay-load linker flag is not supported to keep using dlltool in LLVM builds, for MSVC-like import libs. --- tools/makedep.c | 1 + tools/winebuild/build.h | 1 + tools/winebuild/import.c | 12 ++++++++++-- tools/winebuild/main.c | 9 ++++++++- tools/winebuild/winebuild.man.in | 3 +++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ca1efed4533..a042621cec7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3404,6 +3404,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, make->implib_files[arch] ); output( "\n" ); output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + if (!delay_load_flags[arch]) output_filename( "--without-dlltool" ); output_filenames( target_flags[arch] ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 7ce502143e3..accfa9a47dd 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -357,6 +357,7 @@ extern int verbose; extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; +extern int use_dlltool; extern int use_msvcrt; extern int unix_lib; extern int safe_seh; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a2ada71ae36..8d05b91ec9b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1581,8 +1581,8 @@ void output_static_lib( const char *output_name, struct strarray files, int crea } } -/* create a Windows-style import library */ -static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +/* create a Windows-style import library using dlltool */ +static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { struct strarray args; char *def_file; @@ -1627,6 +1627,13 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc if (files.count) output_static_lib( output_file_name, files, 0 ); } +/* create a Windows-style import library */ +static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) +{ + if (verbose) fprintf( stderr, "Not implemented, falling back to dlltool.\n" ); + build_dlltool_import_lib( output_file_name, spec, files ); +} + /* create a Unix-style import library */ static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) { @@ -1689,5 +1696,6 @@ static void build_unix_import_lib( DLLSPEC *spec, struct strarray files ) void output_import_lib( DLLSPEC *spec, struct strarray files ) { if (!is_pe()) build_unix_import_lib( spec, files ); + else if (use_dlltool) build_dlltool_import_lib( output_file_name, spec, files ); else build_windows_import_lib( output_file_name, spec, files ); } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index cbe1e4669c1..01ceba9e516 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -42,6 +42,7 @@ int verbose = 0; int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; +int use_dlltool = 1; int use_msvcrt = 0; int unix_lib = 0; int safe_seh = 0; @@ -233,6 +234,7 @@ static const char usage_str[] = " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" " -w, --warnings Turn on warnings\n" +" --without-dlltool Generate import library without using dlltool\n" "\nMode options:\n" " --dll Build a library from a .spec file and object files\n" " --def Build a .def file from a .spec file\n" @@ -268,7 +270,8 @@ enum long_options_values LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, LONG_OPT_SYSCALL_TABLE, - LONG_OPT_VERSION + LONG_OPT_VERSION, + LONG_OPT_WITHOUT_DLLTOOL, }; static const char short_options[] = "B:C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; @@ -300,6 +303,7 @@ static const struct long_option long_options[] = { "subsystem", 1, LONG_OPT_SUBSYSTEM }, { "syscall-table", 1, LONG_OPT_SYSCALL_TABLE }, { "version", 0, LONG_OPT_VERSION }, + { "without-dlltool", 0, LONG_OPT_WITHOUT_DLLTOOL }, /* aliases for short options */ { "target", 1, 'b' }, { "delay-lib", 1, 'd' }, @@ -531,6 +535,9 @@ static void option_callback( int optc, char *optarg ) case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); + case LONG_OPT_WITHOUT_DLLTOOL: + use_dlltool = 0; + break; case '?': fprintf( stderr, "winebuild: %s\n\n", optarg ); usage(1); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2637b5beb5f..7f93a5befdc 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -279,6 +279,9 @@ Display the program version and exit. .TP .B \-w, --warnings Turn on warnings. +.TP +.B \--without-dlltool +Generate import library without using dlltool. .SH "SPEC FILE SYNTAX" .SS "General syntax" A spec file should contain a list of ordinal declarations. The general

1 0

Rémi Bernon : winebuild: Implement import lib generation without dlltool.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 103eb831564decc9812239f454ed1cc40714c0a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/103eb831564decc9812239f454ed1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 12 11:57:26 2022 +0200 winebuild: Implement import lib generation without dlltool. --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++- tools/winebuild/utils.c | 2 +- 3 files changed, 165 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index accfa9a47dd..a7ef23b199e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -273,6 +273,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); +extern const char *get_abi_name( const ORDDEF *odp, const char *name ); extern const char *get_link_name( const ORDDEF *odp ); extern int sort_func_list( ORDDEF **list, int count, int (*compare)(const void *, const void *) ); extern unsigned int get_alignment(unsigned int align); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8d05b91ec9b..35165f2b51e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1630,8 +1630,169 @@ static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struc /* create a Windows-style import library */ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { - if (verbose) fprintf( stderr, "Not implemented, falling back to dlltool.\n" ); - build_dlltool_import_lib( output_file_name, spec, files ); + char *dll_name, *import_desc, *import_name; + struct strarray objs = empty_strarray; + int i, total, by_name; + const char *name; + + if (strendswith( lib_name, ".delay.a" )) + { + if (verbose) fprintf( stderr, "Not implemented, falling back to dlltool.\n" ); + build_dlltool_import_lib( output_file_name, spec, files ); + return; + } + + /* make sure assemble_files doesn't strip suffixes */ + dll_name = encode_dll_name( spec->file_name ); + for (i = 0; i < strlen( dll_name ); ++i) if (dll_name[i] == '.') dll_name[i] = '_'; + + import_desc = strmake( "__wine_import_%s_desc", dll_name ); + import_name = strmake( "__wine_import_%s_name", dll_name ); + + new_output_as_file(); + + output( "\n\t.section \".idata$2\"\n" ); + output( "%s\n", asm_globl( import_desc ) ); + output_rva( ".L__wine_import_names" ); /* OriginalFirstThunk */ + output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long 0\n" ); /* ForwarderChain */ + output_rva( "%s", asm_name( import_name ) ); /* Name */ + output_rva( ".L__wine_import_addrs" ); /* FirstThunk */ + + output( "\n\t.section \".idata$4\"\n" ); + output( ".L__wine_import_names:\n" ); /* OriginalFirstThunk head */ + + output( "\n\t.section \".idata$5\"\n" ); + output( ".L__wine_import_addrs:\n" ); /* FirstThunk head */ + + /* _head suffix to keep this object sections first */ + assemble_files( strmake( "%s_head", dll_name ) ); + strarray_addall( &objs, as_files ); + as_files = empty_strarray; + + new_output_as_file(); + + output( "\n\t.section \".idata$4\"\n" ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* OriginalFirstThunk tail */ + output( "\n\t.section \".idata$5\"\n" ); + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* FirstThunk tail */ + output( "\n\t.section \".idata$7\"\n" ); + output( "%s\n", asm_globl( import_name ) ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); + + /* _tail suffix to keep this object sections last */ + assemble_files( strmake( "%s_tail", dll_name ) ); + strarray_addall( &objs, as_files ); + as_files = empty_strarray; + + for (i = total = 0; i < spec->nb_entry_points; i++) + { + const ORDDEF *odp = &spec->entry_points[i]; + const char *abi_name; + char *imp_name; + + if (odp->name) name = odp->name; + else if (odp->export_name) name = odp->export_name; + else continue; + + if (odp->flags & FLAG_PRIVATE) continue; + total++; + + /* C++ mangled names cannot be imported */ + if (strpbrk( name, "?@" )) continue; + + switch (odp->type) + { + case TYPE_VARARGS: + case TYPE_CDECL: + case TYPE_STDCALL: + by_name = odp->name && !(odp->flags & FLAG_ORDINAL); + abi_name = get_abi_name( odp, name ); + imp_name = strmake( "%s_imp_%s", target.cpu != CPU_i386 ? "_" : "", + asm_name( abi_name ) ); + + new_output_as_file(); + + output( "\n\t.text\n" ); + output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); + output( "%s\n", asm_globl( abi_name ) ); + output( "\t%s\n", func_declaration( abi_name ) ); + + switch (target.cpu) + { + case CPU_i386: + output( "\tjmp *%s\n", asm_name( imp_name ) ); + break; + case CPU_x86_64: + output( "\tjmp *%s(%%rip)\n", asm_name( imp_name ) ); + break; + case CPU_ARM: + output( "\tldr IP, 1f\n" ); + output( "\tldr PC, [IP]\n" ); + output( "1:\t.long %s\n", asm_name( imp_name ) ); + break; + case CPU_ARM64: + output( "\tadrp x16, %s\n", arm64_page( asm_name( imp_name ) ) ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff( asm_name( imp_name ) ) ); + output( "\tbr x16\n" ); + break; + } + + output( "\n\t.section \".idata$4\"\n" ); + if (by_name) + { + output_rva( ".L__wine_import_name" ); + if (get_ptr_size() == 8) output( "\t.long 0\n" ); + } + else + { + if (get_ptr_size() == 4) output( "\t.long 0x8000%04x\n", odp->ordinal ); + else output( "\t.quad 0x800000000000%04x\n", odp->ordinal ); + } + + output( "\n\t.section \".idata$5\"\n" ); + output( "%s\n", asm_globl( imp_name ) ); + if (by_name) + { + output_rva( ".L__wine_import_name" ); + if (get_ptr_size() == 8) output( "\t.long 0\n" ); + } + else + { + if (get_ptr_size() == 4) output( "\t.long 0x8000%04x\n", odp->ordinal ); + else output( "\t.quad 0x800000000000%04x\n", odp->ordinal ); + } + + if (by_name) + { + output( "\n\t.section \".idata$6\"\n" ); + output( ".L__wine_import_name:\n" ); + output( "\t.short %d\n", odp->ordinal ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), name ); + } + + /* reference head object to always pull its sections */ + output( "\n\t.section \".idata$7\"\n" ); + output_rva( "%s", asm_name( import_desc ) ); + + free( imp_name ); + break; + + default: + break; + } + } + + /* _syms suffix to keep these objects sections in between _head and _tail */ + assemble_files( strmake( "%s_syms", dll_name ) ); + strarray_addall( &objs, as_files ); + as_files = objs; + + free( import_desc ); + free( import_name ); + free( dll_name ); + + output_static_lib( output_file_name, files, 1 ); } /* create a Unix-style import library */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 2148dc58a95..7f10939da36 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -728,7 +728,7 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) } /* return the stdcall-decorated name for an entry point */ -static const char *get_abi_name( const ORDDEF *odp, const char *name ) +const char *get_abi_name( const ORDDEF *odp, const char *name ) { static char *buffer; char *ret;

1 0

Rémi Bernon : winebuild: Enable unwind tables by default in PE files.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 244e8fd3574298e43d219ea4bd663067953fdae3 URL: https://gitlab.winehq.org/wine/wine/-/commit/244e8fd3574298e43d219ea4bd6630… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 4 19:17:01 2022 +0100 winebuild: Enable unwind tables by default in PE files. Making sure it also emits .cfi and .seh directives and generates unwind tables for the delay import thunks. --- tools/winebuild/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 01ceba9e516..77339b2b4e7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -176,6 +176,7 @@ static void set_target( const char *name ) if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); if (target.cpu == CPU_ARM && is_pe()) thumb_mode = 1; + if (is_pe()) unwind_tables = 1; } /* cleanup on program exit */ @@ -623,6 +624,7 @@ int main(int argc, char **argv) target = init_argv0_target( argv[0] ); if (target.platform == PLATFORM_CYGWIN) target.platform = PLATFORM_MINGW; + if (is_pe()) unwind_tables = 1; files = parse_options( argc, argv, short_options, long_options, 0, option_callback );

1 0

Rémi Bernon : winebuild: Implement delay import lib generation without dlltool.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 6b9773529c2619ee9b82de6de996a0845ae518a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9773529c2619ee9b82de6de996a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 6 09:54:48 2022 +0100 winebuild: Implement delay import lib generation without dlltool. --- tools/winebuild/import.c | 176 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 156 insertions(+), 20 deletions(-)

1 0