wine-devel

wine-devel@winehq.org

4 participants
84402 discussions

[PATCH 1/7] quartz/tests: Add tests for MPEG audio decoder sink allocator.
by Anton Baskanov 02 May '22

02 May '22

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index ae098dba355..1983828beb0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -880,6 +880,56 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); } +static void test_sink_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props, ret_props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!props.cBuffers, "Got %ld buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %ld.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 1; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(req_allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); @@ -995,6 +1045,8 @@ static void test_connect_pin(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + test_sink_allocator(meminput); + IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source); -- 2.34.1

2 11

[PATCH] mshtml: Added IHTMLCSSStyleDeclaration::backgroundSize property implementation.
by Hans Leidekker 02 May '22

02 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 11a66369c39..44ac21c5f97 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -181,6 +181,11 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_BACKGROUNDREPEAT, 0, background_repeat_values }, + { + L"background-size", + DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDSIZE, + DISPID_A_IE9_BACKGROUNDSIZE, + }, { L"border", DISPID_IHTMLCSSSTYLEDECLARATION_BORDER, @@ -7628,15 +7633,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundOrigin(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BACKGROUND_SIZE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundSize(IHTMLCSSStyleDeclaration *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BACKGROUND_SIZE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_boxShadow(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 25f87c802b2..e14c1274360 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -55,6 +55,7 @@ typedef enum { STYLEID_BACKGROUND_POSITION_X, STYLEID_BACKGROUND_POSITION_Y, STYLEID_BACKGROUND_REPEAT, + STYLEID_BACKGROUND_SIZE, STYLEID_BORDER, STYLEID_BORDER_BOTTOM, STYLEID_BORDER_BOTTOM_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bc9afda7617..4b72d144354 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -793,6 +793,22 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ok(!lstrcmpW(str, L"border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = (BSTR)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"100% 100%"); + hres = IHTMLCSSStyleDeclaration_put_backgroundSize(css_style, str); + ok(hres == S_OK, "put_backgroundSize failed: %08lx\n", hres); + SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_backgroundSize(css_style, &str); + ok(hres == S_OK, "get_backgroundSize failed: %08lx\n", hres); + ok(!lstrcmpW(str, L"100% 100%"), "backgroundSize = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, NULL); -- 2.30.2

2 1

[PATCH 0/2] MR17: programs/cmd: test that read is successful before using its result
by eric pouech (＠epo) 02 May '22

02 May '22

There are cases where the read can fail (not attached to a console, input stream mapped to /dev/null...) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/17

3 3

[PATCH 1/3] dwrite/opentype: Correct flags field size for layout lookup structure.
by Nikolay Sivov 02 May '22

02 May '22

Higher 16 bits are used for mark filtering set index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7df0d207bc6..7df153e681d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3619,10 +3619,10 @@ struct lookup { unsigned short index; unsigned short type; - unsigned short flags; unsigned short subtable_count; unsigned int mask; + unsigned int flags; unsigned int offset; unsigned int auto_zwnj : 1; unsigned int auto_zwj : 1; @@ -4542,9 +4542,9 @@ static int __cdecl lookups_sorting_compare(const void *a, const void *b) static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index, const struct shaping_feature *feature, struct lookup *lookup) { - unsigned short subtable_count, lookup_type, flags, mark_filtering_set; + unsigned short subtable_count, lookup_type, mark_filtering_set; const struct ot_lookup_table *lookup_table; - unsigned int offset; + unsigned int offset, flags; if (!(offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])))) -- 2.35.1

1 2

[PATCH v2 1/2] iphlpapi: Correctly include tcpestats.h.
by Mohamad Al-Jaf 02 May '22

02 May '22

This is needed to add prototypes with TCP_ESTATS_TYPE argument types. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is how it is in the Windows SDK file. --- dlls/iphlpapi/iphlpapi_main.c | 1 - include/iphlpapi.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0bd7cdc06c8..e002e12e2fd 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -32,7 +32,6 @@ #include "fltdefs.h" #include "ifdef.h" #include "netioapi.h" -#include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" #include "icmpapi.h" diff --git a/include/iphlpapi.h b/include/iphlpapi.h index da5819c8423..4e156913426 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -25,6 +25,7 @@ extern "C" { #include <iprtrmib.h> #include <ipexport.h> #include <iptypes.h> +#include <tcpestats.h> #define NET_STRING_IPV4_ADDRESS 0x00000001 #define NET_STRING_IPV4_SERVICE 0x00000002 -- 2.36.0

3 6

[PATCH] netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in
by Drew Ronneberg 01 May '22

01 May '22

_SVRAPI_ is no longer used in the Wine source code. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> --- dlls/netapi32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..cb0ea5168b5 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32 -- 2.25.1

1 6

[PATCH 0/4] MR9: ntdll: Implement __fastfail().
by Jinoh Kang (＠iamahuman) 30 Apr '22

30 Apr '22

__fastfail() is used by the Visual C++ runtime and Windows system libraries to signal that the in-process state is corrupted and unrecoverable. If __fastfail() is invoked, the NT kernel raises a second-chance non-continuable exception STATUS_STACK_BUFFER_OVERRUN. This quickly terminates the process, bypassing all in-process exception handlers (since they all rely on the potentially corrupted process state). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9

3 5

[PATCH v3 0/9] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) 30 Apr '22

30 Apr '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- v3: loader: Switch stack if the old stack address is in reserved range. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Relocate vDSO on conflict with reserved ranges. loader: Fix return type of get_auxiliary(). loader: Don't clobber existing memory mappings when reserving addresses. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Refactor number parsing to own function. loader: Refactor argv/envp/auxv management. https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 9

[PATCH] msadpm: Stop decoding instead of crashing for invalid adpcm
by Moore, Brandon A. 30 Apr '22

30 Apr '22

2 1

[PATCH] msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Moore, Brandon A. 30 Apr '22

30 Apr '22

Apply the same patch from 72528be84fdc for adpcm data sent to mono destinations in addition to stereo destinations. Signed-off-by: Brandon Moore <moore.3071(a)osu.edu> --- dlls/msadp32.acm/msadp32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 2dc11b9239a..a68b13d58f6 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -319,7 +319,14 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Lord of the Rings War of the Ring where it + * passes invalid data. */ + if (*src > 6 || *(src + 1) > 6) + { + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeff = MSADPCM_CoeffSet[*src++]; idelta = R16(src); src += 2; -- 2.35.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel