wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Nikolay Sivov : mfplay: Handle user sinks.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 78c35d34e88219a8f1c93e53d71587189e9d0f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78c35d34e88219a8f1c93e53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:42 2021 +0300 mfplay: Handle user sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 75 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 51f3f67f5b1..87ddf613288 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1015,13 +1015,38 @@ static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) return hr; } +static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamDescriptor *sd, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, node))) + { + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + } + + return hr; +} + +static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **node) +{ + HRESULT hr; + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + IMFTopologyNode_SetObject(*node, sink); + + return hr; +} + static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { IMFTopologyNode *src_node, *sink_node; - IMFActivate *sar_activate; IMFStreamDescriptor *sd; IMFTopology *topology; unsigned int idx; + IUnknown *sink; BOOL selected; HRESULT hr; GUID major; @@ -1029,48 +1054,54 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (FAILED(hr = MFCreateTopology(&topology))) return hr; - /* FIXME: handle user sinks */ - /* Use first stream if none selected. */ if (player->output_window) { FIXME("Video streams are not handled.\n"); } - /* Set up audio branches for all selected streams. */ + /* Set up branches for all selected streams. */ idx = 0; while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) { - if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + if (!selected) { - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) - { - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); - IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + IMFStreamDescriptor_Release(sd); + continue; + } - IMFTopology_AddNode(topology, src_node); - } + sink = NULL; - if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) - { - if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) - { - IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); - IMFActivate_Release(sar_activate); - } + if (SUCCEEDED(IMFStreamDescriptor_GetUnknown(sd, &_MF_CUSTOM_SINK, &IID_IUnknown, (void **)&sink))) + { + /* User sink is attached as-is. */ + } + else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) + WARN("Failed to create SAR activation object, hr %#x.\n", hr); + } - IMFTopology_AddNode(topology, sink_node); - } + if (sink) + { + hr = media_item_create_source_node(item, sd, &src_node); + if (SUCCEEDED(hr)) + hr = media_item_create_sink_node(sink, &sink_node); - if (src_node && sink_node) + if (SUCCEEDED(hr)) + { + IMFTopology_AddNode(topology, src_node); + IMFTopology_AddNode(topology, sink_node); IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + } if (src_node) IMFTopologyNode_Release(src_node); if (sink_node) IMFTopologyNode_Release(sink_node); + + IUnknown_Release(sink); } IMFStreamDescriptor_Release(sd);

1 0

Connor McAdams : mfplat: Implement GetAudioFormat method for IMFAudioMediaType interface.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 94d33c1daa2a8a2683936efc19f6640b25e00c61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94d33c1daa2a8a2683936efc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:07 2021 -0400 mfplat: Implement GetAudioFormat method for IMFAudioMediaType interface. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 60b86aa40b6..fae4d3e5055 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -41,6 +41,7 @@ struct media_type IMFVideoMediaType IMFVideoMediaType_iface; IMFAudioMediaType IMFAudioMediaType_iface; MFVIDEOFORMAT *video_format; + WAVEFORMATEX *audio_format; }; struct stream_desc @@ -155,6 +156,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) { clear_attributes_object(&media_type->attributes); CoTaskMemFree(media_type->video_format); + CoTaskMemFree(media_type->audio_format); heap_free(media_type); } @@ -1369,9 +1371,18 @@ static HRESULT WINAPI audio_mediatype_FreeRepresentation(IMFAudioMediaType *ifac static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaType *iface) { - FIXME("%p.\n", iface); + struct media_type *media_type = impl_from_IMFAudioMediaType(iface); + unsigned int size; + HRESULT hr; + + TRACE("%p.\n", iface); + + CoTaskMemFree(media_type->audio_format); + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType((IMFMediaType *)iface, &media_type->audio_format, &size, + MFWaveFormatExConvertFlag_Normal))) + WARN("Failed to create wave format description, hr %#x.\n", hr); - return NULL; + return media_type->audio_format; } static const IMFAudioMediaTypeVtbl audiomediatypevtbl =

1 0

Connor McAdams : mfplat: Free video_format pointer on final MediaType Release.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 77a145856a3020cff581939b35e1d7246eb7486d URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a145856a3020cff581939b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:06 2021 -0400 mfplat: Free video_format pointer on final MediaType Release. Make sure that the MFVIDEOFORMAT pointer is freed when the final IMFVideoMediaType interface is released. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 4904dbb566f..60b86aa40b6 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -154,6 +154,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!refcount) { clear_attributes_object(&media_type->attributes); + CoTaskMemFree(media_type->video_format); heap_free(media_type); }

1 0

Connor McAdams : mfplat: Add MFCreateWaveFormatExFromMFMediaType AudioFormat_Float test.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 7dc454be852a63a776c5cf2d7804f0c97c24ac4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc454be852a63a776c5cf2d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:05 2021 -0400 mfplat: Add MFCreateWaveFormatExFromMFMediaType AudioFormat_Float test. Add test for MFAudioFormat_Float subtype being passed to MFCreateWaveFormatExFromMFMediaType. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 87 ++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index caf6f78d9e9..b6468b5da9b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4240,10 +4240,20 @@ static void test_wrapped_media_type(void) static void test_MFCreateWaveFormatExFromMFMediaType(void) { + static const struct wave_fmt_test + { + const GUID *subtype; + WORD format_tag; + } + wave_fmt_tests[] = + { + { &MFAudioFormat_PCM, WAVE_FORMAT_PCM, }, + { &MFAudioFormat_Float, WAVE_FORMAT_IEEE_FLOAT, }, + }; WAVEFORMATEXTENSIBLE *format_ext; IMFMediaType *mediatype; WAVEFORMATEX *format; - UINT32 size; + UINT32 size, i; HRESULT hr; hr = MFCreateMediaType(&mediatype); @@ -4261,45 +4271,48 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFMediaType_Video); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - /* Audio/PCM */ hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(format != NULL, "Expected format structure.\n"); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); - ok(format->wFormatTag == WAVE_FORMAT_PCM, "Unexpected tag.\n"); - ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); - ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); - ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); - ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); - ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); - ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); - CoTaskMemFree(format); - - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, - MFWaveFormatExConvertFlag_ForceExtensible); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(format_ext != NULL, "Expected format structure.\n"); - ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); - ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); - ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); - ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); - ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", - format_ext->Format.nAvgBytesPerSec); - ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); - ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); - ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", - format_ext->Format.cbSize); - CoTaskMemFree(format_ext); - - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); - CoTaskMemFree(format); + for (i = 0; i < ARRAY_SIZE(wave_fmt_tests); ++i) + { + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, wave_fmt_tests[i].subtype); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + ok(format->wFormatTag == wave_fmt_tests[i].format_tag, "Expected tag %u, got %u.\n", wave_fmt_tests[i].format_tag, format->wFormatTag); + ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); + ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); + ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); + ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); + ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); + ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + CoTaskMemFree(format); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, + MFWaveFormatExConvertFlag_ForceExtensible); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format_ext != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); + ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); + ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); + ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", + format_ext->Format.nAvgBytesPerSec); + ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); + ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", + format_ext->Format.cbSize); + CoTaskMemFree(format_ext); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + CoTaskMemFree(format); + } IMFMediaType_Release(mediatype); }

1 0

Connor McAdams : mfplat: Add support for AudioFormat_Float in MFCreateWaveFormatExFromMFMediaType.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 538b702c871aa262d117a10fb5bc02b543112981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=538b702c871aa262d117a10f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:04 2021 -0400 mfplat: Add support for AudioFormat_Float in MFCreateWaveFormatExFromMFMediaType. Add support for the MFAudioFormat_Float subtype in MFCreateWaveFormatExFromMFMediaType. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index c8028b2a46f..4904dbb566f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2884,7 +2884,7 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE if (!IsEqualGUID(&major, &MFMediaType_Audio)) return E_INVALIDARG; - if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) { FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype)); return E_NOTIMPL; @@ -2908,7 +2908,12 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVE memset(format, 0, *size); - format->wFormatTag = format_ext ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + if (format_ext) + format->wFormatTag = WAVE_FORMAT_EXTENSIBLE; + else if (IsEqualGUID(&subtype, &MFAudioFormat_Float)) + format->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + else + format->wFormatTag = WAVE_FORMAT_PCM; if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) format->nChannels = value;

1 0

Hugh McMaster : reg: Print the full key path without a trailing backslash.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: e685718c3b701b67e1920a8e4f2ddce31d3ca800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e685718c3b701b67e1920a8e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 21 23:24:48 2021 +1000 reg: Print the full key path without a trailing backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 +++++++++++--- programs/reg/tests/query.c | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 69107d54b92..8ffbc5054d9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -205,10 +205,10 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD WCHAR *get_long_key(HKEY root, WCHAR *path) { - DWORD i, array_size = ARRAY_SIZE(root_rels), len; + int i, len, path_len; WCHAR *long_key; - for (i = 0; i < array_size; i++) + for (i = 0; i < ARRAY_SIZE(root_rels); i++) { if (root == root_rels[i].key) break; @@ -223,7 +223,15 @@ WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } - len += lstrlenW(path) + 1; /* add one for the backslash */ + path_len = lstrlenW(path); + + if (path[path_len - 1] == '\\') + { + path[path_len - 1] = 0; + path_len--; + } + + len += path_len + 1; /* add one for the concatenating backslash */ long_key = malloc((len + 1) * sizeof(WCHAR)); swprintf(long_key, len + 1, L"%s\\%s", root_rels[i].long_name, path); return long_key; diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 5c97554648e..34196c77aa4 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -251,7 +251,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE "\\ /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test6, FALSE, TODO_REG_COMPARE); + compare_query(buf, test6, FALSE, 0); read_reg_output("reg query HKCU\\" KEY_BASE " /v Wine /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,

1 0

Alexandre Julliard : kernelbase: Fix buffer size passed to read_nt_symlink().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 00bd0518cab0f7808d6bef5d1cc27f0fddd82d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00bd0518cab0f7808d6bef5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 20:54:00 2021 +0200 kernelbase: Fix buffer size passed to read_nt_symlink(). Spotted by David Torok. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 594c1b8e138..d513dda1f9d 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -308,7 +308,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* Take the mount point and get the "nonpersistent name" */ /* We will then take that and get the volume name */ nonpersist_name = (WCHAR *)(input + 1); - status = read_nt_symlink( symlink_name, nonpersist_name, i_size - sizeof(*input) ); + status = read_nt_symlink( symlink_name, nonpersist_name, (i_size - sizeof(*input)) / sizeof(WCHAR) ); TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status, debugstr_w(symlink_name), debugstr_w(nonpersist_name)); if (status != STATUS_SUCCESS)

1 0

Alexandre Julliard : ntdll: Fix buffer allocation size in get_env_var().
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: aaa501fe93fb7140b472850060d652613406307f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa501fe93fb7140b4728500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 17:06:43 2021 +0200 ntdll: Fix buffer allocation size in get_env_var(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f614db01c5..38dd276608b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2593,7 +2593,7 @@ static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *re for (;;) { - ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ); + ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size * sizeof(WCHAR) ); status = RtlQueryEnvironmentVariable( NULL, name, wcslen(name), ret->Buffer, size - extra - 1, &len ); if (!status)

1 0

Francois Gouget : winetest: Trace skipped dlls when in exclude (-n) mode.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 5549ad21b33c4471bd90c6eb26dd812f140bf680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5549ad21b33c4471bd90c6eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 09:32:37 2021 +0200 winetest: Trace skipped dlls when in exclude (-n) mode. When the command line specifies the list of tests to run, tracing all the skipped dlls unnecessarily spams the test output. But when the command line contains the list of (at most 64) excluded dlls, tracing them ensures tools analysing the report know why the corresponding dlls were skipped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 107151c927f..cb2f23a161e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -918,6 +918,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + if (exclude_tests) xprintf (" %s=skipped\n", dllname); return TRUE; } extract_test (&wine_tests[nr_of_files], tempdir, lpszName);

1 0

Hans Leidekker : secur32/tests: Add a Kerberos ticket cache test.
by Alexandre Julliard 21 Apr '21

21 Apr '21

Module: wine Branch: master Commit: 121910171c95c1cd44b8733fc5afcd2b8e7594bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=121910171c95c1cd44b8733f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 10:19:42 2021 +0200 secur32/tests: Add a Kerberos ticket cache test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/secur32.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 8fd421ca732..f6bca55561c 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -29,6 +29,8 @@ #include <schannel.h> #include <wincred.h> #include <winsock2.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -464,6 +466,38 @@ static void test_kerberos(void) FreeCredentialHandle( &cred ); } +static void test_ticket_cache(void) +{ + KERB_QUERY_TKT_CACHE_REQUEST req = { KerbQueryTicketCacheMessage }; + KERB_QUERY_TKT_CACHE_RESPONSE *resp; + NTSTATUS status; + HANDLE lsa; + ULONG package, len, i; + LSA_STRING name; + + status = LsaConnectUntrusted( &lsa ); + ok( !status, "got %08x\n", status ); + + RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A ); + status = LsaLookupAuthenticationPackage( lsa, &name, &package ); + ok( !status, "got %08x\n", status ); + + status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status ); + ok( !status, "got %08x\n", status ); + ok( resp->MessageType == KerbQueryTicketCacheMessage, "got %u\n", resp->MessageType ); + + for (i = 0; i < resp->CountOfTickets; i++) + { + KERB_TICKET_CACHE_INFO *info = &resp->Tickets[i]; + trace( "ServerName %s\n", wine_dbgstr_wn(info->ServerName.Buffer, info->ServerName.Length/sizeof(WCHAR)) ); + trace( "RealmName %s\n", wine_dbgstr_wn(info->RealmName.Buffer, info->RealmName.Length/sizeof(WCHAR)) ); + trace( "EncryptionType %08x\n", info->EncryptionType ); + trace( "TicketFlags %08x\n", info->TicketFlags ); + } + LsaFreeReturnBuffer( resp ); + LsaDeregisterLogonProcess( lsa ); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -514,4 +548,5 @@ START_TEST(secur32) } test_kerberos(); + test_ticket_cache(); }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
87
Older →

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-commits April 2021