- Wine-Devel - list.winehq.org

[PATCH] mfplat: Add some more attributes for tracing.
by Nikolay Sivov Aug. 1, 2021

Aug. 1, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 3 +++ include/mftransform.idl | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bcad90c29da..7fd713261fc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1687,6 +1687,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE), X(MF_MT_MAJOR_TYPE), + X(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_IN_BAND_PARAMETER_SET), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), @@ -1717,6 +1718,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_READER_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE), X(MF_MT_H264_USAGE), X(MF_MEDIA_ENGINE_EME_CALLBACK), X(MF_EVENT_SOURCE_FAKE_START), @@ -1775,6 +1777,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), X(MF_MEDIA_ENGINE_COMPATIBILITY_MODE), + X(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_MT_AVG_BIT_ERROR_RATE), X(MF_MT_VIDEO_PRIMARIES), diff --git a/include/mftransform.idl b/include/mftransform.idl index e49c7200185..0dd83a70f7d 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -208,6 +208,9 @@ cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED, 0x7b8f32c3, 0x6d96, 0x4 cpp_quote("EXTERN_GUID(MF_SA_D3D11_SHARED_WITHOUT_MUTEX, 0x39dbd44d, 0x2e44, 0x4931, 0xa4, 0xc8, 0x35, 0x2d, 0x3d, 0xc4, 0x21, 0x15);") cpp_quote("EXTERN_GUID(MF_SA_D3D11_USAGE, 0xe85fe442, 0x2ca3, 0x486e, 0xa9, 0xc7, 0x10, 0x9d, 0xda, 0x60, 0x98, 0x80);") cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT, 0x18802c61, 0x324b, 0x4952, 0xab, 0xd0, 0x17, 0x6f, 0xf5, 0xc6, 0x96, 0xff);") +cpp_quote("EXTERN_GUID(MF_SA_REQUIRED_SAMPLE_COUNT_PROGRESSIVE, 0xb172d58e, 0xfa77, 0x4e48, 0x8d, 0x2a, 0x1d, 0xf2, 0xd8, 0x50, 0xea, 0xc2);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, 0x851745d5, 0xc3d6, 0x476d, 0x95, 0x27, 0x49, 0x8e, 0xf2, 0xd1, 0x0d, 0x18);") +cpp_quote("EXTERN_GUID(MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT_PROGRESSIVE, 0x0f5523a5, 0x1cb2, 0x47c5, 0xa5, 0x50, 0x2e, 0xeb, 0x84, 0xb4, 0xd1, 0x4a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC, 0xf81a699a, 0x649a, 0x497d, 0x8c, 0x73, 0x29, 0xf8, 0xfe, 0xd6, 0xad, 0x7a);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_ASYNC_UNLOCK, 0xe5666d6b, 0x3422, 0x4eb6, 0xa4, 0x21, 0xda, 0x7d, 0xb1, 0xf8, 0xe2, 0x07);") cpp_quote("EXTERN_GUID(MF_TRANSFORM_CATEGORY_Attribute, 0xceabba49, 0x506d, 0x4757, 0xa6, 0xff, 0x66, 0xc1, 0x84, 0x98, 0x7e, 0x4e);") -- 2.30.2

2 1

Wine staging 6.14 release
by Alistair Leslie-Hughes July 30, 2021

July 30, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.14 (608 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * mfplat-streaming-support * nvcuda-CUDA_Support * ntdll-Junction_Points Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] ws2_32: Move the getsockopt(IPX_PTYPE) implementation to ntdll.
by Zebediah Figura July 30, 2021

July 30, 2021

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 27 ++++----------------------- include/wine/afd.h | 1 + 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 24090c1a17b..c2cbaff24e1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1922,6 +1922,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } +#ifdef SOL_IPX + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + return do_getsockopt( handle, io, SOL_IPX, IPX_TYPE, out_buffer, out_size ); +#elif defined(SO_DEFAULT_HEADERS) + case IOCTL_AFD_WINE_GET_IPX_PTYPE: + { + int fd, needs_close = FALSE; + struct ipx value; + socklen_t len = sizeof(value); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, 0, SO_DEFAULT_HEADERS, &value, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + *(DWORD *)out_buffer = value.ipx_pt; + return STATUS_SUCCESS; + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a28c25ec697..71b5e9a8658 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2158,7 +2158,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ -#ifdef HAS_IPX + case WS_NSPROTO_IPX: { struct WS_sockaddr_ipx addr; @@ -2166,27 +2166,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int namelen; switch(optname) { - case WS_IPX_PTYPE: - if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; -#ifdef SOL_IPX - if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) - { - ret = SOCKET_ERROR; - } -#else - { - struct ipx val; - socklen_t len=sizeof(struct ipx); - if(getsockopt(fd, 0, SO_DEFAULT_HEADERS, &val, &len) == -1 ) - ret = SOCKET_ERROR; - else - *optval = (int)val.ipx_pt; - } -#endif - TRACE("ptype: %d (fd: %d)\n", *(int*)optval, fd); - release_sock_fd( s, fd ); - return ret; - case WS_IPX_ADDRESS: /* * On a Win2000 system with one network card there are usually @@ -2217,12 +2196,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *(int*)optval = 1; /* As noted under IPX_ADDRESS we have just one card. */ return 0; + case WS_IPX_PTYPE: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPX_PTYPE, optval, optlen ); + default: FIXME("IPX optname:%x\n", optname); return SOCKET_ERROR; }/* end switch(optname) */ } /* end case WS_NSPROTO_IPX */ -#endif #ifdef HAS_IRDA #define MAX_IRDA_DEVICES 10 diff --git a/include/wine/afd.h b/include/wine/afd.h index 9a1edb1fda6..6630a6402fc 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -223,6 +223,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278) #define IOCTL_AFD_WINE_GET_IPV6_V6ONLY WINE_AFD_IOC(279) #define IOCTL_AFD_WINE_SET_IPV6_V6ONLY WINE_AFD_IOC(280) +#define IOCTL_AFD_WINE_GET_IPX_PTYPE WINE_AFD_IOC(281) struct afd_create_params { -- 2.30.2

1 4

[PATCH] maintainers: Changing my name
by André Zwing July 30, 2021

July 30, 2021

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e85151e9bd2..c36a70958ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,7 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm* @@ -175,7 +175,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: programs/netstat/ Network @@ -302,7 +302,7 @@ P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: tools/winemaker/ WinHTTP @@ -314,7 +314,7 @@ P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ WPcap -M: André Hentschel <nerv(a)dawncrow.de> +M: André Zwing <nerv(a)dawncrow.de> F: dlls/wpcap/ X11 Driver -- 2.25.1

1 0

[PATCH] jscript: Store the head of statement list instead of the list structure.
by Paul Gofman July 30, 2021

July 30, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 210523. dlls/jscript/compile.c | 6 +++--- dlls/jscript/parser.h | 9 ++------- dlls/jscript/parser.y | 14 +++++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4672a8c31f1..482805cc52d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2510,7 +2510,7 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source, UINT64 s return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, function_expression_t *func_expr, +static HRESULT compile_function(compiler_ctx_t *ctx, statement_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { function_expression_t *iter; @@ -2568,7 +2568,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f return E_OUTOFMEMORY; } - hres = visit_block_statement(ctx, NULL, source ? source->head : NULL); + hres = visit_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; @@ -2609,7 +2609,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, statement_list_t *source, f ctx->current_function_expr = ctx->func_head; off = ctx->code_off; - hres = compile_block_statement(ctx, NULL, source ? source->head : NULL); + hres = compile_block_statement(ctx, NULL, source); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index fde0b540d63..9e212138480 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -19,11 +19,6 @@ typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; -typedef struct _statement_list_t { - statement_t *head; - statement_t *tail; -} statement_list_t; - struct _bytecode_t; typedef struct { @@ -41,7 +36,7 @@ typedef struct _parser_ctx_t { script_ctx_t *script; struct _compiler_ctx_t *compiler; - statement_list_t *source; + statement_t *source; BOOL nl; BOOL implicit_nl_semicolon; BOOL is_html; @@ -301,7 +296,7 @@ typedef struct _function_expression_t { const WCHAR *identifier; const WCHAR *event_target; parameter_t *parameter_list; - statement_list_t *statement_list; + statement_t *statement_list; const WCHAR *src_str; DWORD src_len; unsigned func_id; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..0ebdc2b932b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -65,6 +65,11 @@ typedef struct _case_list_t { case_clausule_t *tail; } case_list_t; +typedef struct _statement_list_t { + statement_t *head; + statement_t *tail; +} statement_list_t; + static catch_block_t *new_catch_block(parser_ctx_t*,const WCHAR*,statement_t*); static case_clausule_t *new_case_clausule(parser_ctx_t*,unsigned,expression_t*,statement_list_t*); static case_list_t *new_case_list(parser_ctx_t*,case_clausule_t*); @@ -98,11 +103,6 @@ static statement_t *new_switch_statement(parser_ctx_t*,unsigned,expression_t*,ca static statement_t *new_throw_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_try_statement(parser_ctx_t*,statement_t*,catch_block_t*,statement_t*,unsigned); -struct statement_list_t { - statement_t *head; - statement_t *tail; -}; - static statement_list_t *new_statement_list(parser_ctx_t*,statement_t*); static statement_list_t *statement_list_add(statement_list_t*,statement_t*); @@ -249,7 +249,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { ctx->source = $1 ? $1->head : NULL; } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1440,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + ret->statement_list = statement_list ? statement_list->head : NULL; ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; -- 2.31.1

2 1

[PATCH] jscript: Allocate non-temporary storage for statement lists which persist after parsing.
by Paul Gofman July 30, 2021

July 30, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- new_statement_list() uses parser_alloc_tmp() and the memory for statement list may get freed in script_parse() thus making compile_function() use the freed memory. dlls/jscript/parser.y | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9fc7ea61dc3..4bad7e326db 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -249,7 +249,17 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t /* ECMA-262 10th Edition 15.1 */ Script - : ScriptBody HtmlComment { ctx->source = $1; } + : ScriptBody HtmlComment { + if ($1) + { + ctx->source = parser_alloc(ctx, sizeof(*ctx->source)); + *ctx->source = *$1; + } + else + { + ctx->source = NULL; + } + } /* ECMA-262 10th Edition 15.1 */ ScriptBody @@ -1440,7 +1450,15 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; - ret->statement_list = statement_list; + if (statement_list) + { + ret->statement_list = parser_alloc(ctx, sizeof(*ret->statement_list)); + *ret->statement_list = *statement_list; + } + else + { + ret->statement_list = NULL; + } ret->event_target = event_target; ret->src_str = src_str; ret->src_len = src_len; @@ -1657,7 +1675,6 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco jsstr_release(line_str); return DISP_E_EXCEPTION; } - *ret = parser_ctx; return S_OK; } -- 2.31.1

2 2

[PATCH 9/9] gdi32: Use NtGdiGetDeviceCaps for GetDeviceCaps implementation.
by Jacek Caban July 30, 2021

July 30, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 10 ++++++++++ dlls/gdi32/mfdrv/init.c | 8 +++++--- dlls/gdi32/tests/dc.c | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-)

2 1

[PATCH 8/9] gdi32: Use ntgdi name for CreateCompatibleDC.
by Jacek Caban July 30, 2021

July 30, 2021

2 1

[PATCH 7/9] gdi32: Don't use driver entry point for NtGdiSaveDC implementation.
by Jacek Caban July 30, 2021

July 30, 2021

2 1

[PATCH 6/9] gdi32: Use NtGdiSaveDC for SaveDC implementation.
by Jacek Caban July 30, 2021

July 30, 2021

2 1