September 2019 - Wine-Commits

Francois Gouget : testbot/SpecialJobs: Don't create jobs if given no VM.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: tools Branch: master Commit: 8fd5b0f126a222e3b55a932d899571735a35af20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fd5b0f126a222e3b55a932… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:03:24 2019 +0200 testbot/SpecialJobs: Don't create jobs if given no VM. The jobs would have no task! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/SpecialJobs.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index d709e48..c313567 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -61,6 +61,7 @@ sub GetReconfigVMs($$) sub AddReconfigJob($$$) { my ($VMs, $VMKey, $VMType) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -138,6 +139,7 @@ sub GetWindowsTestVMs($$$) sub AddWindowsTestJob($$$$$) { my ($VMs, $VMKey, $Build, $BaseJob, $LatestBaseName) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs(); @@ -221,6 +223,7 @@ sub GetWineTestVMs($) sub AddWineTestJob($$) { my ($VMs, $VMKey) = @_; + return undef if (!@$VMs); # First create a new job my $Jobs = CreateJobs();

1 0

Francois Gouget : testbot/WineRunReconfig: Restart the TestAgent server if it was updated.
by Alexandre Julliard Sept. 27, 2019

Sept. 27, 2019

Module: tools Branch: master Commit: 54fe37c9538d3a30804aec4fcc47e94dded828a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54fe37c9538d3a30804aec4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 27 13:04:27 2019 +0200 testbot/WineRunReconfig: Restart the TestAgent server if it was updated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 20 ++++++++++++++++++++ testbot/lib/Build/Utils.pm | 9 ++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0a5e606..edbafbc 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -487,6 +487,26 @@ if ($NewStatus eq "completed") FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$BaseName'"); } } + + if ($Summary->{"testagentd"}) + { + # Restart the TestAgent server from the new binary + # Note that the privileged TestAgent server is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + Debug(Elapsed($Start), " Upgrading testagentd from ". $TA->GetVersion() ."\n"); + $TA->Restart(undef); + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + my $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new ". $VM->Name ." TestAgent: $ErrMessage\n"); + } + Debug(Elapsed($Start), "Upgraded testagentd to $Version\n"); + } } $TA->Disconnect(); diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9a45906..5014630 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -196,9 +196,8 @@ sub GetCPUCount() sub BuildNativeTestAgentd() { - # If testagentd already exists it's likely already running - # so don't rebuild it. - return 1 if (-x "$BinDir/build/testagentd"); + my $NativeTestAgentd = "$::RootDir/bin/build/testagentd"; + my $Before = GetMTime($NativeTestAgentd); InfoMsg "\nBuilding the native testagentd\n"; my $CPUCount = GetCPUCount(); @@ -210,6 +209,10 @@ sub BuildNativeTestAgentd() return !1; } + if ($Before != GetMTime($NativeTestAgentd)) + { + LogMsg "Updated testagentd\n"; + } return 1; }

1 0

Sven Baars : kernelbase: Fix a leak on error path (Coverity).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: f4ecef456595325f973487173cad3ac1269d87f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ecef456595325f97348717… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 21:21:32 2019 +0200 kernelbase: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f633dfa3de..d60e3b1a47 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -868,6 +868,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH CreateFiberEx( SIZE_T stack_commit, SIZE_T stack if ((status = RtlCreateUserStack( stack_commit, stack_reserve, 0, 1, 1, &stack ))) { SetLastError( RtlNtStatusToDosError(status) ); + HeapFree( GetProcessHeap(), 0, fiber ); return NULL; }

1 0

Matteo Bruni : d3dx9: Add traces to filtering functions.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 1f9243c757589c6ff2333794c3a44327d64855ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9243c757589c6ff2333794… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:58 2019 +0200 d3dx9: Add traces to filtering functions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 10 ++++++++++ dlls/d3dx9_36/texture.c | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 39dfbf16ac..b78742c041 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1619,6 +1619,11 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit UINT min_width, min_height, min_depth; UINT x, y, z; + TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p, dst %p, " + "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p, color_key 0x%08x, palette %p.\n", + src, src_row_pitch, src_slice_pitch, src_size, src_format, dst, dst_row_pitch, dst_slice_pitch, dst_size, + dst_format, color_key, palette); + ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(src_format, dst_format, &conv_info); @@ -1721,6 +1726,11 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic DWORD channels[4]; UINT x, y, z; + TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p, dst %p, " + "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p, color_key 0x%08x, palette %p.\n", + src, src_row_pitch, src_slice_pitch, src_size, src_format, dst, dst_row_pitch, dst_slice_pitch, dst_size, + dst_format, color_key, palette); + ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(src_format, dst_format, &conv_info); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 26d07ca9f6..b7d017a836 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -430,7 +430,6 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) return D3DERR_NOTAVAILABLE; - /* ensure width/height is power of 2 */ if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s))) s = make_pow2(s); @@ -470,7 +469,6 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *devic if (d == D3DX_DEFAULT) d = 1; - /* ensure width/height is power of 2 */ if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) && (!is_pow2(w) || !is_pow2(h) || !is_pow2(d))) { @@ -646,7 +644,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi skip_levels = 0; } - /* fix texture creation parameters */ + /* Fix up texture creation parameters. */ hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool); if (FAILED(hr)) {

1 0

Zebediah Figura : kernelbase: Implement GetFileInformationByHandleEx(FileAttributeTagInfo).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 1669956966fd1af9e8195576089ef9af3368be72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1669956966fd1af9e8195576… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 13:34:34 2019 -0500 kernelbase: Implement GetFileInformationByHandleEx(FileAttributeTagInfo). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47813 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 74d166b6b9..7a6f843f43 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1534,7 +1534,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ { case FileStreamInfo: case FileCompressionInfo: - case FileAttributeTagInfo: case FileRemoteProtocolInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: @@ -1546,6 +1545,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandleEx( HANDLE handle, FILE_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileAttributeTagInfo: + status = NtQueryInformationFile( handle, &io, info, size, FileAttributeTagInformation ); + break; + case FileBasicInfo: status = NtQueryInformationFile( handle, &io, info, size, FileBasicInformation ); break;

1 0

Sven Baars : httpapi: Fix a memory leak (Valgrind).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: bbd1e80d8176c751a69ed6962c138176c0b9f5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd1e80d8176c751a69ed696… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:25 2019 +0200 httpapi: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 0d6895b998..03511d6c9f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -230,6 +230,7 @@ static ULONG add_url(HANDLE queue, const WCHAR *urlW, HTTP_URL_CONTEXT context) offsetof(struct http_add_url_params, url[len]), NULL, 0, NULL, &ovl)) ret = GetLastError(); CloseHandle(ovl.hEvent); + heap_free(params); return ret; }

1 0

Matteo Bruni : d3dx9/tests: Improve tests to check for DXTn fallback formats.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: d2f3fc03cb1dbcae77e199f3fd8eb2ccf419cfa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f3fc03cb1dbcae77e199f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:54:00 2019 +0200 d3dx9/tests: Improve tests to check for DXTn fallback formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 04513fa4b0..fc1589d25e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,7 +25,7 @@ #include "d3dx9tex.h" #include "resources.h" -static int has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3; +static int has_2d_dxt1, has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3; /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { @@ -419,30 +419,57 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == expected, "Returned format %u, expected %u\n", format, expected); /* Block-based texture formats and size < block size. */ - if (has_2d_dxt5) + format = D3DFMT_DXT1; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt1) { - format = D3DFMT_DXT5; - width = 2; height = 2; - mipmaps = 1; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 4, "Returned width %d, expected %d\n", width, 4); - ok(height == 4, "Returned height %d, expected %d\n", height, 4); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + ok(width == 4, "Got unexpected width %d.\n", width); + ok(height == 4, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_DXT1, "Got unexpected format %u.\n", format); + } + else + { + ok(width == 2, "Got unexpected width %d.\n", width); + ok(height == 2, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); + } - width = 4; - height = 2; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - ok(width == 4, "Got unexpected width %u.\n", width); + format = D3DFMT_DXT5; + width = 2; height = 2; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt5) + { + ok(width == 4, "Got unexpected width %d.\n", width); + ok(height == 4, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); + } + else + { + ok(width == 2, "Got unexpected width %d.\n", width); + ok(height == 2, "Got unexpected height %d.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); + } + width = 4; + height = 2; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(width == 4, "Got unexpected width %u.\n", width); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + if (has_2d_dxt5) + { ok(height == 4, "Got unexpected height %u.\n", height); - ok(mipmaps == 1, "Got unexpected mipmap level count %u.\n", mipmaps); ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); } else { - skip("D3DFMT_DXT5 textures are not supported, skipping a test.\n"); + ok(height == 2, "Got unexpected height %u.\n", height); + ok(format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", format); } IDirect3D9_Release(d3d); @@ -2511,6 +2538,8 @@ START_TEST(texture) } /* Check whether DXTn textures are supported. */ + has_2d_dxt1 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT1)); has_2d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT3)); has_2d_dxt5 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, @@ -2519,8 +2548,8 @@ START_TEST(texture) D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, D3DFMT_DXT5)); has_3d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT3)); - trace("DXTn texture support: 2D DXT3 %#x, 2D DXT5 %#x, cube DXT5 %#x, 3D dxt3 %#x.\n", - has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3); + trace("DXTn texture support: 2D DXT1 %#x, 2D DXT3 %#x, 2D DXT5 %#x, cube DXT5 %#x, 3D dxt3 %#x.\n", + has_2d_dxt1, has_2d_dxt3, has_2d_dxt5, has_cube_dxt5, has_3d_dxt3); test_D3DXCheckTextureRequirements(device); test_D3DXCheckCubeTextureRequirements(device);

1 0

Matteo Bruni : d3dx9: Handle compressed surfaces in D3DXLoadSurfaceFromMemory.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 376182062ff1ab8e7835fd67bc650da83c2cc75d URL: https://source.winehq.org/git/wine.git/?a=commit;h=376182062ff1ab8e7835fd67… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 26 20:53:59 2019 +0200 d3dx9: Handle compressed surfaces in D3DXLoadSurfaceFromMemory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24983 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/Makefile.in | 2 + dlls/d3dx9_25/Makefile.in | 2 + dlls/d3dx9_26/Makefile.in | 2 + dlls/d3dx9_27/Makefile.in | 2 + dlls/d3dx9_28/Makefile.in | 2 + dlls/d3dx9_29/Makefile.in | 2 + dlls/d3dx9_30/Makefile.in | 2 + dlls/d3dx9_31/Makefile.in | 2 + dlls/d3dx9_32/Makefile.in | 2 + dlls/d3dx9_33/Makefile.in | 2 + dlls/d3dx9_34/Makefile.in | 2 + dlls/d3dx9_35/Makefile.in | 2 + dlls/d3dx9_36/Makefile.in | 2 + dlls/d3dx9_36/d3dx9_private.h | 4 +- dlls/d3dx9_36/surface.c | 112 ++++- dlls/d3dx9_36/tests/surface.c | 63 +-- dlls/d3dx9_36/tests/texture.c | 158 +++---- dlls/d3dx9_36/texture.c | 41 +- dlls/d3dx9_36/txc_compress_dxtn.c | 841 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/txc_dxtn.h | 52 +++ dlls/d3dx9_36/txc_fetch_dxtn.c | 243 +++++++++++ dlls/d3dx9_36/volume.c | 1 - dlls/d3dx9_37/Makefile.in | 2 + dlls/d3dx9_38/Makefile.in | 2 + dlls/d3dx9_39/Makefile.in | 2 + dlls/d3dx9_40/Makefile.in | 2 + dlls/d3dx9_41/Makefile.in | 2 + dlls/d3dx9_42/Makefile.in | 2 + dlls/d3dx9_43/Makefile.in | 2 + 29 files changed, 1423 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=376182062ff1ab8e7835…

1 0

Zebediah Figura : ntdll: Implement NtQueryInformationFile(FileAttributeTagInformation).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: d1a259d1a6367133b4062fdcbfc1cc1d1b235357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a259d1a6367133b4062fdc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 13:34:33 2019 -0500 ntdll: Implement NtQueryInformationFile(FileAttributeTagInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47813 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 11 ++++++++++- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cd1775a98c..655dcb2eaf 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2253,7 +2253,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileQuotaInformation */ 0, /* FileReparsePointInformation */ sizeof(FILE_NETWORK_OPEN_INFORMATION), /* FileNetworkOpenInformation */ - 0, /* FileAttributeTagInformation */ + sizeof(FILE_ATTRIBUTE_TAG_INFORMATION), /* FileAttributeTagInformation */ 0, /* FileTrackingInformation */ 0, /* FileIdBothDirectoryInformation */ 0, /* FileIdFullDirectoryInformation */ @@ -2471,6 +2471,15 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, *(ULONGLONG *)&info->FileId = st.st_ino; } break; + case FileAttributeTagInformation: + if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + else + { + FILE_ATTRIBUTE_TAG_INFORMATION *info = ptr; + info->FileAttributes = attr; + info->ReparseTag = 0; /* FIXME */ + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31fc7ae7b0..539ce44e0a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3673,6 +3673,52 @@ static void test_file_access_information(void) CloseHandle( h ); } +static void test_file_attribute_tag_information(void) +{ + FILE_ATTRIBUTE_TAG_INFORMATION info; + FILE_BASIC_INFORMATION fbi = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE h; + + if (!(h = create_temp_file(0))) return; + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAttributeTagInformation ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + + status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_INVALID_HANDLE, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + info.FileAttributes &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + ok( info.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + fbi.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + status = pNtSetInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_SYSTEM, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + fbi.FileAttributes = FILE_ATTRIBUTE_HIDDEN; + status = pNtSetInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok( status == STATUS_SUCCESS, "got %#x\n", status ); + todo_wine ok( info.FileAttributes == FILE_ATTRIBUTE_HIDDEN, "got attributes %#x\n", info.FileAttributes ); + ok( !info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag ); + + CloseHandle( h ); +} + static void test_file_mode(void) { UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; @@ -4917,6 +4963,7 @@ START_TEST(file) test_file_completion_information(); test_file_id_information(); test_file_access_information(); + test_file_attribute_tag_information(); test_file_mode(); test_file_readonly_access(); test_query_volume_information_file();

1 0

Sven Baars : httpapi/tests: Cancel a pending receive request (Valgrind).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: fea609c0d085d2f4c362ff63952ae8459b959be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea609c0d085d2f4c362ff63… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Sep 26 14:18:27 2019 +0200 httpapi/tests: Cancel a pending receive request (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b19a590147..abc5c95f0c 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -534,6 +534,8 @@ static void test_v1_short_buffer(void) ok(!ret, "Got error %u.\n", ret); ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + CancelIoEx(queue, &ovl); + ret = HttpRemoveUrl(queue, localhost_urlW); ok(!ret, "Got error %u.\n", ret); closesocket(s);

1 0