November 2022 - Wine-commits

Anton Baskanov : winegstreamer: Set allocator properties for MPEG layer-3 decoder source.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: c3cca0d206660b016803ecace9f205daa4ab9c5c URL: https://gitlab.winehq.org/wine/wine/-/commit/c3cca0d206660b016803ecace9f205… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Oct 2 23:37:20 2022 +0700 winegstreamer: Set allocator properties for MPEG layer-3 decoder source. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18773 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpeglayer3.c | 14 +++++++------- dlls/winegstreamer/quartz_transform.c | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c index c0972e24655..bb55d18c918 100644 --- a/dlls/quartz/tests/mpeglayer3.c +++ b/dlls/quartz/tests/mpeglayer3.c @@ -921,9 +921,9 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, ok(hr == S_OK, "Got hr %#lx.\n", hr); /* Earlier versions used 16 buffers of lSampleSize bytes, * later versions use 8 buffers of lSampleSize * 4 bytes. */ - todo_wine ok(props.cBuffers == 16 || props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); - todo_wine ok(props.cbBuffer == 2222 || props.cbBuffer == 8888, "Got size %ld.\n", props.cbBuffer); - todo_wine ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(props.cBuffers == 16 || props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 2222 || props.cbBuffer == 8888, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); @@ -933,7 +933,7 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) IMediaSample_Release(sample); @@ -963,9 +963,9 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, ok(hr == S_OK, "Got hr %#lx.\n", hr); /* Earlier versions used 16 buffers of lSampleSize bytes, * later versions use 8 buffers of lSampleSize * 4 bytes. */ - todo_wine ok(props.cBuffers == 16 || props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); - todo_wine ok(props.cbBuffer == 2222 || props.cbBuffer == 8888, "Got size %ld.\n", props.cbBuffer); - todo_wine ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(props.cBuffers == 16 || props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 2222 || props.cbBuffer == 8888, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); IFilterGraph2_Disconnect(graph, source); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index c74938da082..6520f697ce4 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -803,7 +803,13 @@ static HRESULT mpeg_layer3_decoder_source_get_media_type(struct transform *filte static HRESULT mpeg_layer3_decoder_source_decide_buffer_size(struct transform *filter, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { - return S_OK; + ALLOCATOR_PROPERTIES ret_props; + + props->cBuffers = max(props->cBuffers, 8); + props->cbBuffer = max(props->cbBuffer, filter->source.pin.mt.lSampleSize * 4); + props->cbAlign = max(props->cbAlign, 1); + + return IMemAllocator_SetProperties(allocator, props, &ret_props); } static const struct transform_ops mpeg_layer3_decoder_transform_ops =

1 0

Rémi Bernon : kernel32: Validate pointer before calling HeapSize.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: d918919de02a2b0b9749ebae2a9d650265b104d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d918919de02a2b0b9749ebae2a9d65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 12 14:27:17 2022 +0100 kernel32: Validate pointer before calling HeapSize. --- dlls/kernel32/heap.c | 3 ++- dlls/kernel32/tests/heap.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5f7f950d23d..d433a703d16 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -385,7 +385,8 @@ SIZE_T WINAPI LocalSize( HLOCAL handle ) TRACE_(globalmem)( "handle %p\n", handle ); RtlLockHeap( heap ); - if ((ptr = unsafe_ptr_from_HLOCAL( handle ))) + if ((ptr = unsafe_ptr_from_HLOCAL( handle )) && + HeapValidate( heap, HEAP_NO_SERIALIZE, ptr )) ret = HeapSize( heap, HEAP_NO_SERIALIZE, ptr ); else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 46256493913..3e861f52248 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1623,7 +1623,6 @@ static void test_GlobalAlloc(void) SetLastError( 0xdeadbeef ); size = GlobalSize( invalid_ptr ); ok( size == 0, "GlobalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = GlobalLock( invalid_ptr ); @@ -2014,7 +2013,6 @@ static void test_LocalAlloc(void) SetLastError( 0xdeadbeef ); size = LocalSize( invalid_ptr ); ok( size == 0, "LocalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = LocalLock( invalid_ptr );

1 0

Paul Gofman : ws2_32: Return success for setting SO_ERROR.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: wine Branch: master Commit: 5925a2eeb002d899a1a2ff9966faedf4dd10ca25 URL: https://gitlab.winehq.org/wine/wine/-/commit/5925a2eeb002d899a1a2ff9966faed… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 14 16:00:50 2022 -0600 ws2_32: Return success for setting SO_ERROR. --- dlls/ws2_32/socket.c | 6 +++--- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09684f25b25..115451c3b58 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3173,9 +3173,9 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int } case SO_ERROR: - FIXME( "SO_ERROR, stub!\n" ); - SetLastError( WSAENOPROTOOPT ); - return -1; + FIXME( "SO_ERROR, stub.\n" ); + SetLastError( ERROR_SUCCESS ); + return 0; case SO_KEEPALIVE: if (optlen <= 0 || !optval) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4d92b58c41..bcccaef9bc6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1431,7 +1431,6 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); - todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError());

1 0

Francois Gouget : winetest: Add support for Windows 10 22H2.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: tools Branch: master Commit: d4b0afd8fcb6d538b6dc82ca3012de6d00da4ffe URL: https://gitlab.winehq.org/winehq/tools/-/commit/d4b0afd8fcb6d538b6dc82ca301… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 15 11:46:42 2022 +0100 winetest: Add support for Windows 10 22H2. --- winetest/build-patterns | 1 + winetest/dissect | 1 + winetest/winetest.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a975c35c..14b1917c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -429,6 +429,7 @@ my %platform_order = ( win1909 => 10.1909, win2004 => 10.2004, win2009 => 10.2009, win21H1 => 10.2101, win21H2 => 10.2107, + win22H2 => 10.2207, win10 => 10.2100, # for backward compatibility w1121H2 => 11.2110, w1122H2 => 11.2210, wine => 90.0, linux => 90.1, mac => 90.2, diff --git a/winetest/dissect b/winetest/dissect index ceef81a1..3d666ef5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win2009", 2, 10, 0, 19042, 1, 0 ], [ "win21H1", 2, 10, 0, 19043, 1, 0 ], [ "win21H2", 2, 10, 0, 19044, 1, 0 ], + [ "win22H2", 2, 10, 0, 19045, 1, 0 ], [ "w1121H2", 2, 10, 0, 22000, 1, 0 ], [ "w1122H2", 2, 10, 0, 22621, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], diff --git a/winetest/winetest.conf b/winetest/winetest.conf index d9e6c359..29eb1a13 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -48,7 +48,7 @@ $fixed_threshold = 0.99; { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909", "win2004" ] }, - { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility + { name => "Win10", ids => [ "win2009", "win21H2", "win22H2", "win10" ] }, # win10 for backward compatibility { name => "Win10L", ids => [ "win21H1" ] }, { name => "Win11", ids => [ "w1121H2", "w1122H2" ] }, { name => "Other", ids => [ "unknown" ] },

1 0

Alexandre Julliard : packaging: Add Fedora 37.
by Alexandre Julliard 15 Nov '22

15 Nov '22

Module: tools Branch: master Commit: c52c2595529a0e32bafa18e5029f8fabc0127890 URL: https://gitlab.winehq.org/winehq/tools/-/commit/c52c2595529a0e32bafa18e5029… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 14 20:18:45 2022 +0100 packaging: Add Fedora 37. --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 99b00605..722a8659 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="35 36 bullseye bookworm bionic focal jammy kinetic" +distros="35 36 37 bullseye bookworm bionic focal jammy kinetic" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index ef253a5d..0c565b8b 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/35 + /fedora/36 ++ /fedora/37 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index b9340f36..a75b7960 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-36] name = Fedora 36 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-37] +name = Fedora 37 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_37

1 0

Rémi Bernon : user32: Add GetPointerTouchInfo(History) stubs.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 8818fff766590d9150bf01076109634a86f27751 URL: https://gitlab.winehq.org/wine/wine/-/commit/8818fff766590d9150bf0107610963… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 16:05:46 2022 +0200 user32: Add GetPointerTouchInfo(History) stubs. Preventing Bloons TD 6 from crashing on touchscreen input. --- dlls/user32/input.c | 14 ++++++++++++++ dlls/user32/user32.spec | 2 ++ 2 files changed, 16 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4bd5785ff9b..34e3a620cc5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -756,3 +756,17 @@ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count, SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL WINAPI GetPointerTouchInfo( UINT32 id, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, info %p stub!\n", id, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_INFO *info ) +{ + FIXME( "id %u, count %p, info %p stub!\n", id, count, info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 256e4c33e1c..88684c29506 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -360,6 +360,8 @@ @ stdcall GetPhysicalCursorPos(ptr) @ stdcall GetPointerDevices(ptr ptr) @ stdcall GetPointerType(long ptr) +@ stdcall GetPointerTouchInfo(long ptr) +@ stdcall GetPointerTouchInfoHistory(long ptr ptr) @ stdcall GetPriorityClipboardFormat(ptr long) NtUserGetPriorityClipboardFormat @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr)

1 0

Alex Henrie : include: Add wspiapi.h.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 6cf63877c5a8b1e090b222648213e6a3c15b0290 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cf63877c5a8b1e090b222648213e6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 23:04:48 2022 -0700 include: Add wspiapi.h. Needed to compile Tera Term. --- include/Makefile.in | 1 + include/wspiapi.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0fc34cbdf7c..62904d8d2a0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -931,6 +931,7 @@ SOURCES = \ wshisotp.h \ wsipx.h \ wsnwlink.h \ + wspiapi.h \ wtsapi32.h \ wtypes.idl \ wuapi.idl \ diff --git a/include/wspiapi.h b/include/wspiapi.h new file mode 100644 index 00000000000..7aa034e753a --- /dev/null +++ b/include/wspiapi.h @@ -0,0 +1,26 @@ +/* + * Copyright 2022 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WSPIAPI_H_ +#define _WSPIAPI_H_ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#endif /* _WSPIAPI_H_ */

1 0

Gabriel Ivăncescu : mshtml/tests: Implement IServiceProvider and few other interfaces needed for navigation.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 7359226ad1d4e56ffbd733de197cf7097d5619a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7359226ad1d4e56ffbd733de197cf7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:26 2022 +0200 mshtml/tests: Implement IServiceProvider and few other interfaces needed for navigation. This is to allow to test events and things related to navigating to a new page. Otherwise, native IE will open a new IE process with the destination. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 964 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 964 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Expose IEventTarget on HTMLDocumentObj and forward it to the doc node.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: cab7ce593575ef7534a4a96b7d553f9900a47e28 URL: https://gitlab.winehq.org/wine/wine/-/commit/cab7ce593575ef7534a4a96b7d553f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:26 2022 +0200 mshtml: Expose IEventTarget on HTMLDocumentObj and forward it to the doc node. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 55 ++++++++ dlls/mshtml/tests/doc_with_prop.html | 3 + dlls/mshtml/tests/doc_with_prop_ie9.html | 4 + dlls/mshtml/tests/events.c | 223 ++++++++++++++++++++++++++++--- dlls/mshtml/tests/rsrc.rc | 6 + 6 files changed, 275 insertions(+), 17 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Forward toString to the document node.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 0d1309b79bbb73eadb460a398a327c35a99bd9d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d1309b79bbb73eadb460a398a327c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:27 2022 +0200 mshtml: Forward toString to the document node. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/oleobj.c | 11 +---------- dlls/mshtml/tests/events.c | 7 +++++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e13335e6586..d46f684e62a 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -2384,16 +2384,7 @@ HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, put_onbeforeupdate, VARIANT) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, get_onbeforeupdate, VARIANT*) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, put_onerrorupdate, VARIANT) HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, get_onerrorupdate, VARIANT*) - -static HRESULT WINAPI DocObjHTMLDocument2_toString(IHTMLDocument2 *iface, BSTR *String) -{ - HTMLDocumentObj *This = impl_from_IHTMLDocument2(iface); - - TRACE("(%p)->(%p)\n", This, String); - - return dispex_to_string(&This->dispex, String); -} - +HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument2, toString, BSTR*) HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument2, createStyleSheet, BSTR,LONG,IHTMLStyleSheet**) static const IHTMLDocument2Vtbl DocObjHTMLDocument2Vtbl = { diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 511bc73315b..220312ea628 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2786,6 +2786,13 @@ static void test_doc_obj(IHTMLDocument2 *doc) CHECK_CALLED(docobj_onclick); } + bstr = NULL; + hres = IHTMLDocument2_toString(doc, &bstr); + ok(hres == S_OK, "toString failed: %08lx\n", hres); + todo_wine_if(document_mode >= 9) + ok(!wcscmp(bstr, (document_mode < 9 ? L"[object]" : L"[object Document]")), "toString returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + /* Navigate to a different document mode page, checking using the same doc obj. Test that it breaks COM rules, since IEventTarget is conditionally exposed. All the events registered on the old doc node are also removed. */

1 0