July 2023 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: Use nameless union/structs.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 5f9119447cfeab79e9ff25d2a198765cfecedeb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f9119447cfeab79e9ff25d2a19876… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jul 6 08:53:22 2023 +0200 dbghelp: Use nameless union/structs. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/cpu_x86_64.c | 58 +++++++++++++++++++++++------------------------ dlls/dbghelp/dwarf.c | 10 ++++---- 2 files changed, 33 insertions(+), 35 deletions(-)

1 0

Bernhard Kölbl : mfmediaengine/tests: Add tests for video effects.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 621d153d45f8a29155e16bdbdbbb8b7320c80668 URL: https://gitlab.winehq.org/wine/wine/-/commit/621d153d45f8a29155e16bdbdbbb8b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 10 22:58:33 2023 +0100 mfmediaengine/tests: Add tests for video effects. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 534 +++++++++++++++++++++++++++++++ 1 file changed, 534 insertions(+)

1 0

Bernhard Kölbl : mfmediaengine: Add support for inserting video effects.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: de1dd6cbf79d451ca35cd63810557e3d347e0211 URL: https://gitlab.winehq.org/wine/wine/-/commit/de1dd6cbf79d451ca35cd63810557e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Dec 5 23:46:20 2022 +0100 mfmediaengine: Add support for inserting video effects. --- dlls/mfmediaengine/main.c | 110 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 19 ++---- 2 files changed, 114 insertions(+), 15 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b3ac236c78e..e3da2fa0752 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -113,6 +113,19 @@ struct rect float left, top, right, bottom; }; +struct effect +{ + IUnknown *object; + BOOL optional; +}; + +struct effects +{ + struct effect *effects; + size_t count; + size_t capacity; +}; + struct media_engine { IMFMediaEngineEx IMFMediaEngineEx_iface; @@ -145,6 +158,7 @@ struct media_engine IMFMediaSource *source; IMFPresentationDescriptor *pd; } presentation; + struct effects video_effects; struct { LONGLONG pts; @@ -1018,6 +1032,46 @@ static HRESULT media_engine_create_source_node(IMFMediaSource *source, IMFPresen return S_OK; } +static HRESULT media_engine_create_effects(struct effect *effects, size_t count, + IMFTopologyNode *src, IMFTopologyNode *sink, IMFTopology *topology) +{ + IMFTopologyNode *last = src; + HRESULT hr = S_OK; + size_t i; + + IMFTopologyNode_AddRef(last); + + for (i = 0; i < count; ++i) + { + IMFTopologyNode *node = NULL; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + { + WARN("Failed to create transform node, hr %#lx", hr); + break; + } + + IMFTopologyNode_SetObject(node, (IUnknown *)effects[i].object); + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); + + if (effects[i].optional) + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_AS_OPTIONAL); + + IMFTopology_AddNode(topology, node); + IMFTopologyNode_ConnectOutput(last, 0, node, 0); + + IMFTopologyNode_Release(last); + last = node; + } + + IMFTopologyNode_Release(last); + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_ConnectOutput(last, 0, sink, 0); + + return hr; +} + static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, IMFTopologyNode **node) { unsigned int category, role; @@ -1105,6 +1159,20 @@ static void media_engine_clear_presentation(struct media_engine *engine) memset(&engine->presentation, 0, sizeof(engine->presentation)); } +static void media_engine_clear_effects(struct effects *effects) +{ + size_t i; + + for (i = 0; i < effects->count; ++i) + { + if (effects->effects[i].object) + IUnknown_Release(effects->effects[i].object); + } + + free(effects->effects); + memset(effects, 0, sizeof(*effects)); +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; @@ -1227,7 +1295,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi { IMFTopology_AddNode(topology, video_src); IMFTopology_AddNode(topology, grabber_node); - IMFTopologyNode_ConnectOutput(video_src, 0, grabber_node, 0); + + if (FAILED(hr = media_engine_create_effects(engine->video_effects.effects, engine->video_effects.count, + video_src, grabber_node, topology))) + WARN("Failed to create video effect nodes, hr %#lx.\n", hr); } if (SUCCEEDED(hr)) @@ -1382,6 +1453,7 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + media_engine_clear_effects(&engine->video_effects); media_engine_release_video_frame_resources(engine); media_engine_clear_presentation(engine); if (engine->device_manager) @@ -2587,11 +2659,43 @@ static HRESULT WINAPI media_engine_IsProtected(IMFMediaEngineEx *iface, BOOL *pr return E_NOTIMPL; } +static HRESULT media_engine_insert_effect(struct media_engine *engine, struct effects *effects, IUnknown *object, BOOL is_optional) +{ + HRESULT hr = S_OK; + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!mf_array_reserve((void **)&effects->effects, &effects->capacity, effects->count + 1, sizeof(*effects->effects))) + { + hr = E_OUTOFMEMORY; + } + else + { + effects->effects[effects->count].object = object; + if (object) + { + IUnknown_AddRef(effects->effects[effects->count].object); + } + effects->effects[effects->count].optional = is_optional; + + effects->count++; + } + + return hr; +} + static HRESULT WINAPI media_engine_InsertVideoEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) { - FIXME("%p, %p, %d stub.\n", iface, effect, is_optional); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, effect, is_optional); + + EnterCriticalSection(&engine->cs); + hr = media_engine_insert_effect(engine, &engine->video_effects, effect, is_optional); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_InsertAudioEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index b488f57ba47..8aa9492d32b 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1829,17 +1829,12 @@ static void test_video_effect(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + EXPECT_REF(&video_effect->IMFTransform_iface, 2); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2); - - if (FAILED(hr)) - { - goto done; - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + EXPECT_REF(&video_effect2->IMFTransform_iface, 2); url = SysAllocString(L"i420-64x64.avi"); hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, stream, url); @@ -1869,7 +1864,7 @@ done: IMFMediaEngineEx_Shutdown(media_engine_ex); ref = IMFMediaEngineEx_Release(media_engine_ex); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } if (texture) @@ -1880,12 +1875,12 @@ done: if (video_effect2) { ref = IMFTransform_Release(&video_effect2->IMFTransform_iface); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } if (video_effect) { ref = IMFTransform_Release(&video_effect->IMFTransform_iface); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);

1 0

Alex Henrie : vbscript: Use correct pointer type in add_match (scan-build).
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 449bdc33b50d2af412b1dda9912568c8dad556c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/449bdc33b50d2af412b1dda9912568… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:13:01 2023 -0600 vbscript: Use correct pointer type in add_match (scan-build). --- dlls/vbscript/vbregexp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 641798f97dd..4a56875ef14 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1024,12 +1024,12 @@ static HRESULT add_match(IMatchCollection2 *iface, IMatch2 *add) TRACE("(%p)->(%p)\n", This, add); if(!This->size) { - This->matches = malloc(8*sizeof(IMatch*)); + This->matches = malloc(8 * sizeof(*This->matches)); if(!This->matches) return E_OUTOFMEMORY; This->size = 8; }else if(This->size == This->count) { - IMatch2 **new_matches = realloc(This->matches, 2*This->size*sizeof(IMatch*)); + IMatch2 **new_matches = realloc(This->matches, 2 * This->size * sizeof(*This->matches)); if(!new_matches) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : configure: Allow using clang as cross-compiler for multiple archs.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: a09019b7e99ab364b9e9ad4d7f3d18daee072ce9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a09019b7e99ab364b9e9ad4d7f3d18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:27:07 2023 +0200 configure: Allow using clang as cross-compiler for multiple archs. --- configure | 7 +++---- configure.ac | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 1e05d87431c..a6736d138c6 100755 --- a/configure +++ b/configure @@ -10354,15 +10354,14 @@ else $as_nop if test "x$with_mingw" != xno then test $HOST_ARCH = unknown || cross_archs=$HOST_ARCH - case "x$with_mingw" in - x|xyes) ;; - *) eval "${cross_archs}_CC=\$with_mingw" ;; - esac fi fi for wine_arch in $cross_archs do + case "x$with_mingw" in + xclang|x*/clang) eval "${wine_arch}_CC=\$with_mingw" ;; + esac if eval \${${wine_arch}_CC:+false} : then : case $wine_arch in diff --git a/configure.ac b/configure.ac index 6e1b8250cc1..6b75edc254e 100644 --- a/configure.ac +++ b/configure.ac @@ -818,14 +818,13 @@ AS_VAR_SET_IF([enable_archs], [if test "x$with_mingw" != xno then test $HOST_ARCH = unknown || cross_archs=$HOST_ARCH - case "x$with_mingw" in - x|xyes) ;; - *) AS_VAR_SET(${cross_archs}_CC,$with_mingw) ;; - esac fi]) for wine_arch in $cross_archs do + case "x$with_mingw" in + xclang|x*/clang) AS_VAR_SET(${wine_arch}_CC,$with_mingw) ;; + esac AS_VAR_IF([${wine_arch}_CC],[], [case $wine_arch in aarch64)

1 0

Alexandre Julliard : configure: Define __STDC__ to work around clang breakage in MSVC mode.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 8f27e8f601af5e591d7f91367290f9d5140860de URL: https://gitlab.winehq.org/wine/wine/-/commit/8f27e8f601af5e591d7f91367290f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:42:56 2023 +0200 configure: Define __STDC__ to work around clang breakage in MSVC mode. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a6736d138c6..262222bfed4 100755 --- a/configure +++ b/configure @@ -10701,7 +10701,7 @@ then : printf %s "(cached) " >&6 else $as_nop eval "$as_wine_cv_crosscc_c99=no" - for arg in '' '-std=gnu99' + for arg in '' '-std=gnu99' '-D__STDC__' do test -z "$arg" || CC="$CC $arg" cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 6b75edc254e..d43dc662eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -908,7 +908,7 @@ do AC_MSG_CHECKING([for $CC option to enable C99 features]) AC_CACHE_VAL([wine_cv_crosscc_c99], [AS_VAR_SET([wine_cv_crosscc_c99],[no]) - for arg in '' '-std=gnu99' + for arg in '' '-std=gnu99' '-D__STDC__' do test -z "$arg" || CC="$CC $arg" AC_COMPILE_IFELSE([AC_LANG_SOURCE([$ac_c_conftest_c99_program])],

1 0

Alexandre Julliard : configure: Don't try to use a non-compliant cross-compiler.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: abe79e3b52db97cd955574de4c10b22435b2c22f URL: https://gitlab.winehq.org/wine/wine/-/commit/abe79e3b52db97cd955574de4c10b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 13:27:36 2023 +0200 configure: Don't try to use a non-compliant cross-compiler. --- configure | 11 ++++++++--- configure.ac | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 262222bfed4..73b29c92241 100755 --- a/configure +++ b/configure @@ -10690,7 +10690,6 @@ fi LDFLAGS=$saved_LDFLAGS continue fi - as_fn_append PE_ARCHS " $wine_arch" as_wine_cv_crosscc_c99=`printf "%s\n" "ac_cv_${wine_arch}_crosscc_c99" | $as_tr_sh` @@ -10726,17 +10725,23 @@ fi fi eval res=\$$as_wine_cv_crosscc_c99 + case "x$res" in x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } ;; xno) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } ;; +printf "%s\n" "unsupported" >&6; } + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 printf "%s\n" "$res" >&6; } as_fn_append ${wine_arch}_CC " $res" ;; esac - + as_fn_append PE_ARCHS " $wine_arch" { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-strict-aliasing" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5 printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index d43dc662eb3..63dc4f65980 100644 --- a/configure.ac +++ b/configure.ac @@ -902,7 +902,6 @@ do LDFLAGS=$saved_LDFLAGS continue fi - AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) AS_VAR_PUSHDEF([wine_cv_crosscc_c99],[ac_cv_${wine_arch}_crosscc_c99]) AC_MSG_CHECKING([for $CC option to enable C99 features]) @@ -918,14 +917,20 @@ do AS_VAR_IF([wine_cv_crosscc_c99],[no],[],[break]) done]) AS_VAR_COPY([res],[wine_cv_crosscc_c99]) + AS_VAR_POPDEF([wine_cv_crosscc_c99]) case "x$res" in x) AC_MSG_RESULT([none needed]) ;; - xno) AC_MSG_RESULT([unsupported]) ;; + xno) AC_MSG_RESULT([unsupported]) + CC=$saved_CC + CFLAGS=$saved_CFLAGS + LDFLAGS=$saved_LDFLAGS + continue + ;; x*) AC_MSG_RESULT([$res]) AS_VAR_APPEND([${wine_arch}_CC],[" $res"]) ;; esac - AS_VAR_POPDEF([wine_cv_crosscc_c99]) + AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) WINE_TRY_PE_CFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_PE_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"])

1 0

Alexandre Julliard : advapi32/tests: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: c8c22e13486f3a48293bad08f7cb38c338593cc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8c22e13486f3a48293bad08f7cb38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:12:16 2023 +0200 advapi32/tests: Avoid sizeof() in traces. --- dlls/advapi32/tests/registry.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9e051056eed..8bffefe8628 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4187,9 +4187,7 @@ static void test_performance_keys(void) ok(file_time.l >= systime1.QuadPart - 10000 && file_time.l <= systime2.QuadPart, "got times %I64d, %I64d, %I64d\n", systime1.QuadPart, file_time.l, systime2.QuadPart); - ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), - "expected name len %Iu, got %lu\n", - (sysname_len + 1) * sizeof(WCHAR), data->SystemNameLength); + ok(data->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "got %lu\n", data->SystemNameLength); ok(data->SystemNameOffset == sizeof(PERF_DATA_BLOCK), "got name offset %lu\n", data->SystemNameOffset); ok(!wcscmp(sysname, (const WCHAR *)(data + 1)), "expected name %s, got %s\n",

1 0

Alexandre Julliard : dmstyle: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: d0c6486f5191ca04923d58e519adb7d970dfb0c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0c6486f5191ca04923d58e519adb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:12:48 2023 +0200 dmstyle: Avoid sizeof() in traces. --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index ae939f8b738..23e32a75fd0 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -508,7 +508,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, cnt, dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL; @@ -524,7 +524,7 @@ static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm) IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL); cnt = (Chunk.dwSize - sizeof(DWORD)); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); - TRACE_(dmfile)(" - cnt: %lu (%Iu / %lu)\n", cnt / dwSize, Chunk.dwSize - sizeof(DWORD), dwSize); + TRACE_(dmfile)(" - cnt: %lu (%lu / %lu)\n", cnt / dwSize, cnt, dwSize); if (cnt % dwSize != 0) { ERR("Invalid Array Size\n"); return E_FAIL;

1 0

Alexandre Julliard : kernel32/tests: Avoid sizeof() in traces.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: ef6055c164ad28eceba08f98de27380187209148 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef6055c164ad28eceba08f98de2738… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 6 18:13:20 2023 +0200 kernel32/tests: Avoid sizeof() in traces. --- dlls/kernel32/tests/volume.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 5d2d971232f..baf055c08b0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1565,8 +1565,7 @@ static void test_GetVolumeInformationByHandle(void) attr_info->MaximumComponentNameLength, filename_len); ok(!wcscmp( fsname, attr_info->FileSystemName ), "expected fsname %s, got %s\n", debugstr_w( attr_info->FileSystemName ), debugstr_w( fsname )); - ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), - "expected fsname length %Iu, got %Iu\n", attr_info->FileSystemNameLength / sizeof(WCHAR), wcslen( fsname )); + ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), "got %Iu\n", wcslen( fsname )); SetLastError(0xdeadbeef); ret = pGetVolumeInformationByHandleW( file, NULL, 0, NULL, &filename_len, &flags, fsname, 2 ); @@ -1580,8 +1579,7 @@ static void test_GetVolumeInformationByHandle(void) volume_info->VolumeSerialNumber, serial); ok(!wcscmp( label, volume_info->VolumeLabel ), "expected label %s, got %s\n", debugstr_w( volume_info->VolumeLabel ), debugstr_w( label )); - ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), - "expected label length %Iu, got %Iu\n", volume_info->VolumeLabelLength / sizeof(WCHAR), wcslen( label )); + ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), "got %Iu\n", wcslen( label )); CloseHandle( file ); @@ -1606,8 +1604,7 @@ static void test_GetVolumeInformationByHandle(void) volume_info->VolumeSerialNumber, serial); ok(!wcscmp( label, volume_info->VolumeLabel ), "expected label %s, got %s\n", debugstr_w( volume_info->VolumeLabel ), debugstr_w( label )); - ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), - "expected label length %Iu, got %Iu\n", volume_info->VolumeLabelLength / sizeof(WCHAR), wcslen( label )); + ok(wcslen( label ) == volume_info->VolumeLabelLength / sizeof(WCHAR), "got %Iu\n", wcslen( label )); memset(buffer, 0, sizeof(buffer)); status = NtQueryVolumeInformationFile( file, &io, buffer, sizeof(buffer), FileFsAttributeInformation ); @@ -1618,8 +1615,7 @@ static void test_GetVolumeInformationByHandle(void) attr_info->MaximumComponentNameLength, filename_len); ok(!wcscmp( fsname, attr_info->FileSystemName ), "expected fsname %s, got %s\n", debugstr_w( attr_info->FileSystemName ), debugstr_w( fsname )); - ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), - "expected fsname length %Iu, got %Iu\n", attr_info->FileSystemNameLength / sizeof(WCHAR), wcslen( fsname )); + ok(wcslen( fsname ) == attr_info->FileSystemNameLength / sizeof(WCHAR), "got %Iu\n", wcslen( fsname )); CloseHandle( file ); }

1 0