August 2021 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dbghelp: Remove superfluous casts to self.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: e1e761d55fd3b5143ff3b10541006a04bdf8f64e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e761d55fd3b5143ff3b105… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 27 22:46:36 2021 +0200 dbghelp: Remove superfluous casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..ad9f5ec4fdf 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3167,7 +3167,7 @@ static ULONG_PTR eval_expression(const struct module* module, struct cpu_stack_w case 1: stack[sp] = *(unsigned char*)&tmp; break; case 2: stack[sp] = *(unsigned short*)&tmp; break; case 4: stack[sp] = *(unsigned int*)&tmp; break; - case 8: stack[sp] = *(ULONG_PTR*)&tmp; break; /* FIXME: won't work on 32bit platform */ + case 8: stack[sp] = tmp; break; /* FIXME: won't work on 32bit platform */ default: FIXME("Unknown size for deref 0x%lx\n", sz); } break; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 247aadcef0e..0a4d3c0b145 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -677,7 +677,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod const char* dbg_link; found = TRUE; - dbg_link = (const char*)image_map_section(&debuglink_sect); + dbg_link = image_map_section(&debuglink_sect); if (dbg_link != IMAGE_NO_MAP) { /* The content of a debug link section is: diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 5849b33a244..f0ca20e5e4f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -428,7 +428,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) if (!fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable || !numsym) return TRUE; if (!(mapping = pe_map_full(fmap, NULL))) return FALSE; - isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); + isym = (const IMAGE_SYMBOL*)(mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping));

1 0

Francois Gouget : testbot/BackupVM: Fix support for non-English locales.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: tools Branch: master Commit: 839dab4dd3a456297e486c7d859cecc21941f5b7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=839dab4dd3a456297e486c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 30 18:50:16 2021 +0200 testbot/BackupVM: Fix support for non-English locales. Run virsh in a known locale when we need to parse its output. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 2 +- testbot/scripts/RestoreVM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index 124e222..d433882 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -263,7 +263,7 @@ wait_for_vm() while true do - _state=`(virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` + _state=`(LANG= virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` [ -z "$opt_dry_run" ] || _state="shut off" case "$_state" in "error") diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index a1b9d15..29f5f43 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -522,7 +522,7 @@ wait_for_vm() while true do - _state=`(virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` + _state=`(LANG= virsh --connect "$opt_connect" list --all 2>/dev/null || echo " $_vm error") | sed -e "s/^.* $_vm *//" -e t -e d` [ -z "$opt_dry_run" ] || _state="shut off" case "$_state" in "error")

1 0

Francois Gouget : winetest/dissect: Reject reports with too few test results.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: tools Branch: master Commit: 1bfc60e41a32a3d4dc8f740a31805514d0663c03 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bfc60e41a32a3d4dc8f740… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 30 19:48:37 2021 +0200 winetest/dissect: Reject reports with too few test results. The script does not know how many tests to expect but it can reasonably expect that $maxfailedtests is only a small fraction of the expected number of tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 43f7790..fe88cb9 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -903,6 +903,7 @@ close_test_unit(1); close SUM or mydie "error writing to '$tmpdir/summary.txt': $!"; close IN; +mydie "too few tests run (", @boxes-1, ")" if @boxes <= $maxfailedtests * 5; mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfilesize;

1 0

Alexandre Julliard : packaging: Add Debian bookworm.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: tools Branch: master Commit: 30ff2003ecf1cb8f42cc1cc4c5217404262c1f17 URL: https://source.winehq.org/git/tools.git/?a=commit;h=30ff2003ecf1cb8f42cc1cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 28 11:10:42 2021 +0200 packaging: Add Debian bookworm. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 7 ++++--- packaging/obs/rsync-filter | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 0962e2f..b8b7c61 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -18,6 +18,10 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ + deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 17e0448..094c4c5 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -181,7 +181,7 @@ publish_files () cd $basedir -distros="33 34 buster bullseye bionic focal hirsute" +distros="33 34 buster bullseye bookworm bionic focal hirsute" dry_run= while [ $# -ge 1 ] @@ -217,8 +217,9 @@ do do case $i in 3?) add_rpm $i Fedora_$i ;; - buster) add_deb debian buster Debian_10 stable ;; - bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; + buster) add_deb debian buster Debian_10 oldstable ;; + bullseye) add_deb debian bullseye Debian_11 stable ;; + bookworm) add_deb debian bookworm Debian_Testing_standard testing ;; bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; focal) add_deb ubuntu focal xUbuntu_20.04 ;; hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 64aa612..cd6bc22 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -5,10 +5,12 @@ + /debian + /debian/dists ++ /debian/dists/oldstable + /debian/dists/stable + /debian/dists/testing + /debian/dists/buster + /debian/dists/bullseye ++ /debian/dists/bookworm - /debian/dists/* - /debian/*

1 0

Alexandre Julliard : Wine release 6.16
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: website Branch: master Commit: 817641bcbd68e33bd6fae10a38bd2f801ca2c0dc URL: https://source.winehq.org/git/website.git/?a=commit;h=817641bcbd68e33bd6fae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 22:03:53 2021 +0200 Wine release 6.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021082701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021082701.xml b/news/en/2021082701.xml new file mode 100644 index 00000000..8cd3dad4 --- /dev/null +++ b/news/en/2021082701.xml @@ -0,0 +1,17 @@ +<news> +<date>August 27, 2021</date> +<title>Wine 6.16 Released</title> +<body> + The Wine development release 6.16 is now available. + <a href="{$root}/announce/6.16">What's new</a> in this release: +<ul> + <li>Initial version of a HID-based joystick backend.</li> + <li>Improved high-DPI theming support.</li> + <li>More preparation work for the GDI syscall interface.</li> + <li>Better CodeView support in WineDump.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : gdi32: Move GetFontLanguageInfo to text.c.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 3b686c3eca42f28cc2975c0752fbb87e79f6b73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b686c3eca42f28cc2975c07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:55 2021 +0100 gdi32: Move GetFontLanguageInfo to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 49 ------------------------------------------------- dlls/gdi32/text.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f825562b37f..b65f1e54bee 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6044,55 +6044,6 @@ BOOL WINAPI TranslateCharsetInfo( return TRUE; } -/************************************************************************* - * GetFontLanguageInfo (GDI32.@) - */ -DWORD WINAPI GetFontLanguageInfo(HDC hdc) -{ - FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, - GCP_DIACRITIC_MASK=0x00000000, - FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=FS_ARABIC, - GCP_KASHIDA_MASK=0x00000000, - GCP_LIGATE_MASK=0x00000000, - GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; - - DWORD result=0; - - NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 ); - /* We detect each flag we return using a bitmask on the Codepage Bitfields */ - - if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) - result|=GCP_DBCS; - - if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) - result|=GCP_DIACRITIC; - - if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) - result|=FLI_GLYPHS; - - if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) - result|=GCP_GLYPHSHAPE; - - if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) - result|=GCP_KASHIDA; - - if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) - result|=GCP_LIGATE; - - if( NtGdiGetKerningPairsW( hdc, 0, NULL ) ) - result|=GCP_USEKERNING; - - /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if( GetTextAlign( hdc) & TA_RTLREADING ) - if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) - result|=GCP_REORDER; - - return result; -} - - /************************************************************************* * GetFontData [GDI32.@] * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index ba86a1a3b1d..72b721a48a2 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1849,3 +1849,51 @@ DWORD WINAPI GetKerningPairsA( HDC hdc, DWORD count, KERNINGPAIR *kern_pairA ) HeapFree( GetProcessHeap(), 0, kern_pairW ); return kern_pairs_copied; } + +/************************************************************************* + * GetFontLanguageInfo (GDI32.@) + */ +DWORD WINAPI GetFontLanguageInfo( HDC hdc ) +{ + FONTSIGNATURE fontsig; + DWORD result = 0; + + static const DWORD GCP_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, + GCP_DIACRITIC_MASK = 0x00000000, + FLI_GLYPHS_MASK = 0x00000000, + GCP_GLYPHSHAPE_MASK = FS_ARABIC, + GCP_KASHIDA_MASK = 0x00000000, + GCP_LIGATE_MASK = 0x00000000, + GCP_REORDER_MASK = FS_HEBREW|FS_ARABIC; + + + NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 ); + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + + if (fontsig.fsCsb[0] & GCP_DBCS_MASK) + result |= GCP_DBCS; + + if (fontsig.fsCsb[0] & GCP_DIACRITIC_MASK) + result |= GCP_DIACRITIC; + + if (fontsig.fsCsb[0] & FLI_GLYPHS_MASK) + result |= FLI_GLYPHS; + + if (fontsig.fsCsb[0] & GCP_GLYPHSHAPE_MASK) + result |= GCP_GLYPHSHAPE; + + if (fontsig.fsCsb[0] & GCP_KASHIDA_MASK) + result |= GCP_KASHIDA; + + if (fontsig.fsCsb[0] & GCP_LIGATE_MASK) + result |= GCP_LIGATE; + + if (NtGdiGetKerningPairsW( hdc, 0, NULL )) + result |= GCP_USEKERNING; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ((GetTextAlign( hdc ) & TA_RTLREADING) && (fontsig.fsCsb[0] & GCP_REORDER_MASK)) + result |= GCP_REORDER; + + return result; +}

1 0

Zebediah Figura : ntoskrnl/tests: Add more tests for IRP status handling.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 8d37962b43e5074bc0421611267dc41593114f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d37962b43e5074bc0421611… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 26 20:54:10 2021 -0500 ntoskrnl/tests: Add more tests for IRP status handling. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 99 ++++---- dlls/ntoskrnl.exe/tests/driver.h | 40 ++-- dlls/ntoskrnl.exe/tests/driver_pnp.c | 6 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 435 +++++++++++++++++++++++++++++------ 4 files changed, 452 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d37962b43e5074bc042…

1 0

Francois Gouget : gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: ad663360fae6b4a9ee3d7786857404e0a4917329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad663360fae6b4a9ee3d7786… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 13:16:12 2021 +0200 gdiplus: GdipGetFamilyName() should not crash when given a NULL name. It used to crash on Windows XP and Vista but does not since Windows 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 9 +++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64604367da3..44431ea2ac8 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -798,17 +798,20 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo * FAILURE: InvalidParameter if family is NULL * * NOTES - * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + * If name is NULL, XP and Vista crash but not Windows 7+ */ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { static int lang_fixme; + TRACE("%p, %p, %d\n", family, name, language); + if (family == NULL) return InvalidParameter; - TRACE("%p, %p, %d\n", family, name, language); + if (name == NULL) + return Ok; if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b208989c054..4ffa9e823fc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -388,12 +388,9 @@ static void test_fontfamily (void) expect (Ok, stat); expect (0, lstrcmpiW(itsName, L"Tahoma")); - if (0) - { - /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); - expect (Ok, stat); - } + /* Crashes on Windows XP SP2 and Vista */ + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); + expect (Ok, stat); /* Make sure we don't read old data */ ZeroMemory (itsName, sizeof(itsName));

1 0

Francois Gouget : gdiplus/tests: Fix a font test crash when "MS Shell Dlg" is not found.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 53371cc55666fb9805aaeb6bef42b7baf410b15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53371cc55666fb9805aaeb6b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 16:40:05 2021 +0200 gdiplus/tests: Fix a font test crash when "MS Shell Dlg" is not found. When "MS Shell Dlg" is missing GdipCreateFontFamilyFromName() leaves the GpFontFamily* pointer uninitialised. So initialize it to NULL in order to get clean failures instead of a crash. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 4ffa9e823fc..031e4688c6c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -883,8 +883,10 @@ static void test_font_substitution(void) ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); + family = NULL; status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family); expect(Ok, status); + font = NULL; status = GdipCreateFont(family, 12, FontStyleRegular, UnitPoint, &font); expect(Ok, status); memset(&lf, 0xfe, sizeof(lf));

1 0

Zebediah Figura : ntdll/tests: Also test the IOSB status in test_volume_info().
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: a5b1d5159413d5668735a142550def17cab38746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b1d5159413d5668735a142… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 26 20:54:09 2021 -0500 ntdll/tests: Also test the IOSB status in test_volume_info(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 662dc1d55cb..1118f41f81f 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1662,8 +1662,10 @@ static void test_volume_info(void) PIPE_TYPE_MESSAGE, 4096 )) return; memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); @@ -1671,8 +1673,10 @@ static void test_volume_info(void) "Characteristics = %x\n", device_info->Characteristics ); memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType );

1 0