August 2022 - Wine-commits - list.winehq.org

Rémi Bernon : mf: Support uninitialized downstream media types in topology loader.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 2be95875c0f773f6b393783b061ec0ca8caa6ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2be95875c0f773f6b393783b061ec0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 20:46:33 2022 +0200 mf: Support uninitialized downstream media types in topology loader. --- dlls/mf/tests/mf.c | 2 -- dlls/mf/topology_loader.c | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb320af92fe..af611fac814 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2746,7 +2746,6 @@ todo_wine { hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr); - todo_wine_if(test->flags & LOADER_SET_MEDIA_TYPES) ok(ret, "Output type of last transform doesn't match sink node type.\n"); IMFTopologyNode_Release(mft_node); @@ -2776,7 +2775,6 @@ todo_wine { ok(!count, "Unexpected count %u.\n", count); if (test->flags & LOADER_SET_MEDIA_TYPES) - todo_wine ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); else ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index eb652f526dd..ab694379237 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -335,6 +335,30 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC return hr; } +static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IMFMediaType **type) +{ + IMFMediaType *media_type; + HRESULT hr; + DWORD i; + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + if (hr != MF_E_NOT_INITIALIZED) + return hr; + + for (i = 0; SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &media_type)); i++) + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, NULL))) + { + *type = media_type; + return hr; + } + + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch, IMFMediaType *up_type) { @@ -353,7 +377,7 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME if (FAILED(hr = topology_node_get_type_handler(branch->down.node, branch->down.stream, FALSE, &down_handler))) return hr; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(down_handler, &down_type)) + if (SUCCEEDED(hr = topology_branch_get_current_type(down_handler, &down_type)) && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) { TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type);

1 0

Davide Beatrici : mmdevapi/tests: Fix fail messages referencing GetChannelCount() instead of GetChannelVolume().
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 874260d12ed6bf7b1aa7b0af89da4552db51ed99 URL: https://gitlab.winehq.org/wine/wine/-/commit/874260d12ed6bf7b1aa7b0af89da45… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 21 09:34:06 2022 +0200 mmdevapi/tests: Fix fail messages referencing GetChannelCount() instead of GetChannelVolume(). --- dlls/mmdevapi/tests/capture.c | 20 ++++++++++---------- dlls/mmdevapi/tests/render.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 5fbb62e4403..74a55f1fb94 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -582,16 +582,16 @@ static void test_streamvolume(void) ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); @@ -607,7 +607,7 @@ static void test_streamvolume(void) ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); @@ -681,16 +681,16 @@ static void test_channelvolume(void) ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); @@ -706,7 +706,7 @@ static void test_channelvolume(void) ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4e19b91c5f5..65e5b1161e0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1641,16 +1641,16 @@ static void test_streamvolume(void) ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_POINTER, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); @@ -1666,7 +1666,7 @@ static void test_streamvolume(void) ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); @@ -1745,16 +1745,16 @@ static void test_channelvolume(void) ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == E_INVALIDARG, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); @@ -1770,7 +1770,7 @@ static void test_channelvolume(void) ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL);

1 0

Davide Beatrici : mmdevapi/tests: Distinguish GetChannelCount() calls in test_volume_dependence() fail messages.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: ebdee3cd80ccf45ec2325081ee13db5c4a080cb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebdee3cd80ccf45ec2325081ee13db… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 21 09:26:35 2022 +0200 mmdevapi/tests: Distinguish GetChannelCount() calls in test_volume_dependence() fail messages. --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 74a55f1fb94..9d3d13dcaae 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -915,11 +915,11 @@ static void test_volume_dependence(void) ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "CAV_GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "ASV_GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); IAudioStreamVolume_Release(asv2); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 65e5b1161e0..0fc8aa5bc3e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1996,11 +1996,11 @@ static void test_volume_dependence(void) ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "CAV_GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); + ok(hr == S_OK, "ASV_GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); IAudioStreamVolume_Release(asv2);

1 0

Davide Beatrici : mmdevapi/tests: Fix typos in spatial audio fail messages.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 447615747f2de1948dc27e487b45a6a6e9aeeda5 URL: https://gitlab.winehq.org/wine/wine/-/commit/447615747f2de1948dc27e487b45a6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 21 08:34:08 2022 +0200 mmdevapi/tests: Fix typos in spatial audio fail messages. --- dlls/mmdevapi/tests/spatialaudio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index 2f55b12f68e..a382b57e7a2 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -240,7 +240,7 @@ static void test_audio_object_activation(void) hr = ISpatialAudioObject_IsActive(sao1, &is_active); todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08lx\n", hr); if (hr == S_OK) - ok(is_active, "Expected spaital audio object to be active\n"); + ok(is_active, "Expected spatial audio object to be active\n"); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao2); ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08lx\n", hr); @@ -315,7 +315,7 @@ static void test_audio_object_buffers(void) ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); + ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count); @@ -345,7 +345,7 @@ static void test_audio_object_buffers(void) ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx, j %u.\n", hr, j); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); + ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count); @@ -388,7 +388,7 @@ static void test_audio_object_buffers(void) ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); + ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); /* one more iteration but not with every object */ @@ -416,7 +416,7 @@ static void test_audio_object_buffers(void) todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); + ok(hr == S_OK, "Failed to begin updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); /* expect the object that was not updated last cycle to be invalidated */

1 0

Davide Beatrici : mmdevapi/tests: Fix fail message referencing "Start" instead of "Stop" in test_session().
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 51604ad18669092faa1b24241e238898c7306785 URL: https://gitlab.winehq.org/wine/wine/-/commit/51604ad18669092faa1b24241e2388… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sun Aug 21 09:20:22 2022 +0200 mmdevapi/tests: Fix fail message referencing "Start" instead of "Stop" in test_session(). --- dlls/mmdevapi/tests/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 0fc8aa5bc3e..ac714980c6f 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1529,7 +1529,7 @@ static void test_session(void) } hr = IAudioClient_Stop(ses1_ac1); - ok(hr == S_OK, "Start failed: %08lx\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); ok(hr == S_OK, "GetState failed: %08lx\n", hr);

1 0

Robert Wilhelm : scrrun: Added DateCreated property for IFile.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 8eb7843d206d014acf93239d6782a199228472e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8eb7843d206d014acf93239d6782a1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Aug 22 08:36:10 2022 +0200 scrrun: Added DateCreated property for IFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42857 --- dlls/scrrun/filesystem.c | 12 +++++++++--- dlls/scrrun/tests/filesystem.c | 8 ++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 37753a84b5e..7a8a7689902 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2947,11 +2947,17 @@ static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date) return S_OK; } -static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) +static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *date) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pdate); - return E_NOTIMPL; + WIN32_FILE_ATTRIBUTE_DATA attrs; + + TRACE("(%p)->(%p)\n", This, date); + + if (GetFileAttributesExW(This->path, GetFileExInfoStandard, &attrs)) + return get_date_from_filetime(&attrs.ftCreationTime, date); + + return E_FAIL; } static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *date) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5e88eaec46b..59f5859c556 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -635,6 +635,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IFile_get_DateCreated(file, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + date = 0.0; + hr = IFile_get_DateCreated(file, &date); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(date > 0.0, "got %f\n", date); + hr = IFile_get_DateLastModified(file, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);

1 0

Hans Leidekker : bcrypt: Support ECDH_P384 key import/export.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 5253c8d77e8e7dc5770981e97e67348f393b99b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5253c8d77e8e7dc5770981e97e6734… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 22 16:49:00 2022 +0200 bcrypt: Support ECDH_P384 key import/export. --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 13 ++++++++++ dlls/bcrypt/gnutls.c | 47 ++++++++++++++++++++++++++++++++--- dlls/bcrypt/tests/bcrypt.c | 58 +++++++++++++++++++++++++++++-------------- include/bcrypt.h | 1 + 5 files changed, 98 insertions(+), 22 deletions(-)

1 0

Jakub Staroń : ntdll: Implement RtlRestoreContext on i386.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 88d13e663d1e6d797b4ea74a80a6e97e418e37f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/88d13e663d1e6d797b4ea74a80a6e9… Author: Jakub Staroń <kubastaron(a)hotmail.com> Date: Fri Aug 19 08:03:29 2022 +0200 ntdll: Implement RtlRestoreContext on i386. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_i386.c | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 556156686f2..a5fa757da9f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1313,7 +1313,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) NTDLL.RtlMoveMemory @ stdcall RtlPcToFileHeader(ptr ptr) NTDLL.RtlPcToFileHeader @ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException -@ cdecl -arch=arm,arm64,x86_64 -import RtlRestoreContext(ptr ptr) +@ cdecl -import RtlRestoreContext(ptr ptr) @ stdcall RtlUnwind(ptr ptr ptr long) NTDLL.RtlUnwind @ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx @ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 299d2195800..c294490d544 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -952,7 +952,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stdcall RtlResetRtlTranslations(ptr) -@ cdecl -arch=arm,arm64,x86_64 RtlRestoreContext(ptr ptr) +@ cdecl RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream @ stub RtlRunDecodeUnicodeString diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ae065f8c37b..acb3937efa8 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -359,6 +359,14 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") "ret $4" ) +/******************************************************************* + * RtlRestoreContext (NTDLL.@) + */ +void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) +{ + TRACE( "returning to %p stack %p\n", (void *)context->Eip, (void *)context->Esp ); + NtContinue( context, FALSE ); +} /******************************************************************* * RtlUnwind (NTDLL.@)

1 0

Davide Beatrici : winealsa: Fix WoW64 failure when calling get_position().
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 346e04dae04e79fd67d259af9f73240a5568959a URL: https://gitlab.winehq.org/wine/wine/-/commit/346e04dae04e79fd67d259af9f7324… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Aug 22 09:23:43 2022 +0200 winealsa: Fix WoW64 failure when calling get_position(). Bug introduced in e29dc33aebf4e1d4e30fd158b69338331edd3f65. --- dlls/winealsa.drv/alsa.c | 2 ++ dlls/winealsa.drv/mmdevdrv.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index fb688fe61c6..882562bcf91 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2735,6 +2735,7 @@ static NTSTATUS alsa_wow64_get_position(void *args) struct { stream_handle stream; + BOOL device; HRESULT result; PTR32 pos; PTR32 qpctime; @@ -2742,6 +2743,7 @@ static NTSTATUS alsa_wow64_get_position(void *args) struct get_position_params params = { .stream = params32->stream, + .device = params32->device, .pos = ULongToPtr(params32->pos), .qpctime = ULongToPtr(params32->qpctime) }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d5cce1b9f4d..8c3d4c0340f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1482,6 +1482,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, return E_POINTER; params.stream = This->stream; + params.device = FALSE; params.pos = pos; params.qpctime = qpctime;

1 0

Rémi Bernon : win32u: Only read/write valid mode fields from/to the registry.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 533b3def8030fd14d8bb38794a776201f0218e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/533b3def8030fd14d8bb38794a7762… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 09:31:43 2022 +0200 win32u: Only read/write valid mode fields from/to the registry. --- dlls/win32u/sysparams.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8b57e65c3c8..be68a2cff32 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -429,16 +429,20 @@ static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *m { WCHAR bufferW[MAX_PATH]; char buffer[MAX_PATH]; + BOOL ret = TRUE; HKEY hkey; - BOOL ret; sprintf( buffer, "Modes\\%08X", index ); + reg_delete_tree( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ); if (!(hkey = reg_create_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), REG_OPTION_VOLATILE, NULL ))) return FALSE; -#define set_mode_field( name, field, flag ) \ - if (!(ret = set_reg_value( hkey, (name), REG_DWORD, &mode->field, sizeof(mode->field) ))) goto done; +#define set_mode_field( name, field, flag ) \ + if ((mode->dmFields & (flag)) && \ + !(ret = set_reg_value( hkey, (name), REG_DWORD, &mode->field, \ + sizeof(mode->field) ))) \ + goto done set_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); set_mode_field( x_resolutionW, dmPelsWidth, DM_PELSWIDTH ); @@ -467,7 +471,6 @@ static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) WCHAR bufferW[MAX_PATH]; char buffer[MAX_PATH]; HKEY hkey; - BOOL ret; sprintf( buffer, "Modes\\%08X", index ); if (!(hkey = reg_open_key( adapter_key, bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR) ))) @@ -476,11 +479,12 @@ static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) #define query_mode_field( name, field, flag ) \ do \ { \ - ret = query_reg_value( hkey, (name), value, sizeof(value_buf) ) && \ - value->Type == REG_DWORD; \ - if (!ret) goto done; \ - mode->field = *(const DWORD *)value->Data; \ - mode->dmFields |= (flag); \ + if (query_reg_value( hkey, (name), value, sizeof(value_buf) ) && \ + value->Type == REG_DWORD) \ + { \ + mode->field = *(const DWORD *)value->Data; \ + mode->dmFields |= (flag); \ + } \ } while (0) query_mode_field( bits_per_pelW, dmBitsPerPel, DM_BITSPERPEL ); @@ -488,17 +492,16 @@ static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) query_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); query_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); query_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); + query_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); + query_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) { query_mode_field( x_panningW, dmPosition.x, DM_POSITION ); query_mode_field( y_panningW, dmPosition.y, DM_POSITION ); } - query_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); - query_mode_field( fixed_outputW, dmDisplayFixedOutput, 0 ); #undef query_mode_field -done: NtClose( hkey ); return TRUE; }

1 0