[PATCH] shell32: Initialize members in SHGetFileInfo.

Alexandre Julliard julliard at winehq.org
Mon Jun 19 12:51:18 CDT 2017


"katahiromz ." <katayama.hirofumi.mz at gmail.com> writes:

> From ca0631aa8766b91cc0183adc9f9f1fe99e058af0 Mon Sep 17 00:00:00 2001
> From: Katayama Hirofumi MZ <katayama.hirofumi.mz at gmail.com>
> Date: Mon, 19 Jun 2017 13:02:33 +0900
> Subject: [PATCH] shell32: Initialize members in SHGetFileInfo.
>
> This patch kills some failures in shell32_winetest:shlfileop by
> initializing some members of SHFILEINFO in SHGetFileInfoA/W.
>
> Tested on ReactOS r75083.
>
> before: shlfileop: 790 tests executed (0 marked as todo, 31 failures), 0
> skipped.
> after: shlfileop: 790 tests executed (0 marked as todo, 22 failures), 0
> skipped.
>
> Signed-off-by: Katayama Hirofumi MZ <katayama.hirofumi.mz at gmail.com>
> ---
>  dlls/shell32/shell32_main.c | 5 +++++
>  1 file changed, 5 insertions(+)

You'd need to update the corresponding todos, but the patch is also
causing failures:

../../../tools/runtest -q -P wine -T ../../.. -M shell32.dll -p shell32_test.exe.so shlfileop && touch shlfileop.ok
shlfileop.c:200: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear hIcon
shlfileop.c:201: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear szDisplayName[0]
shlfileop.c:202: Test succeeded inside todo block: SHGetFileInfoA('' | 0) did not clear szTypeName[0]
shlfileop.c:203: Test failed: SHGetFileInfoA('' | 0) should not clear iIcon
shlfileop.c:238: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon
shlfileop.c:239: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear szDisplayName[0]
shlfileop.c:240: Test succeeded inside todo block: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) did not clear szTypeName[0]
shlfileop.c:241: Test failed: SHGetFileInfoA(c:\nonexistent | SHGFI_ATTRIBUTES) should not clear iIcon
shlfileop.c:386: Test succeeded inside todo block: SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon
shlfileop.c:387: Test succeeded inside todo block: SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]
shlfileop.c:412: Test succeeded inside todo block: SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon
shlfileop.c:713: Tests skipped: Test would show a dialog box
Makefile:739: recipe for target 'shlfileop.ok' failed
make: *** [shlfileop.ok] Error 11

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list