November 2022 - Wine-Commits

Rémi Bernon : opengl32: Cast wow64 pointers in glGet(VertexAttrib)Pointerv.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 7443db1ce9ad4ec53ba72a404e8d8e4958b07af1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7443db1ce9ad4ec53ba72a404e8d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 21 09:07:11 2022 +0100 opengl32: Cast wow64 pointers in glGet(VertexAttrib)Pointerv. They are byte offsets in the buffers data. --- dlls/opengl32/make_opengl | 20 ++++++++++++++++++-- dlls/opengl32/unix_thunks.c | 24 ++++++++++++++++-------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 43199f56981..bc1a2422185 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -244,6 +244,13 @@ my %pointer_array_count = "glDrawCommandsStatesNV" => "count", "glListDrawCommandsStatesClientNV" => "count", ); +my %pointer_is_offset = + ( + "glGetPointerv" => "params", + "glGetPointervEXT" => "params", + "glGetVertexAttribPointerv" => "pointer", + "glGetVertexAttribPointervARB" => "pointer", + ); # # Used to convert some types @@ -429,7 +436,8 @@ sub generate_wow64_thunk($$$) my $ptype = get_wow64_arg_type( $arg ); my $pname = get_arg_name( $arg ); $ret .= " $ptype $pname;\n"; - $need_manual_thunk = 1 if ($arg->textContent() =~ /(\*.*\*|\[)/ || $arg->textContent() =~ /(sizei|int)ptr.*\*/) && !defined $pointer_array_count{$_}; + $need_manual_thunk = 1 if $arg->textContent() =~ /(\*.*\*|\[|(sizei|int)ptr.*\*)/ && + !defined $pointer_array_count{$_} && !defined $pointer_is_offset{$_}; } if (!is_void_func($func)) { @@ -441,7 +449,7 @@ sub generate_wow64_thunk($$$) $ret .= " {\n"; foreach my $arg (@{$func->[1]}) { - next if $arg->textContent() =~ /(\*.*\*|\[)/ || $arg->textContent() =~ /(sizei|int)ptr.*\*/; + next if $arg->textContent() =~ /(\*.*\*|\[|(sizei|int)ptr.*\*)/; my $ptype = get_arg_type( $arg ); my $pname = get_arg_name( $arg ); if ($arg->textContent() =~ /(sizei|int)ptr/) @@ -493,6 +501,14 @@ sub generate_wow64_thunk($$$) $ret .= " free( (void *)params.$pname );\n"; } + foreach my $arg (@{$func->[1]}) + { + next unless defined $pointer_is_offset{$_}; + my $pname = get_arg_name( $arg ); + next unless $pname =~ $pointer_is_offset{$_}; + $ret .= " params32->$pname = PtrToUlong( params.$pname );\n"; + } + $ret .= " return status;\n"; $ret .= "}\n\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 1ba8fc3bf2f..820b6e3415d 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -28170,8 +28170,10 @@ static NTSTATUS wow64_gl_glGetPointerv( void *args ) { .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = gl_glGetPointerv( &params ); + params32->params = PtrToUlong( params.params ); + return status; } static NTSTATUS wow64_gl_glGetPolygonStipple( void *args ) @@ -39693,8 +39695,10 @@ static NTSTATUS wow64_ext_glGetPointervEXT( void *args ) { .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetPointervEXT( &params ); + params32->params = PtrToUlong( params.params ); + return status; } static NTSTATUS wow64_ext_glGetProgramBinary( void *args ) @@ -42563,8 +42567,10 @@ static NTSTATUS wow64_ext_glGetVertexAttribPointerv( void *args ) .index = params32->index, .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetVertexAttribPointerv( &params ); + params32->pointer = PtrToUlong( params.pointer ); + return status; } static NTSTATUS wow64_ext_glGetVertexAttribPointervARB( void *args ) @@ -42580,8 +42586,10 @@ static NTSTATUS wow64_ext_glGetVertexAttribPointervARB( void *args ) .index = params32->index, .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetVertexAttribPointervARB( &params ); + params32->pointer = PtrToUlong( params.pointer ); + return status; } static NTSTATUS wow64_ext_glGetVertexAttribPointervNV( void *args )

1 0

Rémi Bernon : opengl32: Use the +opengl debug channel everywhere.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 93dcfef00b3d2941df16ecf41ebd9ed37c931479 URL: https://gitlab.winehq.org/wine/wine/-/commit/93dcfef00b3d2941df16ecf41ebd9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 09:29:01 2022 +0100 opengl32: Use the +opengl debug channel everywhere. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_thunks.c | 2 +- dlls/opengl32/unix_wgl.c | 2 +- dlls/opengl32/wgl.c | 15 ++++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index bc1a2422185..5654ddfa824 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1142,7 +1142,7 @@ print OUT "#include \"unix_private.h\"\n\n"; print OUT "#include \"wine/debug.h\"\n\n"; print OUT "#ifdef _WIN64\n"; -print OUT "WINE_DEFAULT_DEBUG_CHANNEL(wgl);\n"; +print OUT "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n"; print OUT "#endif\n\n"; print OUT "extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN;\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 820b6e3415d..f07b0c2f775 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -19,7 +19,7 @@ #include "wine/debug.h" #ifdef _WIN64 -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); #endif extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index cc3c6a47e1d..b0874af546e 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -41,7 +41,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); static pthread_mutex_t wgl_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 2ffdc20c057..27efa6df745 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -36,7 +36,7 @@ #include "wine/glu.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DECLARE_DEBUG_CHANNEL(fps); unixlib_handle_t unixlib_handle = 0; @@ -120,11 +120,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) int i, count, best_format; int bestDBuffer = -1, bestStereo = -1; - TRACE_(wgl)( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u " - "accum %u depth %u stencil %u aux %u\n", - hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, - ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, - ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); + TRACE( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u " + "accum %u depth %u stencil %u aux %u\n", + hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, + ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, + ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); count = wglDescribePixelFormat( hdc, 0, 0, NULL ); if (!count) return 0; @@ -486,7 +486,8 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l if (!ret) break; } - if (TRACE_ON(wgl)) { + if (TRACE_ON(opengl)) + { unsigned int bitmask; unsigned char *bitmap_ = bitmap;

1 0

Alex Henrie : adsldp: Use standard C functions for memory allocation in adsldp.c.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 9d7e045c78d29d52a6a953186d6187112dd2ec8b URL: https://gitlab.winehq.org/wine/wine/-/commit/9d7e045c78d29d52a6a953186d6187… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 18:45:45 2022 -0700 adsldp: Use standard C functions for memory allocation in adsldp.c. --- dlls/adsldp/adsldp.c | 66 ++++++++++++++++++++++---------------------- dlls/adsldp/adsldp_private.h | 8 ------ 2 files changed, 33 insertions(+), 41 deletions(-)

1 0

Rémi Bernon : opengl32: Implement wow64 thunks for glMapBuffer (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 09652f121c38e844a8a4e2590dfcd11b0d33df85 URL: https://gitlab.winehq.org/wine/wine/-/commit/09652f121c38e844a8a4e2590dfcd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 09:41:19 2022 +0100 opengl32: Implement wow64 thunks for glMapBuffer (et al.). --- dlls/opengl32/make_opengl | 15 ++ dlls/opengl32/unix_thunks.c | 252 +++++--------------------------- dlls/opengl32/unix_wgl.c | 346 ++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 79 ++++++++++ 4 files changed, 474 insertions(+), 218 deletions(-)

1 0

Gerald Pfeifer : msado15: Avoid uninitialized variable warning in fields_get_Item.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 66f6cc59651721e501efd821939e56887fbb4ce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66f6cc59651721e501efd821939e56… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 20 09:25:32 2022 +0000 msado15: Avoid uninitialized variable warning in fields_get_Item. This avoids the following warning by GCC 13: dlls/msado15/recordset.c:790:32: warning: 'i' may be used uninitialized --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 177938af2f7..aa2db6e2968 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -781,7 +781,7 @@ static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj { struct fields *fields = impl_from_Fields( iface ); HRESULT hr; - ULONG i; + ULONG i = 0; TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj );

1 0

Mohamad Al-Jaf : windows.media: Stub IClosedCaptionPropertiesStatics interface.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: c0913c34eafa8f05c40c0ee526e351190ad77557 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0913c34eafa8f05c40c0ee526e351… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:51:57 2022 -0500 windows.media: Stub IClosedCaptionPropertiesStatics interface. Needed by Chromium-based browsers. --- dlls/windows.media/captions.c | 107 ++++++++++++++++++++++++++++++++++++ dlls/windows.media/private.h | 40 ++++++++++++++ dlls/windows.media/tests/captions.c | 11 ++++ 3 files changed, 158 insertions(+)

1 0

Mohamad Al-Jaf : windows.media: Add stub DLL.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: e0aca838c88f38e02d696a116d4f5bb460b7ca5e URL: https://gitlab.winehq.org/wine/wine/-/commit/e0aca838c88f38e02d696a116d4f5b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:31:20 2022 -0500 windows.media: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.media/Makefile.in | 9 +++ dlls/windows.media/captions.c | 125 ++++++++++++++++++++++++++++++++++ dlls/windows.media/classes.idl | 23 +++++++ dlls/windows.media/main.c | 46 +++++++++++++ dlls/windows.media/private.h | 42 ++++++++++++ dlls/windows.media/tests/Makefile.in | 5 ++ dlls/windows.media/tests/captions.c | 83 ++++++++++++++++++++++ dlls/windows.media/windows.media.spec | 3 + 10 files changed, 341 insertions(+)

1 0

Rémi Bernon : opengl32: Use manual win32 thunks for glMapBuffer (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 50ab0f8f7123fa82ce7268cbe26303dec4f76680 URL: https://gitlab.winehq.org/wine/wine/-/commit/50ab0f8f7123fa82ce7268cbe26303… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 16:34:20 2022 +0100 opengl32: Use manual win32 thunks for glMapBuffer (et al.). --- dlls/opengl32/make_opengl | 11 +++++ dlls/opengl32/thunks.c | 110 +++++------------------------------------ dlls/opengl32/wgl.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 99 deletions(-)

1 0

Rémi Bernon : opengl32: Implement wow64 thunk for glGetString (et al.).
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 17abb6f4e700b6c66c59bbc5334b66c116452e9a URL: https://gitlab.winehq.org/wine/wine/-/commit/17abb6f4e700b6c66c59bbc5334b66… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 07:22:14 2022 +0100 opengl32: Implement wow64 thunk for glGetString (et al.). This is a bit tricky because the strings are supposed to be static, but we also cannot return the unix strings directly either. So instead we keep track, on the unix side, of known unix / wow64 string associations, and return the known wow64 string if the unix string was already requested before. If the string wasn't found, the syscall returns STATUS_BUFFER_TOO_SMALL, and the PE side allocates the required memory, calling the syscall once again with the wow64 string pointer to copy the string to. On concurrent calls, the syscall may return a different wow64 string, in which case the PE side uses it instead and frees the one it allocated. Lastly, the PE side also keeps record of wow64 strings it had allocated, so that we can free them on process detach. The unix side also does some cleanup of its mapping buffer, as there's no guarantee that it will be completely unloaded. --- dlls/opengl32/make_opengl | 18 ++++ dlls/opengl32/thunks.c | 59 ++----------- dlls/opengl32/unix_thunks.c | 112 +++--------------------- dlls/opengl32/unix_wgl.c | 207 ++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/unixlib.h | 1 + dlls/opengl32/wgl.c | 192 +++++++++++++++++++++++++++++++++++++++- 6 files changed, 436 insertions(+), 153 deletions(-)

1 0

Mohamad Al-Jaf : include/windowscontracts: Bump contractversion to 14.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: efcaa605f7b491eae464a2116affc8f9cdbb4dca URL: https://gitlab.winehq.org/wine/wine/-/commit/efcaa605f7b491eae464a2116affc8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 12 19:45:48 2022 -0500 include/windowscontracts: Bump contractversion to 14. --- include/windowscontracts.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/windowscontracts.idl b/include/windowscontracts.idl index 6bcf80ac954..5bcae48a5b5 100644 --- a/include/windowscontracts.idl +++ b/include/windowscontracts.idl @@ -26,7 +26,7 @@ namespace Windows { apicontract FoundationContract {}; - [contractversion(10)] + [contractversion(14)] apicontract UniversalApiContract {}; }

1 0