- Wine-Commits - list.winehq.org

Paul Gofman : ntdll: Preserve untouched parts of xstate in set_thread_wow64_context().
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 14a51fa4460d958efc22c2fe108d90c37b6465c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/14a51fa4460d958efc22c2fe108d90… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 17:37:00 2024 -0600 ntdll: Preserve untouched parts of xstate in set_thread_wow64_context(). --- dlls/ntdll/unix/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d8d16917942..4fc2727595d 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1281,9 +1281,11 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); XSAVE_AREA_HEADER *xs = (XSAVE_AREA_HEADER *)((char *)context_ex + context_ex->XState.Offset); + UINT64 mask = frame->xstate.Mask; if (xstate_compaction_enabled) frame->xstate.CompactionMask |= xstate_extended_features(); copy_xstate( &frame->xstate, xs, xs->Mask ); + if (xs->CompactionMask) frame->xstate.Mask |= mask & ~xs->CompactionMask; frame->restore_flags |= CONTEXT_XSTATE; } return STATUS_SUCCESS;

1 0

Brendan Shanks : winecoreaudio: Correctly handle devices whose UID contains non-ASCII characters.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: a630b125ef4429c1c52c1272eba8b7939e7e6857 URL: https://gitlab.winehq.org/wine/wine/-/commit/a630b125ef4429c1c52c1272eba8b7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Apr 5 22:05:52 2024 -0700 winecoreaudio: Correctly handle devices whose UID contains non-ASCII characters. --- dlls/winecoreaudio.drv/coreaudio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d78744455a8..a79a0d16839 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -325,7 +325,12 @@ static NTSTATUS unix_get_endpoint_ids(void *args) for(i = 0; i < params->num; i++){ const SIZE_T name_len = CFStringGetLength(info[i].name) + 1; - const SIZE_T device_len = CFStringGetLength(info[i].uid) + 1; + CFIndex device_len; + + CFStringGetBytes(info[i].uid, CFRangeMake(0, CFStringGetLength(info[i].uid)), kCFStringEncodingUTF8, + 0, false, NULL, 0, &device_len); + device_len++; /* for null terminator */ + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ @@ -336,7 +341,8 @@ static NTSTATUS unix_get_endpoint_ids(void *args) offset += name_len * sizeof(WCHAR); endpoint->device = offset; - CFStringGetCString(info[i].uid, (char *)params->endpoints + offset, params->size - offset, kCFStringEncodingUTF8); + CFStringGetBytes(info[i].uid, CFRangeMake(0, CFStringGetLength(info[i].uid)), kCFStringEncodingUTF8, + 0, false, (UInt8 *)params->endpoints + offset, params->size - offset, NULL); ((char *)params->endpoints)[offset + device_len - 1] = '\0'; offset += (device_len + 1) & ~1;

1 0

Paul Gofman : winhttp: Set actual default receive response timeout to 21sec.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 5f93179744610bf322ce407b5dbb46162f833aa5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f93179744610bf322ce407b5dbb46… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 8 20:21:09 2024 -0600 winhttp: Set actual default receive response timeout to 21sec. --- dlls/winhttp/request.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9fe8e1c4782..1b6cb1e2a45 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_KEEP_ALIVE_TIMEOUT 30000 +#define ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT 21000 + +static int request_receive_response_timeout( struct request *req ) +{ + if (req->receive_response_timeout == -1) return ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT; + return req->receive_response_timeout; +} + static const WCHAR *attribute_table[] = { L"Mime-Version", /* WINHTTP_QUERY_MIME_VERSION = 0 */ @@ -1658,7 +1666,7 @@ static DWORD open_connection( struct request *request ) return ret; } netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request )); request->netconn = netconn; @@ -1696,7 +1704,7 @@ static DWORD open_connection( struct request *request ) TRACE("using connection %p\n", netconn); netconn_set_timeout( netconn, TRUE, request->send_timeout ); - netconn_set_timeout( netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request )); request->netconn = netconn; } @@ -2329,7 +2337,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (!chunked && content_length <= optional_len) { - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request )); request->read_reply_status = read_reply( request ); if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED; @@ -2932,7 +2940,7 @@ static DWORD receive_response( struct request *request ) } /* fallthrough */ case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request )); request->read_reply_status = read_reply( request ); request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break;

1 0

Hans Leidekker : msi/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 738ec8285583248a84349939734ed600a47ba73d URL: https://gitlab.winehq.org/wine/wine/-/commit/738ec8285583248a84349939734ed6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 16:25:09 2024 +0200 msi/tests: Get rid of workarounds for old Windows versions. --- dlls/msi/tests/action.c | 260 +-- dlls/msi/tests/automation.c | 46 +- dlls/msi/tests/custom.c | 4 +- dlls/msi/tests/install.c | 115 +- dlls/msi/tests/msi.c | 4144 ++++++++++++++++--------------------------- dlls/msi/tests/package.c | 135 +- dlls/msi/tests/patch.c | 115 +- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/source.c | 1485 ++++++---------- include/msi.h | 2 +- 10 files changed, 2203 insertions(+), 4105 deletions(-)

1 0

Hans Leidekker : msi: Install global assemblies before running deferred custom actions.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 7f0ca9c284d15d03f14a8fefefac834990d622cd URL: https://gitlab.winehq.org/wine/wine/-/commit/7f0ca9c284d15d03f14a8fefefac83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 09:22:06 2024 +0200 msi: Install global assemblies before running deferred custom actions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56493 --- dlls/msi/action.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 06f399223f4..e3c7c23b2bd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5139,16 +5139,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) MSIFILE *file; MSIFILEPATCH *patch; - /* first do the same as an InstallExecute */ - rc = execute_script(package, SCRIPT_INSTALL); - if (rc != ERROR_SUCCESS) - return rc; - - /* then handle commit actions */ - rc = execute_script(package, SCRIPT_COMMIT); - if (rc != ERROR_SUCCESS) - return rc; - /* install global assemblies */ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { @@ -5187,6 +5177,16 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) } } + /* first do the same as an InstallExecute */ + rc = execute_script(package, SCRIPT_INSTALL); + if (rc != ERROR_SUCCESS) + return rc; + + /* then handle commit actions */ + rc = execute_script(package, SCRIPT_COMMIT); + if (rc != ERROR_SUCCESS) + return rc; + if (is_full_uninstall(package)) rc = ACTION_UnpublishProduct(package);

1 0

Hans Leidekker : msi/tests: Use the helpers from utils.h in more modules.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b3f11ceb7a0ddcf5fe742377f99c947b0b56a051 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3f11ceb7a0ddcf5fe742377f99c94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 4 14:40:24 2024 +0200 msi/tests: Use the helpers from utils.h in more modules. --- dlls/msi/tests/automation.c | 85 ++---------------------- dlls/msi/tests/db.c | 73 +++++--------------- dlls/msi/tests/package.c | 158 +++++++++++--------------------------------- dlls/msi/tests/patch.c | 68 ++----------------- 4 files changed, 65 insertions(+), 319 deletions(-)

1 0

Rémi Bernon : mf/tests: Test D3D awareness handling in the topology loader.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b0935b929184e3baaa453f59ccef53546f56f05e URL: https://gitlab.winehq.org/wine/wine/-/commit/b0935b929184e3baaa453f59ccef53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 9 11:05:53 2024 +0200 mf/tests: Test D3D awareness handling in the topology loader. --- dlls/mf/tests/topology.c | 485 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 485 insertions(+)

1 0

Rémi Bernon : mf/tests: Test device manager handling in the topology loader.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: c1fb54addef0f0b460279fe0e386c01742e98210 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1fb54addef0f0b460279fe0e386c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 8 17:43:35 2024 +0200 mf/tests: Test device manager handling in the topology loader. --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/topology.c | 619 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 615 insertions(+), 6 deletions(-)

1 0

Rémi Bernon : include: Add MFTOPOLOGY_DXVA_MODE enum definition.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: c43655d8ed576d23022ce107288d9bcd8982ee58 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43655d8ed576d23022ce107288d9b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 8 17:17:22 2024 +0200 include: Add MFTOPOLOGY_DXVA_MODE enum definition. --- include/mfidl.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b3201b12d84..666af53c6e3 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -131,6 +131,13 @@ typedef enum _MF_VIDEO_PROCESSOR_ALGORITHM_TYPE MF_VIDEO_PROCESSOR_ALGORITHM_MRF_CRF_444 = 1, } MF_VIDEO_PROCESSOR_ALGORITHM_TYPE; +typedef enum MFTOPOLOGY_DXVA_MODE +{ + MFTOPOLOGY_DXVA_DEFAULT = 0, + MFTOPOLOGY_DXVA_NONE = 1, + MFTOPOLOGY_DXVA_FULL = 2, +} MFTOPOLOGY_DXVA_MODE; + [ object, uuid(2eb1e945-18b8-4139-9b1a-d5d584818530),

1 0

Rémi Bernon : mf/tests: Fix printf format warning.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: dcab600eef9e86fe2e0a7ac8998002c5bbf4713b URL: https://gitlab.winehq.org/wine/wine/-/commit/dcab600eef9e86fe2e0a7ac8998002… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 14:50:46 2024 +0200 mf/tests: Fix printf format warning. --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fece60d37a7..b3cd355f49d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4179,7 +4179,7 @@ static void test_topology_loader(void) { IMFTopology_GetTopologyID(topology, &oldtopoid); IMFTopology_GetTopologyID(full_topology, &newtopoid); - ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid); + ok(oldtopoid == newtopoid, "Expected the same topology id. %I64u == %I64u\n", oldtopoid, newtopoid); ok(topology != full_topology, "Expected a different object for the resolved topology.\n"); hr = IMFTopology_GetCount(full_topology, &count); @@ -4331,7 +4331,7 @@ todo_wine { ok(full_topology != topology2, "Unexpected instance.\n"); IMFTopology_GetTopologyID(topology2, &oldtopoid); IMFTopology_GetTopologyID(full_topology, &newtopoid); - ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid); + ok(oldtopoid == newtopoid, "Expected the same topology id. %I64u == %I64u\n", oldtopoid, newtopoid); hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0